From 957b48485c2fe49dfaed46e977f622196335c311 Mon Sep 17 00:00:00 2001
From: Al Viro <viro@www.linux.org.uk>
Date: Tue, 26 Apr 2005 07:43:42 -0700
Subject: [PATCH] --- yaml --- r: 475 b: refs/heads/master c:
 0f73832fd8fc42dd7cc73487147f5d5b8f8d2cf0 h: refs/heads/master i:   473:
 5037ed296ef9305ca9d1416044758908f23e3001   471:
 7663fd19c36d9c056a003622a01e14e4a52968b8 v: v3

---
 [refs]                     | 2 +-
 trunk/drivers/scsi/esp.c   | 6 +++---
 trunk/drivers/scsi/pluto.c | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index d450f0e9f931..fcdd03c9627c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f815e8182b94f8fb5913b66454b40b484a2f70cc
+refs/heads/master: 0f73832fd8fc42dd7cc73487147f5d5b8f8d2cf0
diff --git a/trunk/drivers/scsi/esp.c b/trunk/drivers/scsi/esp.c
index 891f97f7881e..f6900538be90 100644
--- a/trunk/drivers/scsi/esp.c
+++ b/trunk/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/trunk/drivers/scsi/pluto.c b/trunk/drivers/scsi/pluto.c
index 7bb0a2e56743..c01b7191fcf5 100644
--- a/trunk/drivers/scsi/pluto.c
+++ b/trunk/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);