misc: 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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/misc/carma/carma-fpga-program.c b/drivers/misc/carma/carma-fpga-program.c
index 736c7714f5657000a5b82380f2928a1b6c89fe7c..fa017cf64bd197c17609632f7d52a914452baa0b 100644 (file)
--- a/drivers/misc/carma/carma-fpga-program.c
+++ b/drivers/misc/carma/carma-fpga-program.c
@@ -919,7 +919,7 @@ static bool dma_filter(struct dma_chan *chan, void *data)
 
 static int fpga_of_remove(struct platform_device *op)
 {
-       struct fpga_dev *priv = dev_get_drvdata(&op->dev);
+       struct fpga_dev *priv = platform_get_drvdata(op);
        struct device *this_device = priv->miscdev.this_device;
 
        sysfs_remove_group(&this_device->kobj, &fpga_attr_group);
@@ -969,7 +969,7 @@ static int fpga_of_probe(struct platform_device *op)
 
        kref_init(&priv->ref);
 
-       dev_set_drvdata(&op->dev, priv);
+       platform_set_drvdata(op, priv);
        priv->dev = &op->dev;
        mutex_init(&priv->lock);
        init_completion(&priv->completion);

diff --git a/drivers/misc/carma/carma-fpga.c b/drivers/misc/carma/carma-fpga.c
index 7508cafff1039a4d984fae009eec21fdc5863763..a2128af706b25600a3add4ea240f5312c8980bcf 100644 (file)
--- a/drivers/misc/carma/carma-fpga.c
+++ b/drivers/misc/carma/carma-fpga.c
@@ -1296,7 +1296,7 @@ static int data_of_probe(struct platform_device *op)
                goto out_return;
        }
 
-       dev_set_drvdata(&op->dev, priv);
+       platform_set_drvdata(op, priv);
        priv->dev = &op->dev;
        kref_init(&priv->ref);
        mutex_init(&priv->mutex);
@@ -1400,7 +1400,7 @@ out_return:
 
 static int data_of_remove(struct platform_device *op)
 {
-       struct fpga_device *priv = dev_get_drvdata(&op->dev);
+       struct fpga_device *priv = platform_get_drvdata(op);
        struct device *this_device = priv->miscdev.this_device;
 
        /* remove all sysfs files, now the device cannot be re-enabled */

diff --git a/drivers/misc/spear13xx_pcie_gadget.c b/drivers/misc/spear13xx_pcie_gadget.c
index 7deb25dc86a7b2fd101203af1bc5d5ccbd127046..84a8dabc18fb5e55aa0ef991761ca3fb5d182647 100644 (file)
--- a/drivers/misc/spear13xx_pcie_gadget.c
+++ b/drivers/misc/spear13xx_pcie_gadget.c
@@ -776,7 +776,7 @@ static int spear_pcie_gadget_probe(struct platform_device *pdev)
                goto err_iounmap_app;
        }
 
-       dev_set_drvdata(&pdev->dev, target);
+       platform_set_drvdata(pdev, target);
 
        irq = platform_get_irq(pdev, 0);
        if (irq < 0) {
@@ -863,7 +863,7 @@ static int spear_pcie_gadget_remove(struct platform_device *pdev)
        res0 = platform_get_resource(pdev, IORESOURCE_MEM, 0);
        res1 = platform_get_resource(pdev, IORESOURCE_MEM, 1);
        irq = platform_get_irq(pdev, 0);
-       target = dev_get_drvdata(&pdev->dev);
+       target = platform_get_drvdata(pdev);
        config = &target->config;
 
        free_irq(irq, NULL);

diff --git a/drivers/misc/ti-st/st_kim.c b/drivers/misc/ti-st/st_kim.c
index 83269f1d16e380e7b7c4e9ff234b456973c19f72..83907c72059420973fbccc2512a8db8c553e6300 100644 (file)
--- a/drivers/misc/ti-st/st_kim.c
+++ b/drivers/misc/ti-st/st_kim.c
@@ -680,7 +680,7 @@ void st_kim_ref(struct st_data_s **core_data, int id)
                *core_data = NULL;
                return;
        }
-       kim_gdata = dev_get_drvdata(&pdev->dev);
+       kim_gdata = platform_get_drvdata(pdev);
        *core_data = kim_gdata->core_data;
 }
 
@@ -735,7 +735,7 @@ static int kim_probe(struct platform_device *pdev)
                pr_err("no mem to allocate");
                return -ENOMEM;
        }
-       dev_set_drvdata(&pdev->dev, kim_gdata);
+       platform_set_drvdata(pdev, kim_gdata);
 
        err = st_core_init(&kim_gdata->core_data);
        if (err != 0) {
@@ -810,7 +810,7 @@ static int kim_remove(struct platform_device *pdev)
        struct ti_st_plat_data  *pdata = pdev->dev.platform_data;
        struct kim_data_s       *kim_gdata;
 
-       kim_gdata = dev_get_drvdata(&pdev->dev);
+       kim_gdata = platform_get_drvdata(pdev);
 
        /* Free the Bluetooth/FM/GPIO
         * nShutdown gpio from the system