[media] exynos-gsc: Simplify clock management
Instead of having separate functions that fetches, prepares and unprepares the clock, let's encapsulate this code into ->probe(). This makes error handling easier and decreases the lines of code. [mszyprow: rebased onto v4.9-rc4] Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org> Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com> Tested-by: Javier Martinez Canillas <javier@osg.samsung.com> Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
This commit is contained in:
parent
43e6347f40
commit
d83db90456
|
@ -1001,36 +1001,6 @@ static void *gsc_get_drv_data(struct platform_device *pdev)
|
|||
return driver_data;
|
||||
}
|
||||
|
||||
static void gsc_clk_put(struct gsc_dev *gsc)
|
||||
{
|
||||
if (!IS_ERR(gsc->clock))
|
||||
clk_unprepare(gsc->clock);
|
||||
}
|
||||
|
||||
static int gsc_clk_get(struct gsc_dev *gsc)
|
||||
{
|
||||
int ret;
|
||||
|
||||
dev_dbg(&gsc->pdev->dev, "gsc_clk_get Called\n");
|
||||
|
||||
gsc->clock = devm_clk_get(&gsc->pdev->dev, GSC_CLOCK_GATE_NAME);
|
||||
if (IS_ERR(gsc->clock)) {
|
||||
dev_err(&gsc->pdev->dev, "failed to get clock~~~: %s\n",
|
||||
GSC_CLOCK_GATE_NAME);
|
||||
return PTR_ERR(gsc->clock);
|
||||
}
|
||||
|
||||
ret = clk_prepare(gsc->clock);
|
||||
if (ret < 0) {
|
||||
dev_err(&gsc->pdev->dev, "clock prepare failed for clock: %s\n",
|
||||
GSC_CLOCK_GATE_NAME);
|
||||
gsc->clock = ERR_PTR(-EINVAL);
|
||||
return ret;
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int gsc_m2m_suspend(struct gsc_dev *gsc)
|
||||
{
|
||||
unsigned long flags;
|
||||
|
@ -1098,7 +1068,6 @@ static int gsc_probe(struct platform_device *pdev)
|
|||
init_waitqueue_head(&gsc->irq_queue);
|
||||
spin_lock_init(&gsc->slock);
|
||||
mutex_init(&gsc->lock);
|
||||
gsc->clock = ERR_PTR(-EINVAL);
|
||||
|
||||
res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
|
||||
gsc->regs = devm_ioremap_resource(dev, res);
|
||||
|
@ -1111,9 +1080,19 @@ static int gsc_probe(struct platform_device *pdev)
|
|||
return -ENXIO;
|
||||
}
|
||||
|
||||
ret = gsc_clk_get(gsc);
|
||||
if (ret)
|
||||
gsc->clock = devm_clk_get(dev, GSC_CLOCK_GATE_NAME);
|
||||
if (IS_ERR(gsc->clock)) {
|
||||
dev_err(dev, "failed to get clock~~~: %s\n",
|
||||
GSC_CLOCK_GATE_NAME);
|
||||
return PTR_ERR(gsc->clock);
|
||||
}
|
||||
|
||||
ret = clk_prepare(gsc->clock);
|
||||
if (ret) {
|
||||
dev_err(&gsc->pdev->dev, "clock prepare failed for clock: %s\n",
|
||||
GSC_CLOCK_GATE_NAME);
|
||||
return ret;
|
||||
}
|
||||
|
||||
ret = devm_request_irq(dev, res->start, gsc_irq_handler,
|
||||
0, pdev->name, gsc);
|
||||
|
@ -1148,7 +1127,7 @@ static int gsc_probe(struct platform_device *pdev)
|
|||
err_v4l2:
|
||||
v4l2_device_unregister(&gsc->v4l2_dev);
|
||||
err_clk:
|
||||
gsc_clk_put(gsc);
|
||||
clk_unprepare(gsc->clock);
|
||||
return ret;
|
||||
}
|
||||
|
||||
|
@ -1161,7 +1140,7 @@ static int gsc_remove(struct platform_device *pdev)
|
|||
|
||||
vb2_dma_contig_clear_max_seg_size(&pdev->dev);
|
||||
pm_runtime_disable(&pdev->dev);
|
||||
gsc_clk_put(gsc);
|
||||
clk_unprepare(gsc->clock);
|
||||
|
||||
dev_dbg(&pdev->dev, "%s driver unloaded\n", pdev->name);
|
||||
return 0;
|
||||
|
|
Loading…
Reference in New Issue