sound: remove driver_data direct access of struct device
PATCH 1/1 sound: remove driver_data direct access of struct device
From: Greg Kroah-Hartman <[email protected]>
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.
--- sound/aoa/fabrics/layout.c | 8 ++++---- sound/aoa/soundbus/i2sbus/core.c | 8 ++++---- sound/soc/codecs/wm8400.c | 4 ++-- sound/soc/codecs/wm8731.c | 4 ++-- sound/soc/codecs/wm8753.c | 4 ++-- 5 files changed, 14 insertions(+), 14 deletions(-)
sound/aoa/fabrics/layout.c +4 -4
@@ -1037,7 +1037,7 @@ static int aoa_fabric_layout_probe(struc } 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(strucstatic 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(stru#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(strstatic 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
@@ -358,14 +358,14 @@ static int i2sbus_probe(struct macio_devreturn -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_de#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_dstatic 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
@@ -1473,8 +1473,8 @@ static int wm8400_codec_probe(struct pla 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
@@ -666,14 +666,14 @@ static int __devinit wm8731_spi_probe(st 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
@@ -1822,14 +1822,14 @@ static int __devinit wm8753_spi_probe(st 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 ; }
Quoted 9 lines · Greg Kroah-Hartman
From: Greg Kroah-Hartman <[email protected]>
In the near future, the driver core is going to not allow direct access to the
driver_datapointer in struct device. Instead, the functionsdev_get_drvdata()anddev_set_drvdata()should be used. These functions have been around since the beginning, so are backwards compatible with all older kernel versions.Cc Takashi Iwai <[email protected]>
Quoted 9 lines · Mark Brown
Quoted 7 lines · Greg Kroah-Hartman
From: Greg Kroah-Hartman <[email protected]>
In the near future, the driver core is going to not allow direct access to the
driver_datapointer in struct device. Instead, the functionsdev_get_drvdata()anddev_set_drvdata()should be used. These functions have been around since the beginning, so are backwards compatible with all older kernel versions.
Quoted 3 lines
Quoted 1 line
Cc Takashi Iwai <[email protected]>Acked-by Mark Brown <[email protected]>
Thanks, added it to the patch.
greg k-h