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

mmc: host: use platform_{get,set}_drvdata()

Use the wrapper functions for getting and setting the driver data using
platform_device instead of using dev_{get,set}_drvdata() with &pdev->dev,
so we can directly pass a struct platform_device.

Signed-off-by: Jingoo Han <jg1.han@samsung.com>
Acked-by: Michał Mirosław <mirq-linux@rere.qmqm.pl>
Signed-off-by: Chris Ball <cjb@laptop.org>

authored by

Jingoo Han and committed by
Chris Ball
6e2c0f3f 7913ae7d

+5 -5
+1 -1
drivers/mmc/host/cb710-mmc.c
··· 703 703 if (!mmc) 704 704 return -ENOMEM; 705 705 706 - dev_set_drvdata(&pdev->dev, mmc); 706 + platform_set_drvdata(pdev, mmc); 707 707 708 708 /* harmless (maybe) magic */ 709 709 pci_read_config_dword(chip->pdev, 0x48, &val);
+1 -1
drivers/mmc/host/cb710-mmc.h
··· 24 24 25 25 static inline struct mmc_host *cb710_slot_to_mmc(struct cb710_slot *slot) 26 26 { 27 - return dev_get_drvdata(&slot->pdev.dev); 27 + return platform_get_drvdata(&slot->pdev); 28 28 } 29 29 30 30 static inline struct cb710_slot *cb710_mmc_to_slot(struct mmc_host *mmc)
+3 -3
drivers/mmc/host/sh_mobile_sdhi.c
··· 51 51 52 52 static int sh_mobile_sdhi_clk_enable(struct platform_device *pdev, unsigned int *f) 53 53 { 54 - struct mmc_host *mmc = dev_get_drvdata(&pdev->dev); 54 + struct mmc_host *mmc = platform_get_drvdata(pdev); 55 55 struct tmio_mmc_host *host = mmc_priv(mmc); 56 56 struct sh_mobile_sdhi *priv = container_of(host->pdata, struct sh_mobile_sdhi, mmc_data); 57 57 int ret = clk_enable(priv->clk); ··· 64 64 65 65 static void sh_mobile_sdhi_clk_disable(struct platform_device *pdev) 66 66 { 67 - struct mmc_host *mmc = dev_get_drvdata(&pdev->dev); 67 + struct mmc_host *mmc = platform_get_drvdata(pdev); 68 68 struct tmio_mmc_host *host = mmc_priv(mmc); 69 69 struct sh_mobile_sdhi *priv = container_of(host->pdata, struct sh_mobile_sdhi, mmc_data); 70 70 clk_disable(priv->clk); ··· 119 119 120 120 static void sh_mobile_sdhi_cd_wakeup(const struct platform_device *pdev) 121 121 { 122 - mmc_detect_change(dev_get_drvdata(&pdev->dev), msecs_to_jiffies(100)); 122 + mmc_detect_change(platform_get_drvdata(pdev), msecs_to_jiffies(100)); 123 123 } 124 124 125 125 static const struct sh_mobile_sdhi_ops sdhi_ops = {