2007-02-09 15:35:25

by Alon Bar-Lev

[permalink] [raw]
Subject: [PATCH 32/34] __initdata cleanup - scsi


Trivial.

Signed-off-by: Alon Bar-Lev <[email protected]>
Signed-off-by: Bernhard Walle <[email protected]>

---

diff -urNp linux-2.6.20-rc6-mm3.org/drivers/scsi/aha1542.c linux-2.6.20-rc6-mm3/drivers/scsi/aha1542.c
--- linux-2.6.20-rc6-mm3.org/drivers/scsi/aha1542.c 2007-01-25 04:19:28.000000000 +0200
+++ linux-2.6.20-rc6-mm3/drivers/scsi/aha1542.c 2007-01-31 22:19:30.000000000 +0200
@@ -943,7 +943,7 @@ fail:
}

#ifndef MODULE
-static char *setup_str[MAXBOARDS] __initdata;
+static char *setup_str[MAXBOARDS] __initdata = {0};
static int setup_idx = 0;

static void __init aha1542_setup(char *str, int *ints)
diff -urNp linux-2.6.20-rc6-mm3.org/drivers/scsi/pluto.c linux-2.6.20-rc6-mm3/drivers/scsi/pluto.c
--- linux-2.6.20-rc6-mm3.org/drivers/scsi/pluto.c 2007-01-25 04:19:28.000000000 +0200
+++ linux-2.6.20-rc6-mm3/drivers/scsi/pluto.c 2007-01-31 22:19:30.000000000 +0200
@@ -47,7 +47,7 @@ static struct ctrl_inquiry {
Scsi_Cmnd cmd;
char inquiry[256];
fc_channel *fc;
-} *fcs __initdata;
+} *fcs __initdata = NULL;
static int fcscount __initdata = 0;
static atomic_t fcss __initdata = ATOMIC_INIT(0);
DECLARE_MUTEX_LOCKED(fc_sem);