aboutsummaryrefslogtreecommitdiffstats
path: root/sound/soc/codecs/wm8995.c
diff options
context:
space:
mode:
authorBill Pemberton <wfp5p@virginia.edu>2012-12-07 09:26:37 -0500
committerMark Brown <broonie@opensource.wolfsonmicro.com>2012-12-09 10:31:51 -0500
commit7a79e94e973639da7bf1b8242d504f9db9e5e848 (patch)
tree2bae8c8a5e1b350e2df0dbd6a80eff2dcc943ee1 /sound/soc/codecs/wm8995.c
parente51e97eecdb2a4415aac5f1a69aa66ed787f1217 (diff)
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>
Diffstat (limited to 'sound/soc/codecs/wm8995.c')
-rw-r--r--sound/soc/codecs/wm8995.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/sound/soc/codecs/wm8995.c b/sound/soc/codecs/wm8995.c
index f1a7cf147af0..90a65c427541 100644
--- a/sound/soc/codecs/wm8995.c
+++ b/sound/soc/codecs/wm8995.c
@@ -2256,7 +2256,7 @@ static struct regmap_config wm8995_regmap = {
2256}; 2256};
2257 2257
2258#if defined(CONFIG_SPI_MASTER) 2258#if defined(CONFIG_SPI_MASTER)
2259static int __devinit wm8995_spi_probe(struct spi_device *spi) 2259static int wm8995_spi_probe(struct spi_device *spi)
2260{ 2260{
2261 struct wm8995_priv *wm8995; 2261 struct wm8995_priv *wm8995;
2262 int ret; 2262 int ret;
@@ -2280,7 +2280,7 @@ static int __devinit wm8995_spi_probe(struct spi_device *spi)
2280 return ret; 2280 return ret;
2281} 2281}
2282 2282
2283static int __devexit wm8995_spi_remove(struct spi_device *spi) 2283static int wm8995_spi_remove(struct spi_device *spi)
2284{ 2284{
2285 snd_soc_unregister_codec(&spi->dev); 2285 snd_soc_unregister_codec(&spi->dev);
2286 return 0; 2286 return 0;
@@ -2292,13 +2292,13 @@ static struct spi_driver wm8995_spi_driver = {
2292 .owner = THIS_MODULE, 2292 .owner = THIS_MODULE,
2293 }, 2293 },
2294 .probe = wm8995_spi_probe, 2294 .probe = wm8995_spi_probe,
2295 .remove = __devexit_p(wm8995_spi_remove) 2295 .remove = wm8995_spi_remove
2296}; 2296};
2297#endif 2297#endif
2298 2298
2299#if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE) 2299#if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE)
2300static __devinit int wm8995_i2c_probe(struct i2c_client *i2c, 2300static int wm8995_i2c_probe(struct i2c_client *i2c,
2301 const struct i2c_device_id *id) 2301 const struct i2c_device_id *id)
2302{ 2302{
2303 struct wm8995_priv *wm8995; 2303 struct wm8995_priv *wm8995;
2304 int ret; 2304 int ret;
@@ -2325,7 +2325,7 @@ static __devinit int wm8995_i2c_probe(struct i2c_client *i2c,
2325 return ret; 2325 return ret;
2326} 2326}
2327 2327
2328static __devexit int wm8995_i2c_remove(struct i2c_client *client) 2328static int wm8995_i2c_remove(struct i2c_client *client)
2329{ 2329{
2330 snd_soc_unregister_codec(&client->dev); 2330 snd_soc_unregister_codec(&client->dev);
2331 return 0; 2331 return 0;
@@ -2344,7 +2344,7 @@ static struct i2c_driver wm8995_i2c_driver = {
2344 .owner = THIS_MODULE, 2344 .owner = THIS_MODULE,
2345 }, 2345 },
2346 .probe = wm8995_i2c_probe, 2346 .probe = wm8995_i2c_probe,
2347 .remove = __devexit_p(wm8995_i2c_remove), 2347 .remove = wm8995_i2c_remove,
2348 .id_table = wm8995_i2c_id 2348 .id_table = wm8995_i2c_id
2349}; 2349};
2350#endif 2350#endif