aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/s390/cio
diff options
context:
space:
mode:
authorCornelia Huck <cornelia.huck@de.ibm.com>2007-02-05 15:16:56 -0500
committerMartin Schwidefsky <schwidefsky@de.ibm.com>2007-02-05 15:16:56 -0500
commit32c5b050927c515cea4083eb8f3a7177dc4279a1 (patch)
tree1b1c231f0a4a9aab6b65d70ccc664c921973bff1 /drivers/s390/cio
parentbda3563fb28e3a4260ac3566cf11700792a336bb (diff)
[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>
Diffstat (limited to 'drivers/s390/cio')
-rw-r--r--drivers/s390/cio/device.c7
1 files changed, 2 insertions, 5 deletions
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)
234 ssize_t ret = 0; 234 ssize_t ret = 0;
235 int chp; 235 int chp;
236 236
237 if (ssd) 237 for (chp = 0; chp < 8; chp++)
238 for (chp = 0; chp < 8; chp++) 238 ret += sprintf (buf+ret, "%02x ", ssd->chpid[chp]);
239 ret += sprintf (buf+ret, "%02x ", ssd->chpid[chp]);
240 else
241 ret += sprintf (buf, "n/a");
242 ret += sprintf (buf+ret, "\n"); 239 ret += sprintf (buf+ret, "\n");
243 return min((ssize_t)PAGE_SIZE, ret); 240 return min((ssize_t)PAGE_SIZE, ret);
244} 241}