ASoC: codecs: remove __dev* attributes
CONFIG_HOTPLUG is going away as an option. As result the __dev* markings will be going away. Remove use of __devinit, __devexit_p, __devinitdata, __devinitconst, and __devexit. Signed-off-by: Bill Pemberton <wfp5p@virginia.edu> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
This commit is contained in:

committed by
Mark Brown

parent
e51e97eecd
commit
7a79e94e97
@@ -429,7 +429,7 @@ static const struct regmap_config wm8711_regmap = {
|
||||
};
|
||||
|
||||
#if defined(CONFIG_SPI_MASTER)
|
||||
static int __devinit wm8711_spi_probe(struct spi_device *spi)
|
||||
static int wm8711_spi_probe(struct spi_device *spi)
|
||||
{
|
||||
struct wm8711_priv *wm8711;
|
||||
int ret;
|
||||
@@ -451,7 +451,7 @@ static int __devinit wm8711_spi_probe(struct spi_device *spi)
|
||||
return ret;
|
||||
}
|
||||
|
||||
static int __devexit wm8711_spi_remove(struct spi_device *spi)
|
||||
static int wm8711_spi_remove(struct spi_device *spi)
|
||||
{
|
||||
snd_soc_unregister_codec(&spi->dev);
|
||||
|
||||
@@ -465,13 +465,13 @@ static struct spi_driver wm8711_spi_driver = {
|
||||
.of_match_table = wm8711_of_match,
|
||||
},
|
||||
.probe = wm8711_spi_probe,
|
||||
.remove = __devexit_p(wm8711_spi_remove),
|
||||
.remove = wm8711_spi_remove,
|
||||
};
|
||||
#endif /* CONFIG_SPI_MASTER */
|
||||
|
||||
#if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE)
|
||||
static __devinit int wm8711_i2c_probe(struct i2c_client *client,
|
||||
const struct i2c_device_id *id)
|
||||
static int wm8711_i2c_probe(struct i2c_client *client,
|
||||
const struct i2c_device_id *id)
|
||||
{
|
||||
struct wm8711_priv *wm8711;
|
||||
int ret;
|
||||
@@ -493,7 +493,7 @@ static __devinit int wm8711_i2c_probe(struct i2c_client *client,
|
||||
return ret;
|
||||
}
|
||||
|
||||
static __devexit int wm8711_i2c_remove(struct i2c_client *client)
|
||||
static int wm8711_i2c_remove(struct i2c_client *client)
|
||||
{
|
||||
snd_soc_unregister_codec(&client->dev);
|
||||
return 0;
|
||||
@@ -512,7 +512,7 @@ static struct i2c_driver wm8711_i2c_driver = {
|
||||
.of_match_table = wm8711_of_match,
|
||||
},
|
||||
.probe = wm8711_i2c_probe,
|
||||
.remove = __devexit_p(wm8711_i2c_remove),
|
||||
.remove = wm8711_i2c_remove,
|
||||
.id_table = wm8711_i2c_id,
|
||||
};
|
||||
#endif
|
||||
|
Reference in New Issue
Block a user