diff options
author | Bill Pemberton <wfp5p@virginia.edu> | 2012-12-06 12:35:14 -0500 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2012-12-07 01:29:30 -0500 |
commit | 325fbfe0904eb78007b3c319a73f277b7222116f (patch) | |
tree | 70fed839b745d99818e25f5ac286b44e101dc8e9 /sound/firewire | |
parent | 61dc674c3b7cc970e62f819c2177059dfdb8b870 (diff) |
ALSA: firewire-speakers: 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>
Acked-by: Clemens Ladisch <clemens@ladisch.de>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/firewire')
-rw-r--r-- | sound/firewire/speakers.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sound/firewire/speakers.c b/sound/firewire/speakers.c index 297244e658d9..d6846557f270 100644 --- a/sound/firewire/speakers.c +++ b/sound/firewire/speakers.c | |||
@@ -663,7 +663,7 @@ static void fwspk_card_free(struct snd_card *card) | |||
663 | mutex_destroy(&fwspk->mutex); | 663 | mutex_destroy(&fwspk->mutex); |
664 | } | 664 | } |
665 | 665 | ||
666 | static const struct device_info *__devinit fwspk_detect(struct fw_device *dev) | 666 | static const struct device_info *fwspk_detect(struct fw_device *dev) |
667 | { | 667 | { |
668 | static const struct device_info griffin_firewave = { | 668 | static const struct device_info griffin_firewave = { |
669 | .driver_name = "FireWave", | 669 | .driver_name = "FireWave", |
@@ -699,7 +699,7 @@ static const struct device_info *__devinit fwspk_detect(struct fw_device *dev) | |||
699 | return NULL; | 699 | return NULL; |
700 | } | 700 | } |
701 | 701 | ||
702 | static int __devinit fwspk_probe(struct device *unit_dev) | 702 | static int fwspk_probe(struct device *unit_dev) |
703 | { | 703 | { |
704 | struct fw_unit *unit = fw_unit(unit_dev); | 704 | struct fw_unit *unit = fw_unit(unit_dev); |
705 | struct fw_device *fw_dev = fw_parent_device(unit); | 705 | struct fw_device *fw_dev = fw_parent_device(unit); |
@@ -770,7 +770,7 @@ error: | |||
770 | return err; | 770 | return err; |
771 | } | 771 | } |
772 | 772 | ||
773 | static int __devexit fwspk_remove(struct device *dev) | 773 | static int fwspk_remove(struct device *dev) |
774 | { | 774 | { |
775 | struct fwspk *fwspk = dev_get_drvdata(dev); | 775 | struct fwspk *fwspk = dev_get_drvdata(dev); |
776 | 776 | ||
@@ -834,7 +834,7 @@ static struct fw_driver fwspk_driver = { | |||
834 | .name = KBUILD_MODNAME, | 834 | .name = KBUILD_MODNAME, |
835 | .bus = &fw_bus_type, | 835 | .bus = &fw_bus_type, |
836 | .probe = fwspk_probe, | 836 | .probe = fwspk_probe, |
837 | .remove = __devexit_p(fwspk_remove), | 837 | .remove = fwspk_remove, |
838 | }, | 838 | }, |
839 | .update = fwspk_bus_reset, | 839 | .update = fwspk_bus_reset, |
840 | .id_table = fwspk_id_table, | 840 | .id_table = fwspk_id_table, |