aboutsummaryrefslogtreecommitdiffstats
path: root/sound/drivers/mpu401/mpu401.c
diff options
context:
space:
mode:
authorBill Pemberton <wfp5p@virginia.edu>2012-12-06 12:35:27 -0500
committerTakashi Iwai <tiwai@suse.de>2012-12-07 01:34:32 -0500
commitfbbb01a12d5d553ea3851a020d98c0ac9b383673 (patch)
treec11ff5d8c1c4cac7bd350e2ae7d05bd98ddc82c9 /sound/drivers/mpu401/mpu401.c
parent4423d247509fe65fb9e9efb35229fd1d3986d41d (diff)
ALSA: drivers: 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: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/drivers/mpu401/mpu401.c')
-rw-r--r--sound/drivers/mpu401/mpu401.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/sound/drivers/mpu401/mpu401.c b/sound/drivers/mpu401/mpu401.c
index bc03a2046c9c..da1a29bfc85d 100644
--- a/sound/drivers/mpu401/mpu401.c
+++ b/sound/drivers/mpu401/mpu401.c
@@ -100,7 +100,7 @@ static int snd_mpu401_create(int dev, struct snd_card **rcard)
100 return err; 100 return err;
101} 101}
102 102
103static int __devinit snd_mpu401_probe(struct platform_device *devptr) 103static int snd_mpu401_probe(struct platform_device *devptr)
104{ 104{
105 int dev = devptr->id; 105 int dev = devptr->id;
106 int err; 106 int err;
@@ -126,7 +126,7 @@ static int __devinit snd_mpu401_probe(struct platform_device *devptr)
126 return 0; 126 return 0;
127} 127}
128 128
129static int __devexit snd_mpu401_remove(struct platform_device *devptr) 129static int snd_mpu401_remove(struct platform_device *devptr)
130{ 130{
131 snd_card_free(platform_get_drvdata(devptr)); 131 snd_card_free(platform_get_drvdata(devptr));
132 platform_set_drvdata(devptr, NULL); 132 platform_set_drvdata(devptr, NULL);
@@ -137,7 +137,7 @@ static int __devexit snd_mpu401_remove(struct platform_device *devptr)
137 137
138static struct platform_driver snd_mpu401_driver = { 138static struct platform_driver snd_mpu401_driver = {
139 .probe = snd_mpu401_probe, 139 .probe = snd_mpu401_probe,
140 .remove = __devexit_p(snd_mpu401_remove), 140 .remove = snd_mpu401_remove,
141 .driver = { 141 .driver = {
142 .name = SND_MPU401_DRIVER, 142 .name = SND_MPU401_DRIVER,
143 .owner = THIS_MODULE, 143 .owner = THIS_MODULE,
@@ -156,8 +156,8 @@ static struct pnp_device_id snd_mpu401_pnpids[] = {
156 156
157MODULE_DEVICE_TABLE(pnp, snd_mpu401_pnpids); 157MODULE_DEVICE_TABLE(pnp, snd_mpu401_pnpids);
158 158
159static int __devinit snd_mpu401_pnp(int dev, struct pnp_dev *device, 159static int snd_mpu401_pnp(int dev, struct pnp_dev *device,
160 const struct pnp_device_id *id) 160 const struct pnp_device_id *id)
161{ 161{
162 if (!pnp_port_valid(device, 0) || 162 if (!pnp_port_valid(device, 0) ||
163 pnp_port_flags(device, 0) & IORESOURCE_DISABLED) { 163 pnp_port_flags(device, 0) & IORESOURCE_DISABLED) {
@@ -182,8 +182,8 @@ static int __devinit snd_mpu401_pnp(int dev, struct pnp_dev *device,
182 return 0; 182 return 0;
183} 183}
184 184
185static int __devinit snd_mpu401_pnp_probe(struct pnp_dev *pnp_dev, 185static int snd_mpu401_pnp_probe(struct pnp_dev *pnp_dev,
186 const struct pnp_device_id *id) 186 const struct pnp_device_id *id)
187{ 187{
188 static int dev; 188 static int dev;
189 struct snd_card *card; 189 struct snd_card *card;
@@ -211,7 +211,7 @@ static int __devinit snd_mpu401_pnp_probe(struct pnp_dev *pnp_dev,
211 return -ENODEV; 211 return -ENODEV;
212} 212}
213 213
214static void __devexit snd_mpu401_pnp_remove(struct pnp_dev *dev) 214static void snd_mpu401_pnp_remove(struct pnp_dev *dev)
215{ 215{
216 struct snd_card *card = (struct snd_card *) pnp_get_drvdata(dev); 216 struct snd_card *card = (struct snd_card *) pnp_get_drvdata(dev);
217 217
@@ -223,7 +223,7 @@ static struct pnp_driver snd_mpu401_pnp_driver = {
223 .name = "mpu401", 223 .name = "mpu401",
224 .id_table = snd_mpu401_pnpids, 224 .id_table = snd_mpu401_pnpids,
225 .probe = snd_mpu401_pnp_probe, 225 .probe = snd_mpu401_pnp_probe,
226 .remove = __devexit_p(snd_mpu401_pnp_remove), 226 .remove = snd_mpu401_pnp_remove,
227}; 227};
228#else 228#else
229static struct pnp_driver snd_mpu401_pnp_driver; 229static struct pnp_driver snd_mpu401_pnp_driver;