Message ID | 1350472311-9748-2-git-send-email-sachin.kamat@linaro.org |
---|---|
State | Rejected |
Headers | show |
Hi Sachin, On 10/17/2012 01:11 PM, Sachin Kamat wrote: > Replace clk_enable/clk_disable with clk_prepare_enable/clk_disable_unprepare > as required by the common clock framework. > > Signed-off-by: Sachin Kamat<sachin.kamat@linaro.org> > Cc: Kamil Debski<k.debski@samsung.com> As we discussed previously, this patch is not needed. clk_prepare/unprepare are done in this driver's probe() and remove() callbacks. Thanks, Sylwester
diff --git a/drivers/media/platform/s5p-g2d/g2d.c b/drivers/media/platform/s5p-g2d/g2d.c index 1bfbc32..adecd25 100644 --- a/drivers/media/platform/s5p-g2d/g2d.c +++ b/drivers/media/platform/s5p-g2d/g2d.c @@ -589,7 +589,7 @@ static void device_run(void *prv) src = v4l2_m2m_next_src_buf(ctx->m2m_ctx); dst = v4l2_m2m_next_dst_buf(ctx->m2m_ctx); - clk_enable(dev->gate); + clk_prepare_enable(dev->gate); g2d_reset(dev); spin_lock_irqsave(&dev->ctrl_lock, flags); @@ -619,7 +619,7 @@ static irqreturn_t g2d_isr(int irq, void *prv) struct vb2_buffer *src, *dst; g2d_clear_int(dev); - clk_disable(dev->gate); + clk_disable_unprepare(dev->gate); BUG_ON(ctx == NULL);
Replace clk_enable/clk_disable with clk_prepare_enable/clk_disable_unprepare as required by the common clock framework. Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org> Cc: Kamil Debski <k.debski@samsung.com> --- drivers/media/platform/s5p-g2d/g2d.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)