v6_range_diff

v6_range_diff

1:  cf342fc82027 = 1:  cf342fc82027 media: dt-bindings: Add Imagination E5010 JPEG Encoder
2:  25c39e0883c7 = 2:  25c39e0883c7 media: jpeg: Add reference quantization and huffman tables
3:  722e1d86e3b1 ! 3:  ee7b672770ce media: imagination: Add E5010 JPEG Encoder driver
    @@ drivers/media/platform/imagination/e5010-jpeg-enc.c (new)
     +{
     +	struct e5010_dev *e5010;
     +	int irq, ret = 0;
    ++	struct device *dev = &pdev->dev;
     +
    -+	ret = dma_set_mask(&pdev->dev, DMA_BIT_MASK(32));
    ++	ret = dma_set_mask(dev, DMA_BIT_MASK(32));
     +	if (ret)
    -+		return dev_err_probe(e5010->dev, ret, "32-bit consistent DMA enable failed\n");
    ++		return dev_err_probe(dev, ret, "32-bit consistent DMA enable failed\n");
     +
    -+	e5010 = devm_kzalloc(&pdev->dev, sizeof(*e5010), GFP_KERNEL);
    ++	e5010 = devm_kzalloc(dev, sizeof(*e5010), GFP_KERNEL);
     +	if (!e5010)
     +		return -ENOMEM;
     +
     +	platform_set_drvdata(pdev, e5010);
     +
    -+	e5010->dev = &pdev->dev;
    ++	e5010->dev = dev;
     +
     +	mutex_init(&e5010->mutex);
     +	spin_lock_init(&e5010->hw_lock);
     +
     +	e5010->vdev = video_device_alloc();
     +	if (!e5010->vdev) {
    -+		dev_err(e5010->dev, "failed to allocate video device\n");
    ++		dev_err(dev, "failed to allocate video device\n");
     +		return -ENOMEM;
     +	}
     +
    @@ drivers/media/platform/imagination/e5010-jpeg-enc.c (new)
     +	e5010->vdev->v4l2_dev = &e5010->v4l2_dev;
     +	e5010->vdev->lock = &e5010->mutex;
     +
    -+	ret = v4l2_device_register(&pdev->dev, &e5010->v4l2_dev);
    ++	ret = v4l2_device_register(dev, &e5010->v4l2_dev);
     +	if (ret)
    -+		return dev_err_probe(e5010->dev, ret, "failed to register v4l2 device\n");
    ++		return dev_err_probe(dev, ret, "failed to register v4l2 device\n");
     +
     +	e5010->m2m_dev = v4l2_m2m_init(&e5010_m2m_ops);
     +	if (IS_ERR(e5010->m2m_dev)) {
     +		ret = PTR_ERR(e5010->m2m_dev);
     +		e5010->m2m_dev = NULL;
    -+		dev_err_probe(e5010->dev, ret, "failed to init mem2mem device\n");
    ++		dev_err_probe(dev, ret, "failed to init mem2mem device\n");
     +		goto fail_after_v4l2_register;
     +	}
     +
    @@ drivers/media/platform/imagination/e5010-jpeg-enc.c (new)
     +	e5010->core_base = devm_platform_ioremap_resource_byname(pdev, "core");
     +	if (IS_ERR(e5010->core_base)) {
     +		ret = PTR_ERR(e5010->core_base);
    -+		dev_err_probe(e5010->dev, ret, "Missing 'core' resources area\n");
    ++		dev_err_probe(dev, ret, "Missing 'core' resources area\n");
     +		goto fail_after_v4l2_register;
     +	}
     +
     +	e5010->mmu_base = devm_platform_ioremap_resource_byname(pdev, "mmu");
     +	if (IS_ERR(e5010->mmu_base)) {
     +		ret = PTR_ERR(e5010->mmu_base);
    -+		dev_err_probe(e5010->dev, ret, "Missing 'mmu' resources area\n");
    ++		dev_err_probe(dev, ret, "Missing 'mmu' resources area\n");
     +		goto fail_after_v4l2_register;
     +	}
     +
     +	e5010->last_context_run = NULL;
     +
     +	irq = platform_get_irq(pdev, 0);
    -+	ret = devm_request_irq(e5010->dev, irq, e5010_irq, 0,
    ++	ret = devm_request_irq(dev, irq, e5010_irq, 0,
     +			       E5010_MODULE_NAME, e5010);
     +	if (ret) {
    -+		dev_err_probe(e5010->dev, ret, "failed to register IRQ %d\n", irq);
    ++		dev_err_probe(dev, ret, "failed to register IRQ %d\n", irq);
     +		goto fail_after_v4l2_register;
     +	}
     +
    -+	e5010->clk = devm_clk_get(&pdev->dev, NULL);
    ++	e5010->clk = devm_clk_get(dev, NULL);
     +	if (IS_ERR(e5010->clk)) {
     +		ret = PTR_ERR(e5010->clk);
    -+		dev_err_probe(e5010->dev, ret, "failed to get clock\n");
    ++		dev_err_probe(dev, ret, "failed to get clock\n");
     +		goto fail_after_v4l2_register;
     +	}
     +
    -+	pm_runtime_enable(e5010->dev);
    ++	pm_runtime_enable(dev);
     +
     +	ret = video_register_device(e5010->vdev, VFL_TYPE_VIDEO, 0);
     +	if (ret) {
    -+		dev_err_probe(e5010->dev, ret, "failed to register video device\n");
    ++		dev_err_probe(dev, ret, "failed to register video device\n");
     +		goto fail_after_video_register_device;
     +	}
     +