Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 40e1a9c0 authored by Clemens Ladisch's avatar Clemens Ladisch Committed by Jaroslav Kysela
Browse files

[ALSA] wavefront: fix __init/__devinit confusion 



The wavefront driver used __init in some places referenced by __devinit
functions.

Signed-off-by: default avatarClemens Ladisch <clemens@ladisch.de>
Signed-off-by: default avatarJaroslav Kysela <perex@suse.cz>
parent 1a806f48

sound/isa/wavefront/wavefront_fx.c

+18 −18
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ 


/* weird stuff, derived from port I/O tracing with dosemu */



static unsigned char page_zero[] __initdata = {

static unsigned char page_zero[] __devinitdata = {

0x01, 0x7c, 0x00, 0x1e, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf5, 0x00,

0x11, 0x00, 0x20, 0x00, 0x32, 0x00, 0x40, 0x00, 0x13, 0x00, 0x00,

0x00, 0x14, 0x02, 0x76, 0x00, 0x60, 0x00, 0x80, 0x02, 0x00, 0x00,
@@ -61,7 +61,7 @@ static unsigned char page_zero[] __initdata = { 
0x1d, 0x02, 0xdf

};



static unsigned char page_one[] __initdata = {

static unsigned char page_one[] __devinitdata = {

0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x19, 0x00,

0x1f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0xd8, 0x00, 0x00,

0x02, 0x20, 0x00, 0x19, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x01,
@@ -88,7 +88,7 @@ static unsigned char page_one[] __initdata = { 
0x60, 0x00, 0x1b

};



static unsigned char page_two[] __initdata = {

static unsigned char page_two[] __devinitdata = {

0xc4, 0x00, 0x44, 0x07, 0x44, 0x00, 0x40, 0x25, 0x01, 0x06, 0xc4,

0x07, 0x40, 0x25, 0x01, 0x00, 0x46, 0x46, 0x00, 0x00, 0x00, 0x00,

0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -103,7 +103,7 @@ static unsigned char page_two[] __initdata = { 
0x46, 0x05, 0x46, 0x07, 0x46, 0x07, 0x44

};



static unsigned char page_three[] __initdata = {

static unsigned char page_three[] __devinitdata = {

0x07, 0x40, 0x00, 0x00, 0x00, 0x47, 0x00, 0x40, 0x00, 0x40, 0x06,

0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,

0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -118,7 +118,7 @@ static unsigned char page_three[] __initdata = { 
0x02, 0x00, 0x42, 0x00, 0xc0, 0x00, 0x40

};



static unsigned char page_four[] __initdata = {

static unsigned char page_four[] __devinitdata = {

0x63, 0x03, 0x26, 0x02, 0x2c, 0x00, 0x24, 0x00, 0x2e, 0x02, 0x02,

0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,

0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -133,7 +133,7 @@ static unsigned char page_four[] __initdata = { 
0x02, 0x62, 0x02, 0x20, 0x01, 0x21, 0x01

};



static unsigned char page_six[] __initdata = {

static unsigned char page_six[] __devinitdata = {

0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x04, 0x00, 0x00, 0x06, 0x00,

0x00, 0x08, 0x00, 0x00, 0x0a, 0x00, 0x00, 0x0c, 0x00, 0x00, 0x0e,

0x00, 0x00, 0x10, 0x00, 0x00, 0x12, 0x00, 0x00, 0x14, 0x00, 0x00,
@@ -154,7 +154,7 @@ static unsigned char page_six[] __initdata = { 
0x80, 0x00, 0x7e, 0x80, 0x80

};



static unsigned char page_seven[] __initdata = {

static unsigned char page_seven[] __devinitdata = {

0x0f, 0xff, 0x00, 0x00, 0x08, 0x00, 0x08, 0x00, 0x02, 0x00, 0x00,

0x00, 0x00, 0x00, 0x0f, 0xff, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00,

0x08, 0x00, 0x00, 0x00, 0x0f, 0xff, 0x00, 0x00, 0x00, 0x00, 0x0f,
@@ -181,7 +181,7 @@ static unsigned char page_seven[] __initdata = { 
0x00, 0x02, 0x00

};



static unsigned char page_zero_v2[] __initdata = {

static unsigned char page_zero_v2[] __devinitdata = {

0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,

0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,

0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -193,7 +193,7 @@ static unsigned char page_zero_v2[] __initdata = { 
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00

};



static unsigned char page_one_v2[] __initdata = {

static unsigned char page_one_v2[] __devinitdata = {

0x01, 0xc0, 0x01, 0xfa, 0x00, 0x1a, 0x00, 0x00, 0x00, 0x00, 0x00,

0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,

0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -205,21 +205,21 @@ static unsigned char page_one_v2[] __initdata = { 
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00

};



static unsigned char page_two_v2[] __initdata = {

static unsigned char page_two_v2[] __devinitdata = {

0x46, 0x46, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,

0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,

0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,

0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,

0x00, 0x00, 0x00, 0x00

};

static unsigned char page_three_v2[] __initdata = {

static unsigned char page_three_v2[] __devinitdata = {

0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,

0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,

0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,

0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,

0x00, 0x00, 0x00, 0x00

};

static unsigned char page_four_v2[] __initdata = {

static unsigned char page_four_v2[] __devinitdata = {

0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,

0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,

0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -227,7 +227,7 @@ static unsigned char page_four_v2[] __initdata = { 
0x00, 0x00, 0x00, 0x00

};



static unsigned char page_seven_v2[] __initdata = {

static unsigned char page_seven_v2[] __devinitdata = {

0x0f, 0xff, 0x0f, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,

0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,

0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -239,7 +239,7 @@ static unsigned char page_seven_v2[] __initdata = { 
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00

};



static unsigned char mod_v2[] __initdata = {

static unsigned char mod_v2[] __devinitdata = {

0x01, 0x00, 0x02, 0x00, 0x01, 0x01, 0x02, 0x00, 0x01, 0x02, 0x02,

0x00, 0x01, 0x03, 0x02, 0x00, 0x01, 0x04, 0x02, 0x00, 0x01, 0x05,

0x02, 0x00, 0x01, 0x06, 0x02, 0x00, 0x01, 0x07, 0x02, 0x00, 0xb0,
@@ -269,7 +269,7 @@ static unsigned char mod_v2[] __initdata = { 
0x02, 0x01, 0x01, 0x04, 0x02, 0x01, 0x01, 0x05, 0x02, 0x01, 0x01,

0x06, 0x02, 0x01, 0x01, 0x07, 0x02, 0x01

};

static unsigned char coefficients[] __initdata = {

static unsigned char coefficients[] __devinitdata = {

0x07, 0x46, 0x00, 0x00, 0x07, 0x49, 0x00, 0x00, 0x00, 0x4b, 0x03,

0x11, 0x00, 0x4d, 0x01, 0x32, 0x07, 0x46, 0x00, 0x00, 0x07, 0x49,

0x00, 0x00, 0x07, 0x40, 0x00, 0x00, 0x07, 0x41, 0x00, 0x00, 0x01,
@@ -305,14 +305,14 @@ static unsigned char coefficients[] __initdata = { 
0x06, 0x6c, 0x4c, 0x6c, 0x06, 0x50, 0x52, 0xe2, 0x06, 0x42, 0x02,

0xba

};

static unsigned char coefficients2[] __initdata = {

static unsigned char coefficients2[] __devinitdata = {

0x07, 0x46, 0x00, 0x00, 0x07, 0x49, 0x00, 0x00, 0x07, 0x45, 0x0f,

0xff, 0x07, 0x48, 0x0f, 0xff, 0x07, 0x7b, 0x04, 0xcc, 0x07, 0x7d,

0x04, 0xcc, 0x07, 0x7c, 0x00, 0x00, 0x07, 0x7e, 0x00, 0x00, 0x07,

0x46, 0x00, 0x00, 0x07, 0x49, 0x00, 0x00, 0x07, 0x47, 0x00, 0x00,

0x07, 0x4a, 0x00, 0x00, 0x07, 0x4c, 0x00, 0x00, 0x07, 0x4e, 0x00, 0x00

};

static unsigned char coefficients3[] __initdata = {

static unsigned char coefficients3[] __devinitdata = {

0x00, 0x00, 0x00, 0x00, 0x00, 0x28, 0x00, 0x28, 0x00, 0x51, 0x00,

0x51, 0x00, 0x7a, 0x00, 0x7a, 0x00, 0xa3, 0x00, 0xa3, 0x00, 0xcc,

0x00, 0xcc, 0x00, 0xf5, 0x00, 0xf5, 0x01, 0x1e, 0x01, 0x1e, 0x01,
@@ -563,7 +563,7 @@ snd_wavefront_fx_ioctl (struct snd_hwdep *sdev, struct file *file, 
*/





int __init

int __devinit

snd_wavefront_fx_start (snd_wavefront_t *dev)



{

sound/isa/wavefront/wavefront_midi.c

+1 −1
Original line number Diff line number Diff line
@@ -474,7 +474,7 @@ snd_wavefront_midi_disable_virtual (snd_wavefront_card_t *card) 
	spin_unlock_irqrestore (&card->wavefront.midi.virtual, flags);

}



int __init

int __devinit

snd_wavefront_midi_start (snd_wavefront_card_t *card)



{

sound/isa/wavefront/wavefront_synth.c

+7 −7
Original line number Diff line number Diff line
@@ -1738,7 +1738,7 @@ snd_wavefront_internal_interrupt (snd_wavefront_card_t *card) 
7 Unused

*/



static int __init

static int __devinit

snd_wavefront_interrupt_bits (int irq)



{
@@ -1766,7 +1766,7 @@ snd_wavefront_interrupt_bits (int irq) 
	return bits;

}



static void __init

static void __devinit

wavefront_should_cause_interrupt (snd_wavefront_t *dev, 

				  int val, int port, int timeout)
@@ -1787,7 +1787,7 @@ wavefront_should_cause_interrupt (snd_wavefront_t *dev, 
	}

}



static int __init

static int __devinit

wavefront_reset_to_cleanliness (snd_wavefront_t *dev)



{
@@ -1946,7 +1946,7 @@ wavefront_reset_to_cleanliness (snd_wavefront_t *dev) 
#include <asm/uaccess.h>





static int __init

static int __devinit

wavefront_download_firmware (snd_wavefront_t *dev, char *path)



{
@@ -2047,7 +2047,7 @@ wavefront_download_firmware (snd_wavefront_t *dev, char *path) 
}





static int __init

static int __devinit

wavefront_do_reset (snd_wavefront_t *dev)



{
@@ -2136,7 +2136,7 @@ wavefront_do_reset (snd_wavefront_t *dev) 
	return 1;

}



int __init

int __devinit

snd_wavefront_start (snd_wavefront_t *dev)



{
@@ -2178,7 +2178,7 @@ snd_wavefront_start (snd_wavefront_t *dev) 
	return (0);

}



int __init

int __devinit

snd_wavefront_detect (snd_wavefront_card_t *card)



{