Commit 07741cd4 authored by Andries E. Brouwer's avatar Andries E. Brouwer Committed by Linus Torvalds

[PATCH] __devinit in sound/oss/es1371.c

It is forbidden to refer from __devinit to __init.  (Unless one argues
that in the given situation hotplugging is actually impossible.  Too
ugly.)

However, es1371_probe() is __devinit and referred to __initdata initvol[]
and to __init src_init().
parent 315ab450
...@@ -637,7 +637,7 @@ static void set_dac2_rate(struct es1371_state *s, unsigned rate) ...@@ -637,7 +637,7 @@ static void set_dac2_rate(struct es1371_state *s, unsigned rate)
/* --------------------------------------------------------------------- */ /* --------------------------------------------------------------------- */
static void __init src_init(struct es1371_state *s) static void __devinit src_init(struct es1371_state *s)
{ {
unsigned int i; unsigned int i;
...@@ -2758,7 +2758,7 @@ MODULE_LICENSE("GPL"); ...@@ -2758,7 +2758,7 @@ MODULE_LICENSE("GPL");
static struct initvol { static struct initvol {
int mixch; int mixch;
int vol; int vol;
} initvol[] __initdata = { } initvol[] __devinitdata = {
{ SOUND_MIXER_WRITE_LINE, 0x4040 }, { SOUND_MIXER_WRITE_LINE, 0x4040 },
{ SOUND_MIXER_WRITE_CD, 0x4040 }, { SOUND_MIXER_WRITE_CD, 0x4040 },
{ MIXER_WRITE(SOUND_MIXER_VIDEO), 0x4040 }, { MIXER_WRITE(SOUND_MIXER_VIDEO), 0x4040 },
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment