diff options
author | Kay Sievers <kay.sievers@vrfy.org> | 2008-10-10 15:33:09 -0400 |
---|---|---|
committer | Martin Schwidefsky <schwidefsky@de.ibm.com> | 2008-10-10 15:33:49 -0400 |
commit | 2a0217d5c7d22d6dd28f8ae5d20b06d24dc426b8 (patch) | |
tree | 0a7d60ac06dbc234d48da5a5b2ce8fa186a20182 /drivers/s390/block/dasd_int.h | |
parent | e4a1afaeb1d9ebc09f46d8b229ac96116974b1b8 (diff) |
[S390] bus_id -> dev_name conversions
bus_id -> dev_name() conversions in s390 code.
[cornelia.huck@de.ibm.com: minor adaptions]
Signed-off-by: Kay Sievers <kay.sievers@vrfy.org>
Cc: Cornelia Huck <cornelia.huck@de.ibm.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Diffstat (limited to 'drivers/s390/block/dasd_int.h')
-rw-r--r-- | drivers/s390/block/dasd_int.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/s390/block/dasd_int.h b/drivers/s390/block/dasd_int.h index 31ecaa4a40e4..489d5fe488fb 100644 --- a/drivers/s390/block/dasd_int.h +++ b/drivers/s390/block/dasd_int.h | |||
@@ -126,7 +126,7 @@ do { \ | |||
126 | #define DEV_MESSAGE(d_loglevel,d_device,d_string,d_args...)\ | 126 | #define DEV_MESSAGE(d_loglevel,d_device,d_string,d_args...)\ |
127 | do { \ | 127 | do { \ |
128 | printk(d_loglevel PRINTK_HEADER " %s: " d_string "\n", \ | 128 | printk(d_loglevel PRINTK_HEADER " %s: " d_string "\n", \ |
129 | d_device->cdev->dev.bus_id, d_args); \ | 129 | dev_name(&d_device->cdev->dev), d_args); \ |
130 | DBF_DEV_EVENT(DBF_ALERT, d_device, d_string, d_args); \ | 130 | DBF_DEV_EVENT(DBF_ALERT, d_device, d_string, d_args); \ |
131 | } while(0) | 131 | } while(0) |
132 | 132 | ||
@@ -140,7 +140,7 @@ do { \ | |||
140 | #define DEV_MESSAGE_LOG(d_loglevel,d_device,d_string,d_args...)\ | 140 | #define DEV_MESSAGE_LOG(d_loglevel,d_device,d_string,d_args...)\ |
141 | do { \ | 141 | do { \ |
142 | printk(d_loglevel PRINTK_HEADER " %s: " d_string "\n", \ | 142 | printk(d_loglevel PRINTK_HEADER " %s: " d_string "\n", \ |
143 | d_device->cdev->dev.bus_id, d_args); \ | 143 | dev_name(&d_device->cdev->dev), d_args); \ |
144 | } while(0) | 144 | } while(0) |
145 | 145 | ||
146 | #define MESSAGE_LOG(d_loglevel,d_string,d_args...)\ | 146 | #define MESSAGE_LOG(d_loglevel,d_string,d_args...)\ |