Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9093ca88 authored by Jingoo Han's avatar Jingoo Han Committed by Greg Kroah-Hartman
Browse files

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: default avatarJingoo Han <jg1.han@samsung.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent c6148f8f

drivers/misc/carma/carma-fpga-program.c

+2 −2
Original line number Diff line number Diff line
@@ -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);

drivers/misc/carma/carma-fpga.c

+2 −2
Original line number Diff line number Diff line
@@ -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 @@ static int data_of_probe(struct platform_device *op) 


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 */

drivers/misc/spear13xx_pcie_gadget.c

+2 −2
Original line number Diff line number Diff line
@@ -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);

drivers/misc/ti-st/st_kim.c

+3 −3
Original line number Diff line number Diff line
@@ -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