diff options
author | David S. Miller <davem@sunset.davemloft.net> | 2006-09-25 17:08:37 -0400 |
---|---|---|
committer | David S. Miller <davem@sunset.davemloft.net> | 2006-09-25 19:39:58 -0400 |
commit | be5b6d3d6cb7311893c9fbeebf094591d5f760a8 (patch) | |
tree | 7e0b993976cf758c93b057d35bae6328e1cb7668 | |
parent | efdbc1a7caf770b1b312000a42c630597f06973d (diff) |
[SOUND] sparc/amd7930: Use __devinit and __devinitdata as needed.
Fixes section-mismatch errors.
Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r-- | sound/sparc/amd7930.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/sound/sparc/amd7930.c b/sound/sparc/amd7930.c index 2bd8e40b8541..be0bd503f013 100644 --- a/sound/sparc/amd7930.c +++ b/sound/sparc/amd7930.c | |||
@@ -755,7 +755,7 @@ static struct snd_pcm_ops snd_amd7930_capture_ops = { | |||
755 | .pointer = snd_amd7930_capture_pointer, | 755 | .pointer = snd_amd7930_capture_pointer, |
756 | }; | 756 | }; |
757 | 757 | ||
758 | static int __init snd_amd7930_pcm(struct snd_amd7930 *amd) | 758 | static int __devinit snd_amd7930_pcm(struct snd_amd7930 *amd) |
759 | { | 759 | { |
760 | struct snd_pcm *pcm; | 760 | struct snd_pcm *pcm; |
761 | int err; | 761 | int err; |
@@ -870,7 +870,7 @@ static int snd_amd7930_put_volume(struct snd_kcontrol *kctl, struct snd_ctl_elem | |||
870 | return change; | 870 | return change; |
871 | } | 871 | } |
872 | 872 | ||
873 | static struct snd_kcontrol_new amd7930_controls[] __initdata = { | 873 | static struct snd_kcontrol_new amd7930_controls[] __devinitdata = { |
874 | { | 874 | { |
875 | .iface = SNDRV_CTL_ELEM_IFACE_MIXER, | 875 | .iface = SNDRV_CTL_ELEM_IFACE_MIXER, |
876 | .name = "Monitor Volume", | 876 | .name = "Monitor Volume", |
@@ -900,7 +900,7 @@ static struct snd_kcontrol_new amd7930_controls[] __initdata = { | |||
900 | }, | 900 | }, |
901 | }; | 901 | }; |
902 | 902 | ||
903 | static int __init snd_amd7930_mixer(struct snd_amd7930 *amd) | 903 | static int __devinit snd_amd7930_mixer(struct snd_amd7930 *amd) |
904 | { | 904 | { |
905 | struct snd_card *card; | 905 | struct snd_card *card; |
906 | int idx, err; | 906 | int idx, err; |
@@ -945,11 +945,11 @@ static struct snd_device_ops snd_amd7930_dev_ops = { | |||
945 | .dev_free = snd_amd7930_dev_free, | 945 | .dev_free = snd_amd7930_dev_free, |
946 | }; | 946 | }; |
947 | 947 | ||
948 | static int __init snd_amd7930_create(struct snd_card *card, | 948 | static int __devinit snd_amd7930_create(struct snd_card *card, |
949 | struct resource *rp, | 949 | struct resource *rp, |
950 | unsigned int reg_size, | 950 | unsigned int reg_size, |
951 | int irq, int dev, | 951 | int irq, int dev, |
952 | struct snd_amd7930 **ramd) | 952 | struct snd_amd7930 **ramd) |
953 | { | 953 | { |
954 | unsigned long flags; | 954 | unsigned long flags; |
955 | struct snd_amd7930 *amd; | 955 | struct snd_amd7930 *amd; |
@@ -1013,7 +1013,7 @@ static int __init snd_amd7930_create(struct snd_card *card, | |||
1013 | return 0; | 1013 | return 0; |
1014 | } | 1014 | } |
1015 | 1015 | ||
1016 | static int __init amd7930_attach_common(struct resource *rp, int irq) | 1016 | static int __devinit amd7930_attach_common(struct resource *rp, int irq) |
1017 | { | 1017 | { |
1018 | static int dev_num; | 1018 | static int dev_num; |
1019 | struct snd_card *card; | 1019 | struct snd_card *card; |
@@ -1065,7 +1065,7 @@ out_err: | |||
1065 | return err; | 1065 | return err; |
1066 | } | 1066 | } |
1067 | 1067 | ||
1068 | static int __init amd7930_obio_attach(struct device_node *dp) | 1068 | static int __devinit amd7930_obio_attach(struct device_node *dp) |
1069 | { | 1069 | { |
1070 | struct linux_prom_registers *regs; | 1070 | struct linux_prom_registers *regs; |
1071 | struct linux_prom_irqs *irqp; | 1071 | struct linux_prom_irqs *irqp; |