[S390] cio: Get rid of _ccw_device_get_device_number().

[linux-2.6-omap-h63xx.git] / drivers / s390 / block / dasd_diag.c

diff --git a/drivers/s390/block/dasd_diag.c b/drivers/s390/block/dasd_diag.c
index ab782bb46ac1a13978d21def078eca1b60cec77c..eccac1c3b71bb86ef535300a21c4311ebce343a9 100644 (file)
--- a/drivers/s390/block/dasd_diag.c
+++ b/drivers/s390/block/dasd_diag.c
@@ -50,6 +50,7 @@ struct dasd_diag_private {
        struct dasd_diag_rw_io iob;
        struct dasd_diag_init_io iib;
        blocknum_t pt_block;
+       struct ccw_dev_id dev_id;
 };
 
 struct dasd_diag_req {
@@ -65,7 +66,7 @@ static const u8 DASD_DIAG_CMS1[] = { 0xc3, 0xd4, 0xe2, 0xf1 };/* EBCDIC CMS1 */
  * resulting condition code and DIAG return code. */
 static inline int dia250(void *iob, int cmd)
 {
-       register unsigned long reg0 asm ("0") = (unsigned long) iob;
+       register unsigned long reg2 asm ("2") = (unsigned long) iob;
        typedef union {
                struct dasd_diag_init_io init_io;
                struct dasd_diag_rw_io rw_io;
@@ -74,15 +75,15 @@ static inline int dia250(void *iob, int cmd)
 
        rc = 3;
        asm volatile(
-               "       diag    0,%2,0x250\n"
+               "       diag    2,%2,0x250\n"
                "0:     ipm     %0\n"
                "       srl     %0,28\n"
-               "       or      %0,1\n"
+               "       or      %0,3\n"
                "1:\n"
                EX_TABLE(0b,1b)
                : "+d" (rc), "=m" (*(addr_type *) iob)
-               : "d" (cmd), "d" (reg0), "m" (*(addr_type *) iob)
-               : "1", "cc");
+               : "d" (cmd), "d" (reg2), "m" (*(addr_type *) iob)
+               : "3", "cc");
        return rc;
 }
 
@@ -102,7 +103,7 @@ mdsk_init_io(struct dasd_device *device, unsigned int blocksize,
        iib = &private->iib;
        memset(iib, 0, sizeof (struct dasd_diag_init_io));
 
-       iib->dev_nr = _ccw_device_get_device_number(device->cdev);
+       iib->dev_nr = private->dev_id.devno;
        iib->block_size = blocksize;
        iib->offset = offset;
        iib->flaga = DASD_DIAG_FLAGA_DEFAULT;
@@ -127,7 +128,7 @@ mdsk_term_io(struct dasd_device * device)
        private = (struct dasd_diag_private *) device->private;
        iib = &private->iib;
        memset(iib, 0, sizeof (struct dasd_diag_init_io));
-       iib->dev_nr = _ccw_device_get_device_number(device->cdev);
+       iib->dev_nr = private->dev_id.devno;
        rc = dia250(iib, TERM_BIO);
        return rc;
 }
@@ -166,7 +167,7 @@ dasd_start_diag(struct dasd_ccw_req * cqr)
        private = (struct dasd_diag_private *) device->private;
        dreq = (struct dasd_diag_req *) cqr->data;
 
-       private->iob.dev_nr = _ccw_device_get_device_number(device->cdev);
+       private->iob.dev_nr = private->dev_id.devno;
        private->iob.key = 0;
        private->iob.flags = DASD_DIAG_RWFLAG_ASYNC;
        private->iob.block_count = dreq->block_count;
@@ -323,11 +324,12 @@ dasd_diag_check_device(struct dasd_device *device)
                                "memory allocation failed for private data");
                        return -ENOMEM;
                }
+               ccw_device_get_id(device->cdev, &private->dev_id);
                device->private = (void *) private;
        }
        /* Read Device Characteristics */
        rdc_data = (void *) &(private->rdc_data);
-       rdc_data->dev_nr = _ccw_device_get_device_number(device->cdev);
+       rdc_data->dev_nr = private->dev_id.devno;
        rdc_data->rdc_len = sizeof (struct dasd_diag_characteristics);
 
        rc = diag210((struct diag210 *) rdc_data);