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

Commit 1902a9e6 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

mfd: remove driver_data direct access of struct device 



In the near future, the driver core is going to not allow direct access
to the driver_data pointer in struct device.  Instead, the functions
dev_get_drvdata() and dev_set_drvdata() should be used.  These functions
have been around since the beginning, so are backwards compatible with
all older kernel versions.

Cc: Samuel Ortiz <sameo@linux.intel.com>
Acked-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 79510cdb

drivers/mfd/htc-pasic3.c

+2 −2
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ struct pasic3_data { 
 */

void pasic3_write_register(struct device *dev, u32 reg, u8 val)

{

	struct pasic3_data *asic = dev->driver_data;

	struct pasic3_data *asic = dev_get_drvdata(dev);

	int bus_shift = asic->bus_shift;

	void __iomem *addr = asic->mapping + (REG_ADDR << bus_shift);

	void __iomem *data = asic->mapping + (REG_DATA << bus_shift);
@@ -50,7 +50,7 @@ EXPORT_SYMBOL(pasic3_write_register); /* for leds-pasic3 */ 
 */

u8 pasic3_read_register(struct device *dev, u32 reg)

{

	struct pasic3_data *asic = dev->driver_data;

	struct pasic3_data *asic = dev_get_drvdata(dev);

	int bus_shift = asic->bus_shift;

	void __iomem *addr = asic->mapping + (REG_ADDR << bus_shift);

	void __iomem *data = asic->mapping + (REG_DATA << bus_shift);

drivers/mfd/pcf50633-core.c

+1 −1
Original line number Diff line number Diff line
@@ -618,7 +618,7 @@ static int __devinit pcf50633_probe(struct i2c_client *client, 


		pdev->dev.parent = pcf->dev;

		pdev->dev.platform_data = &pdata->reg_init_data[i];

		pdev->dev.driver_data = pcf;

		dev_set_drvdata(&pdev->dev, pcf);

		pcf->regulator_pdev[i] = pdev;



		platform_device_add(pdev);

drivers/mfd/wm8400-core.c

+1 −1
Original line number Diff line number Diff line
@@ -265,7 +265,7 @@ static int wm8400_init(struct wm8400 *wm8400, 


	mutex_init(&wm8400->io_lock);



	wm8400->dev->driver_data = wm8400;

	dev_set_drvdata(wm8400->dev, wm8400);



	/* Check that this is actually a WM8400 */

	ret = wm8400->read_dev(wm8400->io_data, WM8400_RESET_ID, 1, &reg);