Hi Ulf,
The patch looks good to me in general, just one possible optimisation:
On Tue, 5 Nov 2013, Ulf Hansson wrote:
> Signed-off-by: Ulf Hansson <ulf.hansson@xxxxxxxxxx>
> ---
> drivers/mmc/host/tmio_mmc.c | 32 ++++++++++++++++++--------------
> 1 file changed, 18 insertions(+), 14 deletions(-)
>
> diff --git a/drivers/mmc/host/tmio_mmc.c b/drivers/mmc/host/tmio_mmc.c
> index 8860d4d..a56a3fe 100644
> --- a/drivers/mmc/host/tmio_mmc.c
> +++ b/drivers/mmc/host/tmio_mmc.c
> @@ -23,38 +23,39 @@
>
> #include "tmio_mmc.h"
>
> -#ifdef CONFIG_PM
> -static int tmio_mmc_suspend(struct platform_device *dev, pm_message_t state)
> +#ifdef CONFIG_PM_SLEEP
> +static int tmio_mmc_suspend(struct device *dev)
> {
> - const struct mfd_cell *cell = mfd_get_cell(dev);
> + struct mmc_host *mmc = dev_get_drvdata(dev);
> + struct tmio_mmc_host *host = mmc_priv(mmc);
> + const struct mfd_cell *cell = mfd_get_cell(host->pdev);
Wouldn't it be better to just add
+ struct platform_device *pdev = to_platform_device(dev);
which would also simplify
> int ret;
>
> - ret = tmio_mmc_host_suspend(&dev->dev);
> + ret = tmio_mmc_host_suspend(dev);
>
> /* Tell MFD core it can disable us now.*/
> if (!ret && cell->disable)
> - cell->disable(dev);
> + cell->disable(host->pdev);
the above line to just
+ cell->disable(pdev);
>
> return ret;
> }
>
> -static int tmio_mmc_resume(struct platform_device *dev)
> +static int tmio_mmc_resume(struct device *dev)
> {
> - const struct mfd_cell *cell = mfd_get_cell(dev);
> + struct mmc_host *mmc = dev_get_drvdata(dev);
> + struct tmio_mmc_host *host = mmc_priv(mmc);
> + const struct mfd_cell *cell = mfd_get_cell(host->pdev);
> int ret = 0;
>
> /* Tell the MFD core we are ready to be enabled */
> if (cell->resume)
> - ret = cell->resume(dev);
> + ret = cell->resume(host->pdev);
Ditto in this function.
Thanks
Guennadi
>
> if (!ret)
> - ret = tmio_mmc_host_resume(&dev->dev);
> + ret = tmio_mmc_host_resume(dev);
>
> return ret;
> }
> -#else
> -#define tmio_mmc_suspend NULL
> -#define tmio_mmc_resume NULL
> #endif
>
> static int tmio_mmc_probe(struct platform_device *pdev)
> @@ -125,15 +126,18 @@ static int tmio_mmc_remove(struct platform_device *pdev)
>
> /* ------------------- device registration ----------------------- */
>
> +static const struct dev_pm_ops tmio_mmc_dev_pm_ops = {
> + SET_SYSTEM_SLEEP_PM_OPS(tmio_mmc_suspend, tmio_mmc_resume)
> +};
> +
> static struct platform_driver tmio_mmc_driver = {
> .driver = {
> .name = "tmio-mmc",
> .owner = THIS_MODULE,
> + .pm = &tmio_mmc_dev_pm_ops,
> },
> .probe = tmio_mmc_probe,
> .remove = tmio_mmc_remove,
> - .suspend = tmio_mmc_suspend,
> - .resume = tmio_mmc_resume,
> };
>
> module_platform_driver(tmio_mmc_driver);
> --
> 1.7.9.5
>
---
Guennadi Liakhovetski, Ph.D.
Freelance Open-Source Software Developer
http://www.open-technology.de/
--
To unsubscribe from this list: send the line "unsubscribe linux-mmc" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
