Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

ALSA: atmel: 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>
  • Loading branch information...
commit 61dc674c3b7cc970e62f819c2177059dfdb8b870 1 parent e21596b
Bill Pemberton wfp5p authored tiwai committed

Showing 2 changed files with 9 additions and 9 deletions. Show diff stats Hide diff stats

  1. +4 4 sound/atmel/abdac.c
  2. +5 5 sound/atmel/ac97c.c
8 sound/atmel/abdac.c
@@ -309,7 +309,7 @@ static struct snd_pcm_ops atmel_abdac_ops = {
309 309 .pointer = atmel_abdac_pointer,
310 310 };
311 311
312   -static int __devinit atmel_abdac_pcm_new(struct atmel_abdac *dac)
  312 +static int atmel_abdac_pcm_new(struct atmel_abdac *dac)
313 313 {
314 314 struct snd_pcm_hardware hw = atmel_abdac_hw;
315 315 struct snd_pcm *pcm;
@@ -386,7 +386,7 @@ static int set_sample_rates(struct atmel_abdac *dac)
386 386 return retval;
387 387 }
388 388
389   -static int __devinit atmel_abdac_probe(struct platform_device *pdev)
  389 +static int atmel_abdac_probe(struct platform_device *pdev)
390 390 {
391 391 struct snd_card *card;
392 392 struct atmel_abdac *dac;
@@ -567,7 +567,7 @@ static SIMPLE_DEV_PM_OPS(atmel_abdac_pm, atmel_abdac_suspend, atmel_abdac_resume
567 567 #define ATMEL_ABDAC_PM_OPS NULL
568 568 #endif
569 569
570   -static int __devexit atmel_abdac_remove(struct platform_device *pdev)
  570 +static int atmel_abdac_remove(struct platform_device *pdev)
571 571 {
572 572 struct snd_card *card = platform_get_drvdata(pdev);
573 573 struct atmel_abdac *dac = get_dac(card);
@@ -589,7 +589,7 @@ static int __devexit atmel_abdac_remove(struct platform_device *pdev)
589 589 }
590 590
591 591 static struct platform_driver atmel_abdac_driver = {
592   - .remove = __devexit_p(atmel_abdac_remove),
  592 + .remove = atmel_abdac_remove,
593 593 .driver = {
594 594 .name = "atmel_abdac",
595 595 .owner = THIS_MODULE,
10 sound/atmel/ac97c.c
@@ -728,7 +728,7 @@ static irqreturn_t atmel_ac97c_interrupt(int irq, void *dev)
728 728 return retval;
729 729 }
730 730
731   -static struct ac97_pcm at91_ac97_pcm_defs[] __devinitdata = {
  731 +static struct ac97_pcm at91_ac97_pcm_defs[] = {
732 732 /* Playback */
733 733 {
734 734 .exclusive = 1,
@@ -756,7 +756,7 @@ static struct ac97_pcm at91_ac97_pcm_defs[] __devinitdata = {
756 756 },
757 757 };
758 758
759   -static int __devinit atmel_ac97c_pcm_new(struct atmel_ac97c *chip)
  759 +static int atmel_ac97c_pcm_new(struct atmel_ac97c *chip)
760 760 {
761 761 struct snd_pcm *pcm;
762 762 struct snd_pcm_hardware hw = atmel_ac97c_hw;
@@ -902,7 +902,7 @@ static void atmel_ac97c_reset(struct atmel_ac97c *chip)
902 902 }
903 903 }
904 904
905   -static int __devinit atmel_ac97c_probe(struct platform_device *pdev)
  905 +static int atmel_ac97c_probe(struct platform_device *pdev)
906 906 {
907 907 struct snd_card *card;
908 908 struct atmel_ac97c *chip;
@@ -1168,7 +1168,7 @@ static SIMPLE_DEV_PM_OPS(atmel_ac97c_pm, atmel_ac97c_suspend, atmel_ac97c_resume
1168 1168 #define ATMEL_AC97C_PM_OPS NULL
1169 1169 #endif
1170 1170
1171   -static int __devexit atmel_ac97c_remove(struct platform_device *pdev)
  1171 +static int atmel_ac97c_remove(struct platform_device *pdev)
1172 1172 {
1173 1173 struct snd_card *card = platform_get_drvdata(pdev);
1174 1174 struct atmel_ac97c *chip = get_chip(card);
@@ -1205,7 +1205,7 @@ static int __devexit atmel_ac97c_remove(struct platform_device *pdev)
1205 1205 }
1206 1206
1207 1207 static struct platform_driver atmel_ac97c_driver = {
1208   - .remove = __devexit_p(atmel_ac97c_remove),
  1208 + .remove = atmel_ac97c_remove,
1209 1209 .driver = {
1210 1210 .name = "atmel_ac97c",
1211 1211 .owner = THIS_MODULE,

0 comments on commit 61dc674

Please sign in to comment.
Something went wrong with that request. Please try again.