aboutsummaryrefslogtreecommitdiffstats
path: root/sound/pci/ice1712/revo.c
diff options
context:
space:
mode:
authorBill Pemberton <wfp5p@virginia.edu>2012-12-06 12:35:10 -0500
committerTakashi Iwai <tiwai@suse.de>2012-12-07 01:20:55 -0500
commite23e7a1436207217000c2854214bc908936af3cb (patch)
treeaebb83a4e59dde76a79ac60b51b67849c75c545b /sound/pci/ice1712/revo.c
parent445a51b353c35fe54840c10352ef51152fbb94df (diff)
ALSA: pci: 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/pci/ice1712/revo.c')
-rw-r--r--sound/pci/ice1712/revo.c28
1 files changed, 14 insertions, 14 deletions
diff --git a/sound/pci/ice1712/revo.c b/sound/pci/ice1712/revo.c
index a1b79758766b..7641080a9b5d 100644
--- a/sound/pci/ice1712/revo.c
+++ b/sound/pci/ice1712/revo.c
@@ -234,7 +234,7 @@ static const struct snd_akm4xxx_adc_channel revo51_adc[] = {
234 }, 234 },
235}; 235};
236 236
237static struct snd_akm4xxx akm_revo_front __devinitdata = { 237static struct snd_akm4xxx akm_revo_front = {
238 .type = SND_AK4381, 238 .type = SND_AK4381,
239 .num_dacs = 2, 239 .num_dacs = 2,
240 .ops = { 240 .ops = {
@@ -243,7 +243,7 @@ static struct snd_akm4xxx akm_revo_front __devinitdata = {
243 .dac_info = revo71_front, 243 .dac_info = revo71_front,
244}; 244};
245 245
246static struct snd_ak4xxx_private akm_revo_front_priv __devinitdata = { 246static struct snd_ak4xxx_private akm_revo_front_priv = {
247 .caddr = 1, 247 .caddr = 1,
248 .cif = 0, 248 .cif = 0,
249 .data_mask = VT1724_REVO_CDOUT, 249 .data_mask = VT1724_REVO_CDOUT,
@@ -255,7 +255,7 @@ static struct snd_ak4xxx_private akm_revo_front_priv __devinitdata = {
255 .mask_flags = 0, 255 .mask_flags = 0,
256}; 256};
257 257
258static struct snd_akm4xxx akm_revo_surround __devinitdata = { 258static struct snd_akm4xxx akm_revo_surround = {
259 .type = SND_AK4355, 259 .type = SND_AK4355,
260 .idx_offset = 1, 260 .idx_offset = 1,
261 .num_dacs = 6, 261 .num_dacs = 6,
@@ -265,7 +265,7 @@ static struct snd_akm4xxx akm_revo_surround __devinitdata = {
265 .dac_info = revo71_surround, 265 .dac_info = revo71_surround,
266}; 266};
267 267
268static struct snd_ak4xxx_private akm_revo_surround_priv __devinitdata = { 268static struct snd_ak4xxx_private akm_revo_surround_priv = {
269 .caddr = 3, 269 .caddr = 3,
270 .cif = 0, 270 .cif = 0,
271 .data_mask = VT1724_REVO_CDOUT, 271 .data_mask = VT1724_REVO_CDOUT,
@@ -277,7 +277,7 @@ static struct snd_ak4xxx_private akm_revo_surround_priv __devinitdata = {
277 .mask_flags = 0, 277 .mask_flags = 0,
278}; 278};
279 279
280static struct snd_akm4xxx akm_revo51 __devinitdata = { 280static struct snd_akm4xxx akm_revo51 = {
281 .type = SND_AK4358, 281 .type = SND_AK4358,
282 .num_dacs = 8, 282 .num_dacs = 8,
283 .ops = { 283 .ops = {
@@ -286,7 +286,7 @@ static struct snd_akm4xxx akm_revo51 __devinitdata = {
286 .dac_info = revo51_dac, 286 .dac_info = revo51_dac,
287}; 287};
288 288
289static struct snd_ak4xxx_private akm_revo51_priv __devinitdata = { 289static struct snd_ak4xxx_private akm_revo51_priv = {
290 .caddr = 2, 290 .caddr = 2,
291 .cif = 0, 291 .cif = 0,
292 .data_mask = VT1724_REVO_CDOUT, 292 .data_mask = VT1724_REVO_CDOUT,
@@ -298,13 +298,13 @@ static struct snd_ak4xxx_private akm_revo51_priv __devinitdata = {
298 .mask_flags = 0, 298 .mask_flags = 0,
299}; 299};
300 300
301static struct snd_akm4xxx akm_revo51_adc __devinitdata = { 301static struct snd_akm4xxx akm_revo51_adc = {
302 .type = SND_AK5365, 302 .type = SND_AK5365,
303 .num_adcs = 2, 303 .num_adcs = 2,
304 .adc_info = revo51_adc, 304 .adc_info = revo51_adc,
305}; 305};
306 306
307static struct snd_ak4xxx_private akm_revo51_adc_priv __devinitdata = { 307static struct snd_ak4xxx_private akm_revo51_adc_priv = {
308 .caddr = 2, 308 .caddr = 2,
309 .cif = 0, 309 .cif = 0,
310 .data_mask = VT1724_REVO_CDOUT, 310 .data_mask = VT1724_REVO_CDOUT,
@@ -345,7 +345,7 @@ static const struct snd_akm4xxx_dac_channel ap192_dac[] = {
345 AK_DAC("PCM Playback Volume", 2) 345 AK_DAC("PCM Playback Volume", 2)
346}; 346};
347 347
348static struct snd_akm4xxx akm_ap192 __devinitdata = { 348static struct snd_akm4xxx akm_ap192 = {
349 .type = SND_AK4358, 349 .type = SND_AK4358,
350 .num_dacs = 2, 350 .num_dacs = 2,
351 .ops = { 351 .ops = {
@@ -354,7 +354,7 @@ static struct snd_akm4xxx akm_ap192 __devinitdata = {
354 .dac_info = ap192_dac, 354 .dac_info = ap192_dac,
355}; 355};
356 356
357static struct snd_ak4xxx_private akm_ap192_priv __devinitdata = { 357static struct snd_ak4xxx_private akm_ap192_priv = {
358 .caddr = 2, 358 .caddr = 2,
359 .cif = 0, 359 .cif = 0,
360 .data_mask = VT1724_REVO_CDOUT, 360 .data_mask = VT1724_REVO_CDOUT,
@@ -467,7 +467,7 @@ static unsigned char ap192_ak4114_read(void *private_data, unsigned char addr)
467 return data; 467 return data;
468} 468}
469 469
470static int __devinit ap192_ak4114_init(struct snd_ice1712 *ice) 470static int ap192_ak4114_init(struct snd_ice1712 *ice)
471{ 471{
472 static const unsigned char ak4114_init_vals[] = { 472 static const unsigned char ak4114_init_vals[] = {
473 AK4114_RST | AK4114_PWN | AK4114_OCKS0 | AK4114_OCKS1, 473 AK4114_RST | AK4114_PWN | AK4114_OCKS0 | AK4114_OCKS1,
@@ -495,7 +495,7 @@ static int __devinit ap192_ak4114_init(struct snd_ice1712 *ice)
495 return 0; /* error ignored; it's no fatal error */ 495 return 0; /* error ignored; it's no fatal error */
496} 496}
497 497
498static int __devinit revo_init(struct snd_ice1712 *ice) 498static int revo_init(struct snd_ice1712 *ice)
499{ 499{
500 struct snd_akm4xxx *ak; 500 struct snd_akm4xxx *ak;
501 int err; 501 int err;
@@ -573,7 +573,7 @@ static int __devinit revo_init(struct snd_ice1712 *ice)
573} 573}
574 574
575 575
576static int __devinit revo_add_controls(struct snd_ice1712 *ice) 576static int revo_add_controls(struct snd_ice1712 *ice)
577{ 577{
578 struct revo51_spec *spec; 578 struct revo51_spec *spec;
579 int err; 579 int err;
@@ -606,7 +606,7 @@ static int __devinit revo_add_controls(struct snd_ice1712 *ice)
606} 606}
607 607
608/* entry point */ 608/* entry point */
609struct snd_ice1712_card_info snd_vt1724_revo_cards[] __devinitdata = { 609struct snd_ice1712_card_info snd_vt1724_revo_cards[] = {
610 { 610 {
611 .subvendor = VT1724_SUBDEVICE_REVOLUTION71, 611 .subvendor = VT1724_SUBDEVICE_REVOLUTION71,
612 .name = "M Audio Revolution-7.1", 612 .name = "M Audio Revolution-7.1",