4 files changed, 47 insertions, 42 deletions

diff --git a/drivers/s390/block/dasd.c b/drivers/s390/block/dasd.c
index 8fc891a9d47f..7008d32433bf 100644
--- a/drivers/s390/block/dasd.c
+++ b/drivers/s390/block/dasd.c
@@ -115,8 +115,7 @@ dasd_alloc_device(void)
 void
 dasd_free_device(struct dasd_device *device)
 {
-        if (device->private)
-                kfree(device->private);
+        kfree(device->private);
         free_page((unsigned long) device->erp_mem);
         free_pages((unsigned long) device->ccw_mem, 1);
         kfree(device);
@@ -539,8 +538,7 @@ dasd_kmalloc_request(char *magic, int cplength, int datasize,
         if (datasize > 0) {
                 cqr->data = kmalloc(datasize, GFP_ATOMIC | GFP_DMA);
                 if (cqr->data == NULL) {
-                        if (cqr->cpaddr != NULL)
-                                kfree(cqr->cpaddr);
+                        kfree(cqr->cpaddr);
                         kfree(cqr);
                         return ERR_PTR(-ENOMEM);
                 }
@@ -615,10 +613,8 @@ dasd_kfree_request(struct dasd_ccw_req * cqr, struct dasd_device * device)
                 clear_normalized_cda(ccw);
         } while (ccw++->flags & (CCW_FLAG_CC | CCW_FLAG_DC));
 #endif
-        if (cqr->cpaddr != NULL)
-                kfree(cqr->cpaddr);
-        if (cqr->data != NULL)
-                kfree(cqr->data);
+        kfree(cqr->cpaddr);
+        kfree(cqr->data);
         kfree(cqr);
         dasd_put_device(device);
 }
diff --git a/drivers/s390/block/dasd_devmap.c b/drivers/s390/block/dasd_devmap.c
index bda896d9d788..caee16a3dc62 100644
--- a/drivers/s390/block/dasd_devmap.c
+++ b/drivers/s390/block/dasd_devmap.c
@@ -387,8 +387,7 @@ dasd_add_busid(char *bus_id, int features)
                 new = 0;
         }
         spin_unlock(&dasd_devmap_lock);
-        if (new)
-                kfree(new);
+        kfree(new);
         return devmap;
 }
 
diff --git a/drivers/s390/block/dasd_diag.c b/drivers/s390/block/dasd_diag.c
index 7478423b53bb..ab8754e566bc 100644
--- a/drivers/s390/block/dasd_diag.c
+++ b/drivers/s390/block/dasd_diag.c
@@ -6,7 +6,7 @@
  * Bugreports.to..: <Linux390@de.ibm.com>
  * (C) IBM Corporation, IBM Deutschland Entwicklung GmbH, 1999,2000
  *
- * $Revision: 1.49 $
+ * $Revision: 1.51 $
  */
 
 #include <linux/config.h>
@@ -67,9 +67,9 @@ static const u8 DASD_DIAG_CMS1[] = { 0xc3, 0xd4, 0xe2, 0xf1 };/* EBCDIC CMS1 */
 static __inline__ int
 dia250(void *iob, int cmd)
 {
-        typedef struct {
-                char _[max(sizeof (struct dasd_diag_init_io),
-                           sizeof (struct dasd_diag_rw_io))];
+        typedef union {
+                struct dasd_diag_init_io init_io;
+                struct dasd_diag_rw_io rw_io;
         } addr_type;
         int rc;
 
@@ -190,7 +190,7 @@ dasd_start_diag(struct dasd_ccw_req * cqr)
         private->iob.flags = DASD_DIAG_RWFLAG_ASYNC;
         private->iob.block_count = dreq->block_count;
         private->iob.interrupt_params = (addr_t) cqr;
-        private->iob.bio_list = __pa(dreq->bio);
+        private->iob.bio_list = dreq->bio;
         private->iob.flaga = DASD_DIAG_FLAGA_DEFAULT;
 
         cqr->startclk = get_clock();
@@ -394,47 +394,57 @@ dasd_diag_check_device(struct dasd_device *device)
                 memset(&bio, 0, sizeof (struct dasd_diag_bio));
                 bio.type = MDSK_READ_REQ;
                 bio.block_number = private->pt_block + 1;
-                bio.buffer = __pa(label);
+                bio.buffer = label;
                 memset(&private->iob, 0, sizeof (struct dasd_diag_rw_io));
                 private->iob.dev_nr = rdc_data->dev_nr;
                 private->iob.key = 0;
                 private->iob.flags = 0; /* do synchronous io */
                 private->iob.block_count = 1;
                 private->iob.interrupt_params = 0;
-                private->iob.bio_list = __pa(&bio);
+                private->iob.bio_list = &bio;
                 private->iob.flaga = DASD_DIAG_FLAGA_DEFAULT;
                 rc = dia250(&private->iob, RW_BIO);
-                if (rc == 0 || rc == 3)
-                        break;
+                if (rc == 3) {
+                        DEV_MESSAGE(KERN_WARNING, device, "%s",
+                                "DIAG call failed");
+                        rc = -EOPNOTSUPP;
+                        goto out;
+                }
                 mdsk_term_io(device);
+                if (rc == 0)
+                        break;
         }
-        if (rc == 3) {
-                DEV_MESSAGE(KERN_WARNING, device, "%s", "DIAG call failed");
-                rc = -EOPNOTSUPP;
-        } else if (rc != 0) {
+        if (bsize > PAGE_SIZE) {
                 DEV_MESSAGE(KERN_WARNING, device, "device access failed "
                             "(rc=%d)", rc);
                 rc = -EIO;
+                goto out;
+        }
+        /* check for label block */
+        if (memcmp(label->label_id, DASD_DIAG_CMS1,
+                  sizeof(DASD_DIAG_CMS1)) == 0) {
+                /* get formatted blocksize from label block */
+                bsize = (unsigned int) label->block_size;
+                device->blocks = (unsigned long) label->block_count;
+        } else
+                device->blocks = end_block;
+        device->bp_block = bsize;
+        device->s2b_shift = 0;  /* bits to shift 512 to get a block */
+        for (sb = 512; sb < bsize; sb = sb << 1)
+                device->s2b_shift++;
+        rc = mdsk_init_io(device, device->bp_block, 0, NULL);
+        if (rc) {
+                DEV_MESSAGE(KERN_WARNING, device, "DIAG initialization "
+                        "failed (rc=%d)", rc);
+                rc = -EIO;
         } else {
-                if (memcmp(label->label_id, DASD_DIAG_CMS1,
-                          sizeof(DASD_DIAG_CMS1)) == 0) {
-                        /* get formatted blocksize from label block */
-                        bsize = (unsigned int) label->block_size;
-                        device->blocks = (unsigned long) label->block_count;
-                } else
-                        device->blocks = end_block;
-                device->bp_block = bsize;
-                device->s2b_shift = 0;  /* bits to shift 512 to get a block */
-                for (sb = 512; sb < bsize; sb = sb << 1)
-                        device->s2b_shift++;
-                
                 DEV_MESSAGE(KERN_INFO, device,
                             "(%ld B/blk): %ldkB",
                             (unsigned long) device->bp_block,
                             (unsigned long) (device->blocks <<
                                 device->s2b_shift) >> 1);
-                rc = 0;
         }
+out:
         free_page((long) label);
         return rc;
 }
@@ -529,7 +539,7 @@ dasd_diag_build_cp(struct dasd_device * device, struct request *req)
                                 memset(dbio, 0, sizeof (struct dasd_diag_bio));
                                 dbio->type = rw_cmd;
                                 dbio->block_number = recid + 1;
-                                dbio->buffer = __pa(dst);
+                                dbio->buffer = dst;
                                 dbio++;
                                 dst += blksize;
                                 recid++;
diff --git a/drivers/s390/block/dasd_diag.h b/drivers/s390/block/dasd_diag.h
index b26eb28df4bf..df31484d73a7 100644
--- a/drivers/s390/block/dasd_diag.h
+++ b/drivers/s390/block/dasd_diag.h
@@ -6,7 +6,7 @@
  * Bugreports.to..: <Linux390@de.ibm.com>
  * (C) IBM Corporation, IBM Deutschland Entwicklung GmbH, 1999,2000
  *
- * $Revision: 1.7 $
+ * $Revision: 1.8 $
  */
 
 #define MDSK_WRITE_REQ 0x01
@@ -78,7 +78,7 @@ struct dasd_diag_bio {
         u8 spare1[2];
         u32 alet;
         blocknum_t block_number;
-        u64 buffer;
+        void *buffer;
 } __attribute__ ((packed, aligned(8)));
 
 struct dasd_diag_init_io {
@@ -104,7 +104,7 @@ struct dasd_diag_rw_io {
         u32 alet;
         u8  spare3[4];
         u64 interrupt_params;
-        u64 bio_list;
+        struct dasd_diag_bio *bio_list;
         u8  spare4[8];
 } __attribute__ ((packed, aligned(8)));
 #else /* CONFIG_ARCH_S390X */
@@ -119,7 +119,7 @@ struct dasd_diag_bio {
         u16 spare1;
         blocknum_t block_number;
         u32 alet;
-        u32 buffer;
+        void *buffer;
 } __attribute__ ((packed, aligned(8)));
 
 struct dasd_diag_init_io {
@@ -142,7 +142,7 @@ struct dasd_diag_rw_io {
         u8 spare2[2];
         u32 block_count;
         u32 alet;
-        u32 bio_list;
+        struct dasd_diag_bio *bio_list;
         u32 interrupt_params;
         u8 spare3[20];
 } __attribute__ ((packed, aligned(8)));