From: Murali Karicheri Date: Thu, 30 Aug 2012 18:03:57 +0000 (-0400) Subject: gpio: davinci: preparation for switch to common clock framework X-Git-Tag: v3.7-rc1~143^2~27 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ce6b658dc040cf4aa3a30f56115e81d15d91596e;p=platform%2Fupstream%2Fkernel-adaptation-pc.git gpio: davinci: preparation for switch to common clock framework As a first step towards migrating davinci platforms to use common clock framework, replace all instances of clk_enable() with clk_prepare_enable() and clk_disable() with clk_disable_unprepare(). Until the platform is switched to use the CONFIG_HAVE_CLK_PREPARE Kconfig variable, this just adds a might_sleep() call and would work without any issues. This will make it easy later to switch to common clk based implementation of clk driver from DaVinci specific driver. Signed-off-by: Murali Karicheri Signed-off-by: Linus Walleij --- diff --git a/drivers/gpio/gpio-davinci.c b/drivers/gpio/gpio-davinci.c index 3d00016..17df6db 100644 --- a/drivers/gpio/gpio-davinci.c +++ b/drivers/gpio/gpio-davinci.c @@ -366,7 +366,7 @@ static int __init davinci_gpio_irq_setup(void) PTR_ERR(clk)); return PTR_ERR(clk); } - clk_enable(clk); + clk_prepare_enable(clk); /* Arrange gpio_to_irq() support, handling either direct IRQs or * banked IRQs. Having GPIOs in the first GPIO bank use direct