[S390] dasd: remove strings from s390dbf

Remove strings from s390 debugfeature entries that could lead to a
crash when the data is read from dbf because the strings do not exist
any more.

Signed-off-by: Stefan Haberland <stefan.haberland@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>

1 files changed, 4 insertions, 6 deletions

diff --git a/drivers/s390/block/dasd_fba.c b/drivers/s390/block/dasd_fba.c
index d1a07e4c0e78..0f152444ac77 100644
--- a/drivers/s390/block/dasd_fba.c
+++ b/drivers/s390/block/dasd_fba.c
@@ -140,9 +140,8 @@ dasd_fba_check_characteristics(struct dasd_device *device)
         }
         block = dasd_alloc_block();
         if (IS_ERR(block)) {
-                DBF_EVENT(DBF_WARNING, "could not allocate dasd block "
-                          "structure for device: %s",
-                          dev_name(&device->cdev->dev));
+                DBF_EVENT_DEVID(DBF_WARNING, cdev, "%s", "could not allocate "
+                                "dasd block structure");
                 device->private = NULL;
                 kfree(private);
                 return PTR_ERR(block);
@@ -154,9 +153,8 @@ dasd_fba_check_characteristics(struct dasd_device *device)
         rc = dasd_generic_read_dev_chars(device, DASD_FBA_MAGIC,
                                          &private->rdc_data, 32);
         if (rc) {
-                DBF_EVENT(DBF_WARNING, "Read device characteristics returned "
-                          "error %d for device: %s",
-                          rc, dev_name(&device->cdev->dev));
+                DBF_EVENT_DEVID(DBF_WARNING, cdev, "Read device "
+                                "characteristics returned error %d", rc);
                 device->block = NULL;
                 dasd_free_block(block);
                 device->private = NULL;