|
@@ -666,8 +666,8 @@ static int rotator_probe(struct platform_device *pdev)
|
|
|
return rot->irq;
|
|
|
}
|
|
|
|
|
|
- ret = request_threaded_irq(rot->irq, NULL, rotator_irq_handler,
|
|
|
- IRQF_ONESHOT, "drm_rotator", rot);
|
|
|
+ ret = devm_request_threaded_irq(dev, rot->irq, NULL,
|
|
|
+ rotator_irq_handler, IRQF_ONESHOT, "drm_rotator", rot);
|
|
|
if (ret < 0) {
|
|
|
dev_err(dev, "failed to request irq\n");
|
|
|
return ret;
|
|
@@ -676,8 +676,7 @@ static int rotator_probe(struct platform_device *pdev)
|
|
|
rot->clock = devm_clk_get(dev, "rotator");
|
|
|
if (IS_ERR(rot->clock)) {
|
|
|
dev_err(dev, "failed to get clock\n");
|
|
|
- ret = PTR_ERR(rot->clock);
|
|
|
- goto err_clk_get;
|
|
|
+ return PTR_ERR(rot->clock);
|
|
|
}
|
|
|
|
|
|
pm_runtime_enable(dev);
|
|
@@ -710,8 +709,6 @@ static int rotator_probe(struct platform_device *pdev)
|
|
|
|
|
|
err_ippdrv_register:
|
|
|
pm_runtime_disable(dev);
|
|
|
-err_clk_get:
|
|
|
- free_irq(rot->irq, rot);
|
|
|
return ret;
|
|
|
}
|
|
|
|
|
@@ -725,8 +722,6 @@ static int rotator_remove(struct platform_device *pdev)
|
|
|
|
|
|
pm_runtime_disable(dev);
|
|
|
|
|
|
- free_irq(rot->irq, rot);
|
|
|
-
|
|
|
return 0;
|
|
|
}
|
|
|
|