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

Commit ae31c1fb authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman Committed by Takashi Iwai
Browse files

sound: 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.

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
Acked-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 091bf762

sound/aoa/fabrics/layout.c

+4 −4
Original line number Diff line number Diff line
@@ -1037,7 +1037,7 @@ static int aoa_fabric_layout_probe(struct soundbus_dev *sdev) 
	}

	ldev->selfptr_headphone.ptr = ldev;

	ldev->selfptr_lineout.ptr = ldev;

	sdev->ofdev.dev.driver_data = ldev;

	dev_set_drvdata(&sdev->ofdev.dev, ldev);

	list_add(&ldev->list, &layouts_list);

	layouts_list_items++;
@@ -1081,7 +1081,7 @@ static int aoa_fabric_layout_probe(struct soundbus_dev *sdev) 


static int aoa_fabric_layout_remove(struct soundbus_dev *sdev)

{

	struct layout_dev *ldev = sdev->ofdev.dev.driver_data;

	struct layout_dev *ldev = dev_get_drvdata(&sdev->ofdev.dev);

	int i;



	for (i=0; i<MAX_CODECS_PER_BUS; i++) {
@@ -1114,7 +1114,7 @@ static int aoa_fabric_layout_remove(struct soundbus_dev *sdev) 
#ifdef CONFIG_PM

static int aoa_fabric_layout_suspend(struct soundbus_dev *sdev, pm_message_t state)

{

	struct layout_dev *ldev = sdev->ofdev.dev.driver_data;

	struct layout_dev *ldev = dev_get_drvdata(&sdev->ofdev.dev);



	if (ldev->gpio.methods && ldev->gpio.methods->all_amps_off)

		ldev->gpio.methods->all_amps_off(&ldev->gpio);
@@ -1124,7 +1124,7 @@ static int aoa_fabric_layout_suspend(struct soundbus_dev *sdev, pm_message_t sta 


static int aoa_fabric_layout_resume(struct soundbus_dev *sdev)

{

	struct layout_dev *ldev = sdev->ofdev.dev.driver_data;

	struct layout_dev *ldev = dev_get_drvdata(&sdev->ofdev.dev);



	if (ldev->gpio.methods && ldev->gpio.methods->all_amps_off)

		ldev->gpio.methods->all_amps_restore(&ldev->gpio);

sound/aoa/soundbus/i2sbus/core.c

+4 −4
Original line number Diff line number Diff line
@@ -358,14 +358,14 @@ static int i2sbus_probe(struct macio_dev* dev, const struct of_device_id *match) 
		return -ENODEV;

	}



	dev->ofdev.dev.driver_data = control;

	dev_set_drvdata(&dev->ofdev.dev, control);



	return 0;

}



static int i2sbus_remove(struct macio_dev* dev)

{

	struct i2sbus_control *control = dev->ofdev.dev.driver_data;

	struct i2sbus_control *control = dev_get_drvdata(&dev->ofdev.dev);

	struct i2sbus_dev *i2sdev, *tmp;



	list_for_each_entry_safe(i2sdev, tmp, &control->list, item)
@@ -377,7 +377,7 @@ static int i2sbus_remove(struct macio_dev* dev) 
#ifdef CONFIG_PM

static int i2sbus_suspend(struct macio_dev* dev, pm_message_t state)

{

	struct i2sbus_control *control = dev->ofdev.dev.driver_data;

	struct i2sbus_control *control = dev_get_drvdata(&dev->ofdev.dev);

	struct codec_info_item *cii;

	struct i2sbus_dev* i2sdev;

	int err, ret = 0;
@@ -407,7 +407,7 @@ static int i2sbus_suspend(struct macio_dev* dev, pm_message_t state) 


static int i2sbus_resume(struct macio_dev* dev)

{

	struct i2sbus_control *control = dev->ofdev.dev.driver_data;

	struct i2sbus_control *control = dev_get_drvdata(&dev->ofdev.dev);

	struct codec_info_item *cii;

	struct i2sbus_dev* i2sdev;

	int err, ret = 0;

sound/soc/codecs/wm8400.c

+2 −2
Original line number Diff line number Diff line
@@ -1473,8 +1473,8 @@ static int wm8400_codec_probe(struct platform_device *dev) 


	codec = &priv->codec;

	codec->private_data = priv;

	codec->control_data = dev->dev.driver_data;

	priv->wm8400 = dev->dev.driver_data;

	codec->control_data = dev_get_drvdata(&dev->dev);

	priv->wm8400 = dev_get_drvdata(&dev->dev);



	ret = regulator_bulk_get(priv->wm8400->dev,

				 ARRAY_SIZE(power), &power[0]);

sound/soc/codecs/wm8731.c

+2 −2
Original line number Diff line number Diff line
@@ -666,14 +666,14 @@ static int __devinit wm8731_spi_probe(struct spi_device *spi) 
	codec->hw_write = (hw_write_t)wm8731_spi_write;

	codec->dev = &spi->dev;



	spi->dev.driver_data = wm8731;

	dev_set_drvdata(&spi->dev, wm8731);



	return wm8731_register(wm8731);

}



static int __devexit wm8731_spi_remove(struct spi_device *spi)

{

	struct wm8731_priv *wm8731 = spi->dev.driver_data;

	struct wm8731_priv *wm8731 = dev_get_drvdata(&spi->dev);



	wm8731_unregister(wm8731);

sound/soc/codecs/wm8753.c

+2 −2
Original line number Diff line number Diff line
@@ -1822,14 +1822,14 @@ static int __devinit wm8753_spi_probe(struct spi_device *spi) 
	codec->hw_write = (hw_write_t)wm8753_spi_write;

	codec->dev = &spi->dev;



	spi->dev.driver_data = wm8753;

	dev_set_drvdata(&spi->dev, wm8753);



	return wm8753_register(wm8753);

}



static int __devexit wm8753_spi_remove(struct spi_device *spi)

{

	struct wm8753_priv *wm8753 = spi->dev.driver_data;

	struct wm8753_priv *wm8753 = dev_get_drvdata(&spi->dev);

	wm8753_unregister(wm8753);

	return 0;

}