Skip to contentSkip to conversation

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

PATCH In review Jingoo Han 2 participants 2 messages Jun 3, 2013 – Jun 27, 2013

Subsystems (2)
MMC, SD and SDIO Ene CB710 flash card reader driver
lore
Share & tools
lore

Jingoo Han

author
#0 lore raw

PATCH v2 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.

Signed-off-by Jingoo Han <[email protected]>
Acked-by Michał Mirosław <[email protected]>

---
Changes since v1:
- Fixed the missed counterpart - cb710_slot_to_mmc() in cb710-mmc.h.

 drivers/mmc/host/cb710-mmc.c      |    2 +-
 drivers/mmc/host/cb710-mmc.h      |    2 +-
 drivers/mmc/host/sh_mobile_sdhi.c |    6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)
drivers/mmc/host/cb710-mmc.c +1 -1
index 777ca20..9d6e2b8 100644
@@ -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/cb710-mmc.h +1 -1
index e845c77..8984ec8 100644
@@ -24,7 +24,7 @@ struct cb710_mmc_reader {
 
 static inline struct mmc_host *cb710_slot_to_mmc(struct cb710_slot *slot)
 {
-	return dev_get_drvdata(&slot->pdev.dev);
+	return platform_get_drvdata(&slot->pdev);
 }
 
 static inline struct cb710_slot *cb710_mmc_to_slot(struct mmc_host *mmc)
drivers/mmc/host/sh_mobile_sdhi.c +3 -3
index cc4c872..6a5d90e 100644
@@ -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 int
 
 static 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
#1 lore raw

Hi Jingoo,

Quoted 9 lines · Jingoo Han

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 <[email protected]>
Acked-by Michał Mirosław <[email protected]>

---
Changes since v1:
- Fixed the missed counterpart - cb710_slot_to_mmc() in cb710-mmc.h.

Thanks, pushed to mmc-next for 3.11.

- Chris.

Signature · 2 lines
Chris Ball   <[email protected]>   <http://printf.net/>
One Laptop Per Child