From: Hauke Mehrtens <hauke@hauke-m.de>
Date: Mon, 20 Jan 2014 20:01:22 +0000 (+0000)
Subject: b53: use drvdata to store driver data
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=67fe82a9e10ae3a263afe608cd4ff0b6cd4a6837;p=openwrt%2Fsvn-archive%2Farchive.git

b53: use drvdata to store driver data

we should not abuse the platform_data pointer.

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>


SVN-Revision: 39354
---

diff --git a/target/linux/generic/files/drivers/net/phy/b53/b53_mmap.c b/target/linux/generic/files/drivers/net/phy/b53/b53_mmap.c
index 1fd01581a2..272360f6de 100644
--- a/target/linux/generic/files/drivers/net/phy/b53/b53_mmap.c
+++ b/target/linux/generic/files/drivers/net/phy/b53/b53_mmap.c
@@ -210,17 +210,16 @@ static int b53_mmap_probe(struct platform_device *pdev)
 	if (pdata)
 		dev->pdata = pdata;
 
-	pdev->dev.platform_data = dev;
+	platform_set_drvdata(pdev, dev);
 
 	return b53_switch_register(dev);
 }
 
 static int b53_mmap_remove(struct platform_device *pdev)
 {
-	struct b53_device *dev = pdev->dev.platform_data;
+	struct b53_device *dev = platform_get_drvdata(pdev);
 
 	if (dev) {
-		pdev->dev.platform_data = dev->pdata;
 		b53_switch_remove(dev);
 	}
 
diff --git a/target/linux/generic/files/drivers/net/phy/b53/b53_spi.c b/target/linux/generic/files/drivers/net/phy/b53/b53_spi.c
index 6050fea32e..8c6b171e75 100644
--- a/target/linux/generic/files/drivers/net/phy/b53/b53_spi.c
+++ b/target/linux/generic/files/drivers/net/phy/b53/b53_spi.c
@@ -294,19 +294,17 @@ static int b53_spi_probe(struct spi_device *spi)
 	if (ret)
 		return ret;
 
-	spi->dev.platform_data = dev;
+	spi_set_drvdata(spi, dev);
 
 	return 0;
 }
 
 static int b53_spi_remove(struct spi_device *spi)
 {
-	struct b53_device *dev = spi->dev.platform_data;
+	struct b53_device *dev = spi_get_drvdata(spi);
 
 	if (dev) {
-		struct b53_platform_data *pdata = dev->pdata;
 		b53_switch_remove(dev);
-		spi->dev.platform_data = pdata;
 	}
 
 	return 0;
diff --git a/target/linux/generic/files/drivers/net/phy/b53/b53_srab.c b/target/linux/generic/files/drivers/net/phy/b53/b53_srab.c
index f0743b7017..a68e27540a 100644
--- a/target/linux/generic/files/drivers/net/phy/b53/b53_srab.c
+++ b/target/linux/generic/files/drivers/net/phy/b53/b53_srab.c
@@ -349,17 +349,16 @@ static int b53_srab_probe(struct platform_device *pdev)
 	if (pdata)
 		dev->pdata = pdata;
 
-	pdev->dev.platform_data = dev;
+	platform_set_drvdata(pdev, dev);
 
 	return b53_switch_register(dev);
 }
 
 static int b53_srab_remove(struct platform_device *pdev)
 {
-	struct b53_device *dev = pdev->dev.platform_data;
+	struct b53_device *dev = platform_get_drvdata(pdev);
 
 	if (dev) {
-		pdev->dev.platform_data = dev->pdata;
 		b53_switch_remove(dev);
 	}