Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

mmc: host: simplify getting .drvdata

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>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>

authored by

Wolfram Sang and committed by
Ulf Hansson
970f2d90 909b3456

+6 -12
+2 -4
drivers/mmc/host/davinci_mmc.c
··· 1377 1377 #ifdef CONFIG_PM 1378 1378 static int davinci_mmcsd_suspend(struct device *dev) 1379 1379 { 1380 - struct platform_device *pdev = to_platform_device(dev); 1381 - struct mmc_davinci_host *host = platform_get_drvdata(pdev); 1380 + struct mmc_davinci_host *host = dev_get_drvdata(dev); 1382 1381 1383 1382 writel(0, host->base + DAVINCI_MMCIM); 1384 1383 mmc_davinci_reset_ctrl(host, 1); ··· 1388 1389 1389 1390 static int davinci_mmcsd_resume(struct device *dev) 1390 1391 { 1391 - struct platform_device *pdev = to_platform_device(dev); 1392 - struct mmc_davinci_host *host = platform_get_drvdata(pdev); 1392 + struct mmc_davinci_host *host = dev_get_drvdata(dev); 1393 1393 1394 1394 clk_enable(host->clk); 1395 1395 mmc_davinci_reset_ctrl(host, 0);
+2 -4
drivers/mmc/host/sdhci-of-arasan.c
··· 360 360 */ 361 361 static int sdhci_arasan_suspend(struct device *dev) 362 362 { 363 - struct platform_device *pdev = to_platform_device(dev); 364 - struct sdhci_host *host = platform_get_drvdata(pdev); 363 + struct sdhci_host *host = dev_get_drvdata(dev); 365 364 struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host); 366 365 struct sdhci_arasan_data *sdhci_arasan = sdhci_pltfm_priv(pltfm_host); 367 366 int ret; ··· 403 404 */ 404 405 static int sdhci_arasan_resume(struct device *dev) 405 406 { 406 - struct platform_device *pdev = to_platform_device(dev); 407 - struct sdhci_host *host = platform_get_drvdata(pdev); 407 + struct sdhci_host *host = dev_get_drvdata(dev); 408 408 struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host); 409 409 struct sdhci_arasan_data *sdhci_arasan = sdhci_pltfm_priv(pltfm_host); 410 410 int ret;
+2 -4
drivers/mmc/host/wmt-sdmmc.c
··· 928 928 static int wmt_mci_suspend(struct device *dev) 929 929 { 930 930 u32 reg_tmp; 931 - struct platform_device *pdev = to_platform_device(dev); 932 - struct mmc_host *mmc = platform_get_drvdata(pdev); 931 + struct mmc_host *mmc = dev_get_drvdata(dev); 933 932 struct wmt_mci_priv *priv; 934 933 935 934 if (!mmc) ··· 952 953 static int wmt_mci_resume(struct device *dev) 953 954 { 954 955 u32 reg_tmp; 955 - struct platform_device *pdev = to_platform_device(dev); 956 - struct mmc_host *mmc = platform_get_drvdata(pdev); 956 + struct mmc_host *mmc = dev_get_drvdata(dev); 957 957 struct wmt_mci_priv *priv; 958 958 959 959 if (mmc) {