[PATCH] drivers/scsi NULL noise removal

NULL noise in sbus scsi drivers got missed

Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

2 files changed, 4 insertions, 4 deletions

diff --git a/drivers/scsi/esp.c b/drivers/scsi/esp.c
index 891f97f7881e..f6900538be90 100644
--- a/drivers/scsi/esp.c
+++ b/drivers/scsi/esp.c
@@ -1147,7 +1147,7 @@ static int __init esp_detect(struct scsi_host_template *tpnt)
         static struct sbus_dev esp_dev;
         int esps_in_use = 0;
 
-        espchain = 0;
+        espchain = NULL;
 
         if (sun4_esp_physaddr) {
                 memset (&esp_dev, 0, sizeof(esp_dev));
@@ -2513,7 +2513,7 @@ static inline void esp_reconnect(struct esp *esp, struct scsi_cmnd *sp)
                 ESPLOG(("esp%d: Weird, being reselected but disconnected "
                         "command queue is empty.\n", esp->esp_id));
         esp->snip = 0;
-        esp->current_SC = 0;
+        esp->current_SC = NULL;
         sp->SCp.phase = not_issued;
         append_SC(&esp->issue_SC, sp);
 }
@@ -4148,7 +4148,7 @@ static int esp_work_bus(struct esp *esp)
 }
 
 static espfunc_t isvc_vector[] = {
-        0,
+        NULL,
         esp_do_phase_determine,
         esp_do_resetbus,
         esp_finish_reset,
diff --git a/drivers/scsi/pluto.c b/drivers/scsi/pluto.c
index 7bb0a2e56743..c01b7191fcf5 100644
--- a/drivers/scsi/pluto.c
+++ b/drivers/scsi/pluto.c
@@ -45,7 +45,7 @@ static struct ctrl_inquiry {
         Scsi_Cmnd cmd;
         char inquiry[256];
         fc_channel *fc;
-} *fcs __initdata = { 0 };
+} *fcs __initdata;
 static int fcscount __initdata = 0;
 static atomic_t fcss __initdata = ATOMIC_INIT(0);
 DECLARE_MUTEX_LOCKED(fc_sem);