aboutsummaryrefslogtreecommitdiffstats
path: root/sound/pci/au88x0
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2006-07-05 10:51:05 -0400
committerJaroslav Kysela <perex@suse.cz>2006-07-12 14:08:01 -0400
commitf40b68903ccd511ea9d658b4bce319dd032a265a (patch)
tree9f8447f4370f5e4d9303ca5c8e0b2c8cd790c67e /sound/pci/au88x0
parent562b590d4e838ecaca2cfd246fd4df55dc6db18a (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/au88x0')
-rw-r--r--sound/pci/au88x0/au8810.c2
-rw-r--r--sound/pci/au88x0/au8820.c2
-rw-r--r--sound/pci/au88x0/au8830.c2
-rw-r--r--sound/pci/au88x0/au88x0.h3
-rw-r--r--sound/pci/au88x0/au88x0_a3d.c29
-rw-r--r--sound/pci/au88x0/au88x0_core.c4
6 files changed, 21 insertions, 21 deletions
diff --git a/sound/pci/au88x0/au8810.c b/sound/pci/au88x0/au8810.c
index bd3352998ad..fce22c7af0e 100644
--- a/sound/pci/au88x0/au8810.c
+++ b/sound/pci/au88x0/au8810.c
@@ -1,6 +1,6 @@
1#include "au8810.h" 1#include "au8810.h"
2#include "au88x0.h" 2#include "au88x0.h"
3static struct pci_device_id snd_vortex_ids[] __devinitdata = { 3static struct pci_device_id snd_vortex_ids[] = {
4 {PCI_VENDOR_ID_AUREAL, PCI_DEVICE_ID_AUREAL_ADVANTAGE, 4 {PCI_VENDOR_ID_AUREAL, PCI_DEVICE_ID_AUREAL_ADVANTAGE,
5 PCI_ANY_ID, PCI_ANY_ID, 0, 0, 1,}, 5 PCI_ANY_ID, PCI_ANY_ID, 0, 0, 1,},
6 {0,} 6 {0,}
diff --git a/sound/pci/au88x0/au8820.c b/sound/pci/au88x0/au8820.c
index 7e3fd8372d8..d1fbcce0725 100644
--- a/sound/pci/au88x0/au8820.c
+++ b/sound/pci/au88x0/au8820.c
@@ -1,6 +1,6 @@
1#include "au8820.h" 1#include "au8820.h"
2#include "au88x0.h" 2#include "au88x0.h"
3static struct pci_device_id snd_vortex_ids[] __devinitdata = { 3static struct pci_device_id snd_vortex_ids[] = {
4 {PCI_VENDOR_ID_AUREAL, PCI_DEVICE_ID_AUREAL_VORTEX_1, 4 {PCI_VENDOR_ID_AUREAL, PCI_DEVICE_ID_AUREAL_VORTEX_1,
5 PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0,}, 5 PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0,},
6 {0,} 6 {0,}
diff --git a/sound/pci/au88x0/au8830.c b/sound/pci/au88x0/au8830.c
index b840f6608a6..d4f2717c14f 100644
--- a/sound/pci/au88x0/au8830.c
+++ b/sound/pci/au88x0/au8830.c
@@ -1,6 +1,6 @@
1#include "au8830.h" 1#include "au8830.h"
2#include "au88x0.h" 2#include "au88x0.h"
3static struct pci_device_id snd_vortex_ids[] __devinitdata = { 3static struct pci_device_id snd_vortex_ids[] = {
4 {PCI_VENDOR_ID_AUREAL, PCI_DEVICE_ID_AUREAL_VORTEX_2, 4 {PCI_VENDOR_ID_AUREAL, PCI_DEVICE_ID_AUREAL_VORTEX_2,
5 PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0,}, 5 PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0,},
6 {0,} 6 {0,}
diff --git a/sound/pci/au88x0/au88x0.h b/sound/pci/au88x0/au88x0.h
index f078b716d2b..b1cfc3c79d0 100644
--- a/sound/pci/au88x0/au88x0.h
+++ b/sound/pci/au88x0/au88x0.h
@@ -270,7 +270,8 @@ static void vortex_mix_setvolumebyte(vortex_t * vortex, unsigned char mix,
270 270
271/* A3D functions. */ 271/* A3D functions. */
272#ifndef CHIP_AU8820 272#ifndef CHIP_AU8820
273static void vortex_Vort3D(vortex_t * v, int en); 273static void vortex_Vort3D_enable(vortex_t * v);
274static void vortex_Vort3D_disable(vortex_t * v);
274static void vortex_Vort3D_connect(vortex_t * vortex, int en); 275static void vortex_Vort3D_connect(vortex_t * vortex, int en);
275static void vortex_Vort3D_InitializeSource(a3dsrc_t * a, int en); 276static void vortex_Vort3D_InitializeSource(a3dsrc_t * a, int en);
276#endif 277#endif
diff --git a/sound/pci/au88x0/au88x0_a3d.c b/sound/pci/au88x0/au88x0_a3d.c
index d215f393ea6..649849e540d 100644
--- a/sound/pci/au88x0/au88x0_a3d.c
+++ b/sound/pci/au88x0/au88x0_a3d.c
@@ -593,24 +593,23 @@ static int Vort3DRend_Initialize(vortex_t * v, unsigned short mode)
593static int vortex_a3d_register_controls(vortex_t * vortex); 593static int vortex_a3d_register_controls(vortex_t * vortex);
594static void vortex_a3d_unregister_controls(vortex_t * vortex); 594static void vortex_a3d_unregister_controls(vortex_t * vortex);
595/* A3D base support init/shudown */ 595/* A3D base support init/shudown */
596static void vortex_Vort3D(vortex_t * v, int en) 596static void __devinit vortex_Vort3D_enable(vortex_t * v)
597{ 597{
598 int i; 598 int i;
599 if (en) { 599
600 Vort3DRend_Initialize(v, XT_HEADPHONE); 600 Vort3DRend_Initialize(v, XT_HEADPHONE);
601 for (i = 0; i < NR_A3D; i++) { 601 for (i = 0; i < NR_A3D; i++) {
602 vortex_A3dSourceHw_Initialize(v, i % 4, i >> 2); 602 vortex_A3dSourceHw_Initialize(v, i % 4, i >> 2);
603 a3dsrc_ZeroStateA3D(&(v->a3d[0])); 603 a3dsrc_ZeroStateA3D(&(v->a3d[0]));
604 }
605 } else {
606 vortex_XtalkHw_Disable(v);
607 } 604 }
608 /* Register ALSA controls */ 605 /* Register ALSA controls */
609 if (en) { 606 vortex_a3d_register_controls(v);
610 vortex_a3d_register_controls(v); 607}
611 } else { 608
612 vortex_a3d_unregister_controls(v); 609static void vortex_Vort3D_disable(vortex_t * v)
613 } 610{
611 vortex_XtalkHw_Disable(v);
612 vortex_a3d_unregister_controls(v);
614} 613}
615 614
616/* Make A3D subsystem connections. */ 615/* Make A3D subsystem connections. */
@@ -855,7 +854,7 @@ static struct snd_kcontrol_new vortex_a3d_kcontrol __devinitdata = {
855}; 854};
856 855
857/* Control (un)registration. */ 856/* Control (un)registration. */
858static int vortex_a3d_register_controls(vortex_t * vortex) 857static int __devinit vortex_a3d_register_controls(vortex_t * vortex)
859{ 858{
860 struct snd_kcontrol *kcontrol; 859 struct snd_kcontrol *kcontrol;
861 int err, i; 860 int err, i;
diff --git a/sound/pci/au88x0/au88x0_core.c b/sound/pci/au88x0/au88x0_core.c
index 4347e6abc1d..5299cce583d 100644
--- a/sound/pci/au88x0/au88x0_core.c
+++ b/sound/pci/au88x0/au88x0_core.c
@@ -2690,7 +2690,7 @@ static int __devinit vortex_core_init(vortex_t * vortex)
2690#ifndef CHIP_AU8820 2690#ifndef CHIP_AU8820
2691 vortex_eq_init(vortex); 2691 vortex_eq_init(vortex);
2692 vortex_spdif_init(vortex, 48000, 1); 2692 vortex_spdif_init(vortex, 48000, 1);
2693 vortex_Vort3D(vortex, 1); 2693 vortex_Vort3D_enable(vortex);
2694#endif 2694#endif
2695#ifndef CHIP_AU8810 2695#ifndef CHIP_AU8810
2696 vortex_wt_init(vortex); 2696 vortex_wt_init(vortex);
@@ -2718,7 +2718,7 @@ static int vortex_core_shutdown(vortex_t * vortex)
2718 printk(KERN_INFO "Vortex: shutdown..."); 2718 printk(KERN_INFO "Vortex: shutdown...");
2719#ifndef CHIP_AU8820 2719#ifndef CHIP_AU8820
2720 vortex_eq_free(vortex); 2720 vortex_eq_free(vortex);
2721 vortex_Vort3D(vortex, 0); 2721 vortex_Vort3D_disable(vortex);
2722#endif 2722#endif
2723 //vortex_disable_timer_int(vortex); 2723 //vortex_disable_timer_int(vortex);
2724 vortex_disable_int(vortex); 2724 vortex_disable_int(vortex);