[S390] bus_id -> dev_name conversions

[linux-2.6-omap-h63xx.git] / drivers / s390 / block / dasd_int.h

diff --git a/drivers/s390/block/dasd_int.h b/drivers/s390/block/dasd_int.h
index fb2f931cf8441d66c0fab05806c8f218f63d5308..489d5fe488fb7d60616caebf36e78360ec4cfdd8 100644 (file)
--- a/drivers/s390/block/dasd_int.h
+++ b/drivers/s390/block/dasd_int.h
@@ -126,7 +126,7 @@ do { \
 #define DEV_MESSAGE(d_loglevel,d_device,d_string,d_args...)\
 do { \
        printk(d_loglevel PRINTK_HEADER " %s: " d_string "\n", \
-              d_device->cdev->dev.bus_id, d_args); \
+              dev_name(&d_device->cdev->dev), d_args); \
        DBF_DEV_EVENT(DBF_ALERT, d_device, d_string, d_args); \
 } while(0)
 
@@ -140,7 +140,7 @@ do { \
 #define DEV_MESSAGE_LOG(d_loglevel,d_device,d_string,d_args...)\
 do { \
        printk(d_loglevel PRINTK_HEADER " %s: " d_string "\n", \
-              d_device->cdev->dev.bus_id, d_args); \
+              dev_name(&d_device->cdev->dev), d_args); \
 } while(0)
 
 #define MESSAGE_LOG(d_loglevel,d_string,d_args...)\
@@ -307,6 +307,7 @@ struct dasd_uid {
        __u16 ssid;
        __u8 real_unit_addr;
        __u8 base_unit_addr;
+       char vduit[33];
 };
 
 /*