mmc: host: use platform_{get,set}_drvdata()
Subsystems (2)
PATCH 1/1 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.
--- drivers/mmc/host/cb710-mmc.c | 2 +- drivers/mmc/host/sh_mobile_sdhi.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-)
drivers/mmc/host/cb710-mmc.c +1 -1
@@ -703,7 +703,7 @@ static int cb710_mmc_init(struct platform_device *pdev)if (!mmc)return -ENOMEM ; -dev_set_drvdata (&pdev->dev, mmc); +platform_set_drvdata (pdev, mmc);/* harmless (maybe) magic */ pci_read_config_dword (chip->pdev,0x48 , &val);
drivers/mmc/host/sh_mobile_sdhi.c +3 -3
@@ -51,7 +51,7 @@ struct sh_mobile_sdhi {static int sh_mobile_sdhi_clk_enable (struct platform_device *pdev,unsigned int *f) { -struct mmc_host *mmc =dev_get_drvdata (&pdev->dev); +struct mmc_host *mmc =platform_get_drvdata (pdev);struct tmio_mmc_host *host =mmc_priv (mmc); struct sh_mobile_sdhi *priv = container_of(host->pdata, struct sh_mobile_sdhi, mmc_data);int ret =clk_enable (priv->clk);
@@ -64,7 +64,7 @@ static int sh_mobile_sdhi_clk_enable(struct platform_device *pdev, unsigned intstatic void sh_mobile_sdhi_clk_disable (struct platform_device *pdev) { -struct mmc_host *mmc =dev_get_drvdata (&pdev->dev); +struct mmc_host *mmc =platform_get_drvdata (pdev);struct tmio_mmc_host *host =mmc_priv (mmc); struct sh_mobile_sdhi *priv = container_of(host->pdata, struct sh_mobile_sdhi, mmc_data);clk_disable (priv->clk);
@@ -119,7 +119,7 @@ static int sh_mobile_sdhi_write16_hook(struct tmio_mmc_host *host, int addr)static void sh_mobile_sdhi_cd_wakeup (const struct platform_device *pdev) { -mmc_detect_change (dev_get_drvdata (&pdev->dev),msecs_to_jiffies (100 )); +mmc_detect_change (platform_get_drvdata (pdev),msecs_to_jiffies (100 )); }static const struct sh_mobile_sdhi_ops sdhi_ops = {
Signature · 1 line
1.7.10.4
Quoted 15 lines · Jingoo Han
Use the wrapper functions for getting and setting the driver data using
platform_deviceinstead of using dev_{get,set}_drvdata() with&pdev->dev, so we can directly pass a structplatform_device.Signed-off-by Jingoo Han <[email protected]>--- drivers/mmc/host/cb710-mmc.c | 2 +- drivers/mmc/host/sh_mobile_sdhi.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-)drivers/mmc/host/cb710-mmc.c +0
-0
drivers/mmc/host/cb710-mmc.c static int cb710_mmc_init(struct platform_device *pdev) · line 709
Quoted 8 lines
drivers/mmc/host/cb710-mmc.c +1
-1@@ -703,7 +703,7 @@ static int cb710_mmc_init(struct platform_device *pdev)if (!mmc)return -ENOMEM ; -dev_set_drvdata (&pdev->dev, mmc); +platform_set_drvdata (pdev, mmc);/* harmless (maybe) magic */ pci_read_config_dword (chip->pdev,0x48 , &val);
You missed the counterpart - cb710_slot_to_mmc() in cb710-mmc.h. After the fix:
Best Regards,
Michał Mirosław
Quoted 19 lines · Michał Mirosław
Quoted 18 lines · Jingoo Han
Use the wrapper functions for getting and setting the driver data using
platform_deviceinstead of using dev_{get,set}_drvdata() with&pdev->dev, so we can directly pass a structplatform_device.Signed-off-by Jingoo Han <[email protected]>--- drivers/mmc/host/cb710-mmc.c | 2 +- drivers/mmc/host/sh_mobile_sdhi.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-)drivers/mmc/host/cb710-mmc.c +0
-0@@ -703,7 +703,7 @@ static int cb710_mmc_init(struct platform_device *pdev)if (!mmc)return -ENOMEM ;
Quoted 8 lines
drivers/mmc/host/cb710-mmc.c static int cb710_mmc_init(struct platform_device *pdev) · line 709
Quoted 5 lines
drivers/mmc/host/cb710-mmc.c +1
-1-dev_set_drvdata (&pdev->dev, mmc); +platform_set_drvdata (pdev, mmc);/* harmless (maybe) magic */ pci_read_config_dword (chip->pdev,0x48 , &val);You missed the counterpart -
cb710_slot_to_mmc()incb710-mmc.h. After the fix:
Oh, thank you for your comment. :)
I will fix and send v2 patch soon.
Thank you.
Best regards,
Jingoo Han
Quoted 6 lines
Acked-by Michał Mirosław <[email protected]>[for cb710]Best Regards,
Michał Mirosław