diff options
author | Kay Sievers <kay.sievers@vrfy.org> | 2008-12-25 07:38:55 -0500 |
---|---|---|
committer | Martin Schwidefsky <schwidefsky@de.ibm.com> | 2008-12-25 07:39:03 -0500 |
commit | 98df67b324a2a986987ce29986e44ae9156b6698 (patch) | |
tree | 13cd3c37116c115761c54184cdd8e41e164a6c84 /drivers/s390/scsi/zfcp_aux.c | |
parent | 0cd4bd4754d51bdc8f9cd880c29910d0d52337bb (diff) |
[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>
Diffstat (limited to 'drivers/s390/scsi/zfcp_aux.c')
-rw-r--r-- | drivers/s390/scsi/zfcp_aux.c | 6 |
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 @@ | |||
29 | #include <linux/seq_file.h> | 29 | #include <linux/seq_file.h> |
30 | #include "zfcp_ext.h" | 30 | #include "zfcp_ext.h" |
31 | 31 | ||
32 | #define ZFCP_BUS_ID_SIZE 20 | ||
33 | |||
32 | static char *device; | 34 | static char *device; |
33 | 35 | ||
34 | MODULE_AUTHOR("IBM Deutschland Entwicklung GmbH - linux390@de.ibm.com"); | 36 | MODULE_AUTHOR("IBM Deutschland Entwicklung GmbH - linux390@de.ibm.com"); |
@@ -84,9 +86,9 @@ static int __init zfcp_device_setup(char *devstr) | |||
84 | strcpy(str, devstr); | 86 | strcpy(str, devstr); |
85 | 87 | ||
86 | token = strsep(&str, ","); | 88 | token = strsep(&str, ","); |
87 | if (!token || strlen(token) >= BUS_ID_SIZE) | 89 | if (!token || strlen(token) >= ZFCP_BUS_ID_SIZE) |
88 | goto err_out; | 90 | goto err_out; |
89 | strncpy(zfcp_data.init_busid, token, BUS_ID_SIZE); | 91 | strncpy(zfcp_data.init_busid, token, ZFCP_BUS_ID_SIZE); |
90 | 92 | ||
91 | token = strsep(&str, ","); | 93 | token = strsep(&str, ","); |
92 | if (!token || strict_strtoull(token, 0, | 94 | if (!token || strict_strtoull(token, 0, |