Skip to contentSkip to conversation

cio: Remove check for ssd in chpids_show().

S390 Martin Schwidefsky 1 participant 1 message Jan 26, 2007

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

From: Cornelia Huck <[email protected]>

[S390] cio: Remove check for ssd in chpids_show().

Since ssd_info is now available before the subchannel is registered, we don't need to check whether it is available.

---

 drivers/s390/cio/device.c |    7 ++-----
 1 files changed, 2 insertions(+), 5 deletions(-)
drivers/s390/cio/device.c +2 -5
diff -urpN linux-2.6/drivers/s390/cio/device.c linux-2.6-patched/drivers/s390/cio/device.c
@@ -234,11 +234,8 @@ chpids_show (struct device * dev, struct
 	ssize_t ret = 0;
 	int chp;
 
-	if (ssd)
-		for (chp = 0; chp < 8; chp++)
-			ret += sprintf (buf+ret, "%02x ", ssd->chpid[chp]);
-	else
-		ret += sprintf (buf, "n/a");
+	for (chp = 0; chp < 8; chp++)
+		ret += sprintf (buf+ret, "%02x ", ssd->chpid[chp]);
 	ret += sprintf (buf+ret, "\n");
 	return min((ssize_t)PAGE_SIZE, ret);
 }