From: Cornelia Huck <cornelia.huck@de.ibm.com>
Date: Mon, 5 Feb 2007 20:16:56 +0000 (+0100)
Subject: [S390] cio: Remove check for ssd in chpids_show().
X-Git-Tag: v6.6-pxa1908~56056^2~21^2~31
X-Git-Url: https://git.dujemihanovic.xyz/?a=commitdiff_plain;h=32c5b050927c515cea4083eb8f3a7177dc4279a1;p=linux.git

[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.

Signed-off-by: Cornelia Huck <cornelia.huck@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
---

diff --git a/drivers/s390/cio/device.c b/drivers/s390/cio/device.c
index 78ed65bf2f99..eedf863c6c64 100644
--- a/drivers/s390/cio/device.c
+++ b/drivers/s390/cio/device.c
@@ -234,11 +234,8 @@ chpids_show (struct device * dev, struct device_attribute *attr, char * buf)
 	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);
 }