[PATCH] s390: common i/o layer

From: Martin Schwidefsky <schwidefsky@de.ibm.com>

From: Cornelia Huck <cohuck@de.ibm.com>

Common i/o layer changes:
 - Remove bogus defines.
 - Fix length of strncmp on bus id.

Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

diff --git a/drivers/s390/cio/chsc.c b/drivers/s390/cio/chsc.c
index 521abde2f481fc4c8726de0d85dbfa5f65c6b733..4c8d6df0605d2d7136485cfcc08d113bfcc98234 100644 (file)
--- a/drivers/s390/cio/chsc.c
+++ b/drivers/s390/cio/chsc.c
@@ -1,7 +1,7 @@
 /*
  *  drivers/s390/cio/chsc.c
  *   S/390 common I/O routines -- channel subsystem call
- *   $Revision: 1.111 $
+ *   $Revision: 1.112 $
  *
  *    Copyright (C) 1999-2002 IBM Deutschland Entwicklung GmbH,
  *                           IBM Corporation
@@ -24,7 +24,6 @@
 #include "ioasm.h"
 #include "chsc.h"
 
-#define CHPID_LONGS (256 / (8 * sizeof(long))) /* 256 chpids */
 static struct channel_path *chps[NR_CHPIDS];
 
 static void *sei_page;

diff --git a/drivers/s390/cio/chsc.h b/drivers/s390/cio/chsc.h
index 6f02ac0c97812bcceb3f033f43c5cc56b9506bef..90f5a9e739e6363f7226d99910856c2a39511bb0 100644 (file)
--- a/drivers/s390/cio/chsc.h
+++ b/drivers/s390/cio/chsc.h
@@ -23,5 +23,4 @@ extern struct channel_path *chps[];
 extern void s390_process_css( void );
 extern void chsc_validate_chpids(struct subchannel *);
 extern void chpid_is_actually_online(int);
-extern int is_chpid_online(int);
 #endif

diff --git a/drivers/s390/cio/device.c b/drivers/s390/cio/device.c
index 9f947ca00061459e859707315d36a90313f007c6..a921b1fea5fdbd6aac2d7a932e63afc4f8a166c2 100644 (file)
--- a/drivers/s390/cio/device.c
+++ b/drivers/s390/cio/device.c
@@ -1,7 +1,7 @@
 /*
  *  drivers/s390/cio/device.c
  *  bus driver for ccw devices
- *   $Revision: 1.119 $
+ *   $Revision: 1.120 $
  *
  *    Copyright (C) 2002 IBM Deutschland Entwicklung GmbH,
  *                      IBM Corporation
@@ -526,7 +526,8 @@ get_disc_ccwdev_by_devno(unsigned int devno, struct ccw_device *sibling)
                cdev = to_ccwdev(dev);
                if ((cdev->private->state == DEV_STATE_DISCONNECTED) &&
                    (cdev->private->devno == devno) &&
-                   (!strncmp(cdev->dev.bus_id, sibling->dev.bus_id, 4))) {
+                   (!strncmp(cdev->dev.bus_id, sibling->dev.bus_id,
+                             BUS_ID_SIZE))) {
                        cdev->private->state = DEV_STATE_NOT_OPER;
                        break;
                }