aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJingoo Han <jg1.han@samsung.com>2013-05-23 06:35:23 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-05-30 08:46:15 -0400
commit9093ca8891e238adc323629d69aaae379fd38bb0 (patch)
tree948ddc6a63c685b400bfcaa297688917e42f1031
parentc6148f8f8ceb18fd6ae3b637c56e8327b73873eb (diff)
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>
-rw-r--r--drivers/misc/carma/carma-fpga-program.c4
-rw-r--r--drivers/misc/carma/carma-fpga.c4
-rw-r--r--drivers/misc/spear13xx_pcie_gadget.c4
-rw-r--r--drivers/misc/ti-st/st_kim.c6
4 files changed, 9 insertions, 9 deletions
diff --git a/drivers/misc/carma/carma-fpga-program.c b/drivers/misc/carma/carma-fpga-program.c
index 736c7714f565..fa017cf64bd1 100644
--- 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)
919 919
920static int fpga_of_remove(struct platform_device *op) 920static int fpga_of_remove(struct platform_device *op)
921{ 921{
922 struct fpga_dev *priv = dev_get_drvdata(&op->dev); 922 struct fpga_dev *priv = platform_get_drvdata(op);
923 struct device *this_device = priv->miscdev.this_device; 923 struct device *this_device = priv->miscdev.this_device;
924 924
925 sysfs_remove_group(&this_device->kobj, &fpga_attr_group); 925 sysfs_remove_group(&this_device->kobj, &fpga_attr_group);
@@ -969,7 +969,7 @@ static int fpga_of_probe(struct platform_device *op)
969 969
970 kref_init(&priv->ref); 970 kref_init(&priv->ref);
971 971
972 dev_set_drvdata(&op->dev, priv); 972 platform_set_drvdata(op, priv);
973 priv->dev = &op->dev; 973 priv->dev = &op->dev;
974 mutex_init(&priv->lock); 974 mutex_init(&priv->lock);
975 init_completion(&priv->completion); 975 init_completion(&priv->completion);
diff --git a/drivers/misc/carma/carma-fpga.c b/drivers/misc/carma/carma-fpga.c
index 7508cafff103..a2128af706b2 100644
--- 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)
1296 goto out_return; 1296 goto out_return;
1297 } 1297 }
1298 1298
1299 dev_set_drvdata(&op->dev, priv); 1299 platform_set_drvdata(op, priv);
1300 priv->dev = &op->dev; 1300 priv->dev = &op->dev;
1301 kref_init(&priv->ref); 1301 kref_init(&priv->ref);
1302 mutex_init(&priv->mutex); 1302 mutex_init(&priv->mutex);
@@ -1400,7 +1400,7 @@ out_return:
1400 1400
1401static int data_of_remove(struct platform_device *op) 1401static int data_of_remove(struct platform_device *op)
1402{ 1402{
1403 struct fpga_device *priv = dev_get_drvdata(&op->dev); 1403 struct fpga_device *priv = platform_get_drvdata(op);
1404 struct device *this_device = priv->miscdev.this_device; 1404 struct device *this_device = priv->miscdev.this_device;
1405 1405
1406 /* remove all sysfs files, now the device cannot be re-enabled */ 1406 /* 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 7deb25dc86a7..84a8dabc18fb 100644
--- 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)
776 goto err_iounmap_app; 776 goto err_iounmap_app;
777 } 777 }
778 778
779 dev_set_drvdata(&pdev->dev, target); 779 platform_set_drvdata(pdev, target);
780 780
781 irq = platform_get_irq(pdev, 0); 781 irq = platform_get_irq(pdev, 0);
782 if (irq < 0) { 782 if (irq < 0) {
@@ -863,7 +863,7 @@ static int spear_pcie_gadget_remove(struct platform_device *pdev)
863 res0 = platform_get_resource(pdev, IORESOURCE_MEM, 0); 863 res0 = platform_get_resource(pdev, IORESOURCE_MEM, 0);
864 res1 = platform_get_resource(pdev, IORESOURCE_MEM, 1); 864 res1 = platform_get_resource(pdev, IORESOURCE_MEM, 1);
865 irq = platform_get_irq(pdev, 0); 865 irq = platform_get_irq(pdev, 0);
866 target = dev_get_drvdata(&pdev->dev); 866 target = platform_get_drvdata(pdev);
867 config = &target->config; 867 config = &target->config;
868 868
869 free_irq(irq, NULL); 869 free_irq(irq, NULL);
diff --git a/drivers/misc/ti-st/st_kim.c b/drivers/misc/ti-st/st_kim.c
index 83269f1d16e3..83907c720594 100644
--- 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)
680 *core_data = NULL; 680 *core_data = NULL;
681 return; 681 return;
682 } 682 }
683 kim_gdata = dev_get_drvdata(&pdev->dev); 683 kim_gdata = platform_get_drvdata(pdev);
684 *core_data = kim_gdata->core_data; 684 *core_data = kim_gdata->core_data;
685} 685}
686 686
@@ -735,7 +735,7 @@ static int kim_probe(struct platform_device *pdev)
735 pr_err("no mem to allocate"); 735 pr_err("no mem to allocate");
736 return -ENOMEM; 736 return -ENOMEM;
737 } 737 }
738 dev_set_drvdata(&pdev->dev, kim_gdata); 738 platform_set_drvdata(pdev, kim_gdata);
739 739
740 err = st_core_init(&kim_gdata->core_data); 740 err = st_core_init(&kim_gdata->core_data);
741 if (err != 0) { 741 if (err != 0) {
@@ -810,7 +810,7 @@ static int kim_remove(struct platform_device *pdev)
810 struct ti_st_plat_data *pdata = pdev->dev.platform_data; 810 struct ti_st_plat_data *pdata = pdev->dev.platform_data;
811 struct kim_data_s *kim_gdata; 811 struct kim_data_s *kim_gdata;
812 812
813 kim_gdata = dev_get_drvdata(&pdev->dev); 813 kim_gdata = platform_get_drvdata(pdev);
814 814
815 /* Free the Bluetooth/FM/GPIO 815 /* Free the Bluetooth/FM/GPIO
816 * nShutdown gpio from the system 816 * nShutdown gpio from the system