diff options
| author | Bill Pemberton <wfp5p@virginia.edu> | 2012-12-06 12:35:26 -0500 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2012-12-07 01:34:13 -0500 |
| commit | 4423d247509fe65fb9e9efb35229fd1d3986d41d (patch) | |
| tree | 8570acb7fa25c6a2ef7dcdc0991928abc54514d5 | |
| parent | 32e02a7b690f22b2f56efac929d7c300994ddc4c (diff) | |
ALSA: at73c213: 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>
| -rw-r--r-- | sound/spi/at73c213.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/sound/spi/at73c213.c b/sound/spi/at73c213.c index c6500d00053b..4dd60d8a4889 100644 --- a/sound/spi/at73c213.c +++ b/sound/spi/at73c213.c | |||
| @@ -330,7 +330,7 @@ static struct snd_pcm_ops at73c213_playback_ops = { | |||
| 330 | .pointer = snd_at73c213_pcm_pointer, | 330 | .pointer = snd_at73c213_pcm_pointer, |
| 331 | }; | 331 | }; |
| 332 | 332 | ||
| 333 | static int __devinit snd_at73c213_pcm_new(struct snd_at73c213 *chip, int device) | 333 | static int snd_at73c213_pcm_new(struct snd_at73c213 *chip, int device) |
| 334 | { | 334 | { |
| 335 | struct snd_pcm *pcm; | 335 | struct snd_pcm *pcm; |
| 336 | int retval; | 336 | int retval; |
| @@ -665,7 +665,7 @@ static int snd_at73c213_aux_capture_volume_info( | |||
| 665 | | (mask << 24) | (invert << 22)) \ | 665 | | (mask << 24) | (invert << 22)) \ |
| 666 | } | 666 | } |
| 667 | 667 | ||
| 668 | static struct snd_kcontrol_new snd_at73c213_controls[] __devinitdata = { | 668 | static struct snd_kcontrol_new snd_at73c213_controls[] = { |
| 669 | AT73C213_STEREO("Master Playback Volume", 0, DAC_LMPG, DAC_RMPG, 0, 0, 0x1f, 1), | 669 | AT73C213_STEREO("Master Playback Volume", 0, DAC_LMPG, DAC_RMPG, 0, 0, 0x1f, 1), |
| 670 | AT73C213_STEREO("Master Playback Switch", 0, DAC_LMPG, DAC_RMPG, 5, 5, 1, 1), | 670 | AT73C213_STEREO("Master Playback Switch", 0, DAC_LMPG, DAC_RMPG, 5, 5, 1, 1), |
| 671 | AT73C213_STEREO("PCM Playback Volume", 0, DAC_LLOG, DAC_RLOG, 0, 0, 0x1f, 1), | 671 | AT73C213_STEREO("PCM Playback Volume", 0, DAC_LLOG, DAC_RLOG, 0, 0, 0x1f, 1), |
| @@ -709,7 +709,7 @@ AT73C213_MONO_SWITCH("Aux Capture Switch", 0, DAC_CTRL, DAC_CTRL_ONAUXIN, | |||
| 709 | AT73C213_MONO_SWITCH("Line Capture Switch", 0, DAC_CTRL, 0, 0x03, 0), | 709 | AT73C213_MONO_SWITCH("Line Capture Switch", 0, DAC_CTRL, 0, 0x03, 0), |
| 710 | }; | 710 | }; |
| 711 | 711 | ||
| 712 | static int __devinit snd_at73c213_mixer(struct snd_at73c213 *chip) | 712 | static int snd_at73c213_mixer(struct snd_at73c213 *chip) |
| 713 | { | 713 | { |
| 714 | struct snd_card *card; | 714 | struct snd_card *card; |
| 715 | int errval, idx; | 715 | int errval, idx; |
| @@ -744,7 +744,7 @@ cleanup: | |||
| 744 | /* | 744 | /* |
| 745 | * Device functions | 745 | * Device functions |
| 746 | */ | 746 | */ |
| 747 | static int __devinit snd_at73c213_ssc_init(struct snd_at73c213 *chip) | 747 | static int snd_at73c213_ssc_init(struct snd_at73c213 *chip) |
| 748 | { | 748 | { |
| 749 | /* | 749 | /* |
| 750 | * Continuous clock output. | 750 | * Continuous clock output. |
| @@ -774,7 +774,7 @@ static int __devinit snd_at73c213_ssc_init(struct snd_at73c213 *chip) | |||
| 774 | return 0; | 774 | return 0; |
| 775 | } | 775 | } |
| 776 | 776 | ||
| 777 | static int __devinit snd_at73c213_chip_init(struct snd_at73c213 *chip) | 777 | static int snd_at73c213_chip_init(struct snd_at73c213 *chip) |
| 778 | { | 778 | { |
| 779 | int retval; | 779 | int retval; |
| 780 | unsigned char dac_ctrl = 0; | 780 | unsigned char dac_ctrl = 0; |
| @@ -879,8 +879,8 @@ static int snd_at73c213_dev_free(struct snd_device *device) | |||
| 879 | return 0; | 879 | return 0; |
| 880 | } | 880 | } |
| 881 | 881 | ||
| 882 | static int __devinit snd_at73c213_dev_init(struct snd_card *card, | 882 | static int snd_at73c213_dev_init(struct snd_card *card, |
| 883 | struct spi_device *spi) | 883 | struct spi_device *spi) |
| 884 | { | 884 | { |
| 885 | static struct snd_device_ops ops = { | 885 | static struct snd_device_ops ops = { |
| 886 | .dev_free = snd_at73c213_dev_free, | 886 | .dev_free = snd_at73c213_dev_free, |
| @@ -940,7 +940,7 @@ out: | |||
| 940 | return retval; | 940 | return retval; |
| 941 | } | 941 | } |
| 942 | 942 | ||
| 943 | static int __devinit snd_at73c213_probe(struct spi_device *spi) | 943 | static int snd_at73c213_probe(struct spi_device *spi) |
| 944 | { | 944 | { |
| 945 | struct snd_card *card; | 945 | struct snd_card *card; |
| 946 | struct snd_at73c213 *chip; | 946 | struct snd_at73c213 *chip; |
| @@ -1007,7 +1007,7 @@ out: | |||
| 1007 | return retval; | 1007 | return retval; |
| 1008 | } | 1008 | } |
| 1009 | 1009 | ||
| 1010 | static int __devexit snd_at73c213_remove(struct spi_device *spi) | 1010 | static int snd_at73c213_remove(struct spi_device *spi) |
| 1011 | { | 1011 | { |
| 1012 | struct snd_card *card = dev_get_drvdata(&spi->dev); | 1012 | struct snd_card *card = dev_get_drvdata(&spi->dev); |
| 1013 | struct snd_at73c213 *chip = card->private_data; | 1013 | struct snd_at73c213 *chip = card->private_data; |
| @@ -1109,7 +1109,7 @@ static struct spi_driver at73c213_driver = { | |||
| 1109 | .probe = snd_at73c213_probe, | 1109 | .probe = snd_at73c213_probe, |
| 1110 | .suspend = snd_at73c213_suspend, | 1110 | .suspend = snd_at73c213_suspend, |
| 1111 | .resume = snd_at73c213_resume, | 1111 | .resume = snd_at73c213_resume, |
| 1112 | .remove = __devexit_p(snd_at73c213_remove), | 1112 | .remove = snd_at73c213_remove, |
| 1113 | }; | 1113 | }; |
| 1114 | 1114 | ||
| 1115 | module_spi_driver(at73c213_driver); | 1115 | module_spi_driver(at73c213_driver); |
