Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit be5b6d3d6cb7311893c9fbeebf094591d5f760a8

Authored by David S. Miller
1 parent efdbc1a7ca
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

[SOUND] sparc/amd7930: Use __devinit and __devinitdata as needed. 

Fixes section-mismatch errors.

Signed-off-by: David S. Miller <davem@davemloft.net>

Showing 1 changed file with 10 additions and 10 deletions Side-by-side Diff

sound/sparc/amd7930.c
Diff comments   View file @ be5b6d3
... ... @@ -755,7 +755,7 @@
755 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 760 struct snd_pcm *pcm;
761 761 int err;
... ... @@ -870,7 +870,7 @@
870 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 875 .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
876 876 .name = "Monitor Volume",
... ... @@ -900,7 +900,7 @@
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 905 struct snd_card *card;
906 906 int idx, err;
... ... @@ -945,11 +945,11 @@
945 945 .dev_free = snd_amd7930_dev_free,
946 946 };
947 947  
948   -static int __init snd_amd7930_create(struct snd_card *card,
949   - struct resource *rp,
950   - unsigned int reg_size,
951   - int irq, int dev,
952   - struct snd_amd7930 **ramd)
  948 +static int __devinit snd_amd7930_create(struct snd_card *card,
  949 + struct resource *rp,
  950 + unsigned int reg_size,
  951 + int irq, int dev,
  952 + struct snd_amd7930 **ramd)
953 953 {
954 954 unsigned long flags;
955 955 struct snd_amd7930 *amd;
... ... @@ -1013,7 +1013,7 @@
1013 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 1018 static int dev_num;
1019 1019 struct snd_card *card;
... ... @@ -1065,7 +1065,7 @@
1065 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 1070 struct linux_prom_registers *regs;
1071 1071 struct linux_prom_irqs *irqp;