Messages in this thread Patch in this message | | | Date | Fri, 26 Jan 2007 17:48:31 +0100 | From | Martin Schwidefsky <> | Subject | [S390] cio: Remove check for ssd in chpids_show(). |
| |
From: Cornelia Huck <cornelia.huck@de.ibm.com>
[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> ---
drivers/s390/cio/device.c | 7 ++----- 1 files changed, 2 insertions(+), 5 deletions(-)
diff -urpN linux-2.6/drivers/s390/cio/device.c linux-2.6-patched/drivers/s390/cio/device.c --- linux-2.6/drivers/s390/cio/device.c 2007-01-26 17:27:47.000000000 +0100 +++ linux-2.6-patched/drivers/s390/cio/device.c 2007-01-26 17:27:51.000000000 +0100 @@ -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); } - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
| |