[S390] struct device - replace bus_id with dev_name(), dev_set_name()

Acked-by: Cornelia Huck <cornelia.huck@de.ibm.com>
Acked-by: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: Kay Sievers <kay.sievers@vrfy.org>
Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>

1 files changed, 4 insertions, 2 deletions

diff --git a/drivers/s390/scsi/zfcp_aux.c b/drivers/s390/scsi/zfcp_aux.c
index fc4a28953824..f140b46df12a 100644
--- a/drivers/s390/scsi/zfcp_aux.c
+++ b/drivers/s390/scsi/zfcp_aux.c
@@ -29,6 +29,8 @@
 #include <linux/seq_file.h>
 #include "zfcp_ext.h"
 
+#define ZFCP_BUS_ID_SIZE        20
+
 static char *device;
 
 MODULE_AUTHOR("IBM Deutschland Entwicklung GmbH - linux390@de.ibm.com");
@@ -84,9 +86,9 @@ static int __init zfcp_device_setup(char *devstr)
         strcpy(str, devstr);
 
         token = strsep(&str, ",");
-        if (!token || strlen(token) >= BUS_ID_SIZE)
+        if (!token || strlen(token) >= ZFCP_BUS_ID_SIZE)
                 goto err_out;
-        strncpy(zfcp_data.init_busid, token, BUS_ID_SIZE);
+        strncpy(zfcp_data.init_busid, token, ZFCP_BUS_ID_SIZE);
 
         token = strsep(&str, ",");
         if (!token || strict_strtoull(token, 0,