b53: use drvdata to store driver data
authorhauke <hauke@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Mon, 20 Jan 2014 20:01:22 +0000 (20:01 +0000)
committerhauke <hauke@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Mon, 20 Jan 2014 20:01:22 +0000 (20:01 +0000)
we should not abuse the platform_data pointer.

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@39354 3c298f89-4303-0410-b956-a3cf2f4a3e73

target/linux/generic/files/drivers/net/phy/b53/b53_mmap.c
target/linux/generic/files/drivers/net/phy/b53/b53_spi.c
target/linux/generic/files/drivers/net/phy/b53/b53_srab.c

index 1fd0158..272360f 100644 (file)
@@ -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);
        }
 
index 6050fea..8c6b171 100644 (file)
@@ -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;
index f0743b7..a68e275 100644 (file)
@@ -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);
        }