On Tue, Aug 21, 2012 at 11:47:42AM +0530, Shubhrajyoti D wrote: > Call the pm_runtime functions directly making room for possible > pm optimisations. Also the runtime functions aren't just about > enabling and disabling of clocks though it does enable clocks also. > > Signed-off-by: Shubhrajyoti D <shubhrajy...@ti.com>
Acked-by: Felipe Balbi <ba...@ti.com>
> ---
> drivers/spi/spi-omap2-mcspi.c | 28 +++++++++++-----------------
> 1 files changed, 11 insertions(+), 17 deletions(-)
>
> diff --git a/drivers/spi/spi-omap2-mcspi.c b/drivers/spi/spi-omap2-mcspi.c
> index 259f601..dd887eb 100644
> --- a/drivers/spi/spi-omap2-mcspi.c
> +++ b/drivers/spi/spi-omap2-mcspi.c
> @@ -260,16 +260,6 @@ static void omap2_mcspi_restore_ctx(struct omap2_mcspi
> *mcspi)
> list_for_each_entry(cs, &ctx->cs, node)
> __raw_writel(cs->chconf0, cs->base + OMAP2_MCSPI_CHCONF0);
> }
> -static void omap2_mcspi_disable_clocks(struct omap2_mcspi *mcspi)
> -{
> - pm_runtime_mark_last_busy(mcspi->dev);
> - pm_runtime_put_autosuspend(mcspi->dev);
> -}
> -
> -static int omap2_mcspi_enable_clocks(struct omap2_mcspi *mcspi)
> -{
> - return pm_runtime_get_sync(mcspi->dev);
> -}
>
> static int omap2_prepare_transfer(struct spi_master *master)
> {
> @@ -848,12 +838,13 @@ static int omap2_mcspi_setup(struct spi_device *spi)
> return ret;
> }
>
> - ret = omap2_mcspi_enable_clocks(mcspi);
> + ret = pm_runtime_get_sync(mcspi->dev);
> if (ret < 0)
> return ret;
>
> ret = omap2_mcspi_setup_transfer(spi, NULL);
> - omap2_mcspi_disable_clocks(mcspi);
> + pm_runtime_mark_last_busy(mcspi->dev);
> + pm_runtime_put_autosuspend(mcspi->dev);
>
> return ret;
> }
> @@ -1067,7 +1058,7 @@ static int __devinit omap2_mcspi_master_setup(struct
> omap2_mcspi *mcspi)
> struct omap2_mcspi_regs *ctx = &mcspi->ctx;
> int ret = 0;
>
> - ret = omap2_mcspi_enable_clocks(mcspi);
> + ret = pm_runtime_get_sync(mcspi->dev);
> if (ret < 0)
> return ret;
>
> @@ -1076,7 +1067,8 @@ static int __devinit omap2_mcspi_master_setup(struct
> omap2_mcspi *mcspi)
> ctx->wakeupenable = OMAP2_MCSPI_WAKEUPENABLE_WKEN;
>
> omap2_mcspi_set_master_mode(master);
> - omap2_mcspi_disable_clocks(mcspi);
> + pm_runtime_mark_last_busy(mcspi->dev);
> + pm_runtime_put_autosuspend(mcspi->dev);
> return 0;
> }
>
> @@ -1251,7 +1243,8 @@ static int __devexit omap2_mcspi_remove(struct
> platform_device *pdev)
> mcspi = spi_master_get_devdata(master);
> dma_channels = mcspi->dma_channels;
>
> - omap2_mcspi_disable_clocks(mcspi);
> + pm_runtime_mark_last_busy(mcspi->dev);
> + pm_runtime_put_autosuspend(mcspi->dev);
> pm_runtime_disable(&pdev->dev);
>
> spi_unregister_master(master);
> @@ -1276,7 +1269,7 @@ static int omap2_mcspi_resume(struct device *dev)
> struct omap2_mcspi_regs *ctx = &mcspi->ctx;
> struct omap2_mcspi_cs *cs;
>
> - omap2_mcspi_enable_clocks(mcspi);
> + pm_runtime_get_sync(mcspi->dev);
> list_for_each_entry(cs, &ctx->cs, node) {
> if ((cs->chconf0 & OMAP2_MCSPI_CHCONF_FORCE) == 0) {
> /*
> @@ -1289,7 +1282,8 @@ static int omap2_mcspi_resume(struct device *dev)
> __raw_writel(cs->chconf0, cs->base +
> OMAP2_MCSPI_CHCONF0);
> }
> }
> - omap2_mcspi_disable_clocks(mcspi);
> + pm_runtime_mark_last_busy(mcspi->dev);
> + pm_runtime_put_autosuspend(mcspi->dev);
> return 0;
> }
> #else
> --
> 1.7.5.4
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> the body of a message to majord...@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at http://www.tux.org/lkml/
--
balbi
signature.asc
Description: Digital signature
