diff options
author | Takashi Iwai <tiwai@suse.de> | 2006-07-05 10:51:05 -0400 |
---|---|---|
committer | Jaroslav Kysela <perex@suse.cz> | 2006-07-12 14:08:01 -0400 |
commit | f40b68903ccd511ea9d658b4bce319dd032a265a (patch) | |
tree | 9f8447f4370f5e4d9303ca5c8e0b2c8cd790c67e /sound/pci/maestro3.c | |
parent | 562b590d4e838ecaca2cfd246fd4df55dc6db18a (diff) |
[ALSA] Fix section mismatch errors in ALSA PCI drivers
Fixed 'section mismatch' errors in ALSA PCI drivers:
- removed invalid __devinitdata from pci id tables
- fix/remove __devinit of functions called in suspend/resume
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Jaroslav Kysela <perex@suse.cz>
Diffstat (limited to 'sound/pci/maestro3.c')
-rw-r--r-- | sound/pci/maestro3.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sound/pci/maestro3.c b/sound/pci/maestro3.c index 828eab59253a..45214b3b81be 100644 --- a/sound/pci/maestro3.c +++ b/sound/pci/maestro3.c | |||
@@ -869,7 +869,7 @@ struct snd_m3 { | |||
869 | /* | 869 | /* |
870 | * pci ids | 870 | * pci ids |
871 | */ | 871 | */ |
872 | static struct pci_device_id snd_m3_ids[] __devinitdata = { | 872 | static struct pci_device_id snd_m3_ids[] = { |
873 | {PCI_VENDOR_ID_ESS, PCI_DEVICE_ID_ESS_ALLEGRO_1, PCI_ANY_ID, PCI_ANY_ID, | 873 | {PCI_VENDOR_ID_ESS, PCI_DEVICE_ID_ESS_ALLEGRO_1, PCI_ANY_ID, PCI_ANY_ID, |
874 | PCI_CLASS_MULTIMEDIA_AUDIO << 8, 0xffff00, 0}, | 874 | PCI_CLASS_MULTIMEDIA_AUDIO << 8, 0xffff00, 0}, |
875 | {PCI_VENDOR_ID_ESS, PCI_DEVICE_ID_ESS_ALLEGRO, PCI_ANY_ID, PCI_ANY_ID, | 875 | {PCI_VENDOR_ID_ESS, PCI_DEVICE_ID_ESS_ALLEGRO, PCI_ANY_ID, PCI_ANY_ID, |
@@ -2137,7 +2137,7 @@ static int __devinit snd_m3_mixer(struct snd_m3 *chip) | |||
2137 | * DSP Code images | 2137 | * DSP Code images |
2138 | */ | 2138 | */ |
2139 | 2139 | ||
2140 | static const u16 assp_kernel_image[] __devinitdata = { | 2140 | static const u16 assp_kernel_image[] = { |
2141 | 0x7980, 0x0030, 0x7980, 0x03B4, 0x7980, 0x03B4, 0x7980, 0x00FB, 0x7980, 0x00DD, 0x7980, 0x03B4, | 2141 | 0x7980, 0x0030, 0x7980, 0x03B4, 0x7980, 0x03B4, 0x7980, 0x00FB, 0x7980, 0x00DD, 0x7980, 0x03B4, |
2142 | 0x7980, 0x0332, 0x7980, 0x0287, 0x7980, 0x03B4, 0x7980, 0x03B4, 0x7980, 0x03B4, 0x7980, 0x03B4, | 2142 | 0x7980, 0x0332, 0x7980, 0x0287, 0x7980, 0x03B4, 0x7980, 0x03B4, 0x7980, 0x03B4, 0x7980, 0x03B4, |
2143 | 0x7980, 0x031A, 0x7980, 0x03B4, 0x7980, 0x022F, 0x7980, 0x03B4, 0x7980, 0x03B4, 0x7980, 0x03B4, | 2143 | 0x7980, 0x031A, 0x7980, 0x03B4, 0x7980, 0x022F, 0x7980, 0x03B4, 0x7980, 0x03B4, 0x7980, 0x03B4, |
@@ -2224,7 +2224,7 @@ static const u16 assp_kernel_image[] __devinitdata = { | |||
2224 | * Mini sample rate converter code image | 2224 | * Mini sample rate converter code image |
2225 | * that is to be loaded at 0x400 on the DSP. | 2225 | * that is to be loaded at 0x400 on the DSP. |
2226 | */ | 2226 | */ |
2227 | static const u16 assp_minisrc_image[] __devinitdata = { | 2227 | static const u16 assp_minisrc_image[] = { |
2228 | 2228 | ||
2229 | 0xBF80, 0x101E, 0x906E, 0x006E, 0x8B88, 0x6980, 0xEF88, 0x906F, 0x0D6F, 0x6900, 0xEB08, 0x0412, | 2229 | 0xBF80, 0x101E, 0x906E, 0x006E, 0x8B88, 0x6980, 0xEF88, 0x906F, 0x0D6F, 0x6900, 0xEB08, 0x0412, |
2230 | 0xBC20, 0x696E, 0xB801, 0x906E, 0x7980, 0x0403, 0xB90E, 0x8807, 0xBE43, 0xBF01, 0xBE47, 0xBE41, | 2230 | 0xBC20, 0x696E, 0xB801, 0x906E, 0x7980, 0x0403, 0xB90E, 0x8807, 0xBE43, 0xBF01, 0xBE47, 0xBE41, |
@@ -2267,12 +2267,12 @@ static const u16 assp_minisrc_image[] __devinitdata = { | |||
2267 | */ | 2267 | */ |
2268 | 2268 | ||
2269 | #define MINISRC_LPF_LEN 10 | 2269 | #define MINISRC_LPF_LEN 10 |
2270 | static const u16 minisrc_lpf[MINISRC_LPF_LEN] __devinitdata = { | 2270 | static const u16 minisrc_lpf[MINISRC_LPF_LEN] = { |
2271 | 0X0743, 0X1104, 0X0A4C, 0XF88D, 0X242C, | 2271 | 0X0743, 0X1104, 0X0A4C, 0XF88D, 0X242C, |
2272 | 0X1023, 0X1AA9, 0X0B60, 0XEFDD, 0X186F | 2272 | 0X1023, 0X1AA9, 0X0B60, 0XEFDD, 0X186F |
2273 | }; | 2273 | }; |
2274 | 2274 | ||
2275 | static void __devinit snd_m3_assp_init(struct snd_m3 *chip) | 2275 | static void snd_m3_assp_init(struct snd_m3 *chip) |
2276 | { | 2276 | { |
2277 | unsigned int i; | 2277 | unsigned int i; |
2278 | 2278 | ||