lkml.org 
[lkml]   [2018]   [Apr]   [20]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    /
    From
    Date
    SubjectRe: [PATCH 28/61] mmc: host: simplify getting .drvdata
    On 19 April 2018 at 16:05, Wolfram Sang
    <wsa+renesas@sang-engineering.com> wrote:
    > We should get drvdata from struct device directly. Going via
    > platform_device is an unneeded step back and forth.
    >
    > Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>

    Thanks, applied for next!

    Kind regards
    Uffe

    > ---
    >
    > Build tested only. buildbot is happy. Please apply individually.
    >
    > drivers/mmc/host/davinci_mmc.c | 6 ++----
    > drivers/mmc/host/sdhci-of-arasan.c | 6 ++----
    > drivers/mmc/host/wmt-sdmmc.c | 6 ++----
    > 3 files changed, 6 insertions(+), 12 deletions(-)
    >
    > diff --git a/drivers/mmc/host/davinci_mmc.c b/drivers/mmc/host/davinci_mmc.c
    > index 8e363174f9d6..9e68c3645e22 100644
    > --- a/drivers/mmc/host/davinci_mmc.c
    > +++ b/drivers/mmc/host/davinci_mmc.c
    > @@ -1377,8 +1377,7 @@ static int __exit davinci_mmcsd_remove(struct platform_device *pdev)
    > #ifdef CONFIG_PM
    > static int davinci_mmcsd_suspend(struct device *dev)
    > {
    > - struct platform_device *pdev = to_platform_device(dev);
    > - struct mmc_davinci_host *host = platform_get_drvdata(pdev);
    > + struct mmc_davinci_host *host = dev_get_drvdata(dev);
    >
    > writel(0, host->base + DAVINCI_MMCIM);
    > mmc_davinci_reset_ctrl(host, 1);
    > @@ -1389,8 +1388,7 @@ static int davinci_mmcsd_suspend(struct device *dev)
    >
    > static int davinci_mmcsd_resume(struct device *dev)
    > {
    > - struct platform_device *pdev = to_platform_device(dev);
    > - struct mmc_davinci_host *host = platform_get_drvdata(pdev);
    > + struct mmc_davinci_host *host = dev_get_drvdata(dev);
    >
    > clk_enable(host->clk);
    > mmc_davinci_reset_ctrl(host, 0);
    > diff --git a/drivers/mmc/host/sdhci-of-arasan.c b/drivers/mmc/host/sdhci-of-arasan.c
    > index c33a5f7393bd..bed3612247b0 100644
    > --- a/drivers/mmc/host/sdhci-of-arasan.c
    > +++ b/drivers/mmc/host/sdhci-of-arasan.c
    > @@ -359,8 +359,7 @@ static const struct sdhci_pltfm_data sdhci_arasan_cqe_pdata = {
    > */
    > static int sdhci_arasan_suspend(struct device *dev)
    > {
    > - struct platform_device *pdev = to_platform_device(dev);
    > - struct sdhci_host *host = platform_get_drvdata(pdev);
    > + struct sdhci_host *host = dev_get_drvdata(dev);
    > struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host);
    > struct sdhci_arasan_data *sdhci_arasan = sdhci_pltfm_priv(pltfm_host);
    > int ret;
    > @@ -403,8 +402,7 @@ static int sdhci_arasan_suspend(struct device *dev)
    > */
    > static int sdhci_arasan_resume(struct device *dev)
    > {
    > - struct platform_device *pdev = to_platform_device(dev);
    > - struct sdhci_host *host = platform_get_drvdata(pdev);
    > + struct sdhci_host *host = dev_get_drvdata(dev);
    > struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host);
    > struct sdhci_arasan_data *sdhci_arasan = sdhci_pltfm_priv(pltfm_host);
    > int ret;
    > diff --git a/drivers/mmc/host/wmt-sdmmc.c b/drivers/mmc/host/wmt-sdmmc.c
    > index fd30ac7da5e5..3ba42f508014 100644
    > --- a/drivers/mmc/host/wmt-sdmmc.c
    > +++ b/drivers/mmc/host/wmt-sdmmc.c
    > @@ -928,8 +928,7 @@ static int wmt_mci_remove(struct platform_device *pdev)
    > static int wmt_mci_suspend(struct device *dev)
    > {
    > u32 reg_tmp;
    > - struct platform_device *pdev = to_platform_device(dev);
    > - struct mmc_host *mmc = platform_get_drvdata(pdev);
    > + struct mmc_host *mmc = dev_get_drvdata(dev);
    > struct wmt_mci_priv *priv;
    >
    > if (!mmc)
    > @@ -953,8 +952,7 @@ static int wmt_mci_suspend(struct device *dev)
    > static int wmt_mci_resume(struct device *dev)
    > {
    > u32 reg_tmp;
    > - struct platform_device *pdev = to_platform_device(dev);
    > - struct mmc_host *mmc = platform_get_drvdata(pdev);
    > + struct mmc_host *mmc = dev_get_drvdata(dev);
    > struct wmt_mci_priv *priv;
    >
    > if (mmc) {
    > --
    > 2.11.0
    >

    \
     
     \ /
      Last update: 2018-04-20 09:10    [W:4.042 / U:0.104 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site