lkml.org 
[lkml]   [2004]   [Nov]   [13]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Date
From
Subject[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().

diff -uprN -X /linux/dontdiff a/sound/oss/es1371.c b/sound/oss/es1371.c
--- a/sound/oss/es1371.c 2004-08-26 22:05:52.000000000 +0200
+++ b/sound/oss/es1371.c 2004-11-13 17:11:31.000000000 +0100
@@ -637,7 +637,7 @@ static void set_dac2_rate(struct es1371_

/* --------------------------------------------------------------------- */

-static void __init src_init(struct es1371_state *s)
+static void __devinit src_init(struct es1371_state *s)
{
unsigned int i;

@@ -2754,7 +2754,7 @@ MODULE_LICENSE("GPL");
static struct initvol {
int mixch;
int vol;
-} initvol[] __initdata = {
+} initvol[] __devinitdata = {
{ SOUND_MIXER_WRITE_LINE, 0x4040 },
{ SOUND_MIXER_WRITE_CD, 0x4040 },
{ MIXER_WRITE(SOUND_MIXER_VIDEO), 0x4040 },
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
\
 
 \ /
  Last update: 2005-03-22 14:08    [W:0.066 / U:0.044 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site