aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCornelia Huck <cornelia.huck@de.ibm.com>2008-10-10 15:33:11 -0400
committerMartin Schwidefsky <schwidefsky@de.ibm.com>2008-10-10 15:33:50 -0400
commitb9d3aed7e1e50183085fcd2af643bf42d6b4bd95 (patch)
tree0ae98b89d8c22d64e38694cce0ec713ef64b23de
parent1bf5b2853925cf92bfc5f0eddb68a8ed18782845 (diff)
[S390] more bus_id -> dev_name conversions
Some further bus_id -> dev_name() conversions in s390 code. Cc: Kay Sievers <kay.sievers@vrfy.org> Signed-off-by: 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>
-rw-r--r--drivers/s390/char/raw3270.c4
-rw-r--r--drivers/s390/cio/device.c2
-rw-r--r--drivers/s390/net/claw.c13
-rw-r--r--drivers/s390/net/ctcm_main.c4
-rw-r--r--drivers/s390/scsi/zfcp_def.h2
-rw-r--r--drivers/s390/scsi/zfcp_erp.c2
-rw-r--r--drivers/s390/scsi/zfcp_sysfs.c2
7 files changed, 16 insertions, 13 deletions
diff --git a/drivers/s390/char/raw3270.c b/drivers/s390/char/raw3270.c
index c3dee900a5c8..1792b2c0130e 100644
--- a/drivers/s390/char/raw3270.c
+++ b/drivers/s390/char/raw3270.c
@@ -1171,7 +1171,7 @@ static int raw3270_create_attributes(struct raw3270 *rp)
1171 rp->clttydev = device_create_drvdata(class3270, &rp->cdev->dev, 1171 rp->clttydev = device_create_drvdata(class3270, &rp->cdev->dev,
1172 MKDEV(IBM_TTY3270_MAJOR, rp->minor), 1172 MKDEV(IBM_TTY3270_MAJOR, rp->minor),
1173 NULL, 1173 NULL,
1174 "tty%s", rp->cdev->dev.bus_id); 1174 "tty%s", dev_name(&rp->cdev->dev));
1175 if (IS_ERR(rp->clttydev)) { 1175 if (IS_ERR(rp->clttydev)) {
1176 rc = PTR_ERR(rp->clttydev); 1176 rc = PTR_ERR(rp->clttydev);
1177 goto out_ttydev; 1177 goto out_ttydev;
@@ -1180,7 +1180,7 @@ static int raw3270_create_attributes(struct raw3270 *rp)
1180 rp->cltubdev = device_create_drvdata(class3270, &rp->cdev->dev, 1180 rp->cltubdev = device_create_drvdata(class3270, &rp->cdev->dev,
1181 MKDEV(IBM_FS3270_MAJOR, rp->minor), 1181 MKDEV(IBM_FS3270_MAJOR, rp->minor),
1182 NULL, 1182 NULL,
1183 "tub%s", rp->cdev->dev.bus_id); 1183 "tub%s", dev_name(&rp->cdev->dev));
1184 if (!IS_ERR(rp->cltubdev)) 1184 if (!IS_ERR(rp->cltubdev))
1185 goto out; 1185 goto out;
1186 1186
diff --git a/drivers/s390/cio/device.c b/drivers/s390/cio/device.c
index 95b92dfec5a8..a8e755a88b01 100644
--- a/drivers/s390/cio/device.c
+++ b/drivers/s390/cio/device.c
@@ -1526,7 +1526,7 @@ void ccw_device_set_notoper(struct ccw_device *cdev)
1526 struct subchannel *sch = to_subchannel(cdev->dev.parent); 1526 struct subchannel *sch = to_subchannel(cdev->dev.parent);
1527 1527
1528 CIO_TRACE_EVENT(2, "notoper"); 1528 CIO_TRACE_EVENT(2, "notoper");
1529 CIO_TRACE_EVENT(2, sch->dev.bus_id); 1529 CIO_TRACE_EVENT(2, dev_name(&sch->dev));
1530 ccw_device_set_timeout(cdev, 0); 1530 ccw_device_set_timeout(cdev, 0);
1531 cio_disable_subchannel(sch); 1531 cio_disable_subchannel(sch);
1532 cdev->private->state = DEV_STATE_NOT_OPER; 1532 cdev->private->state = DEV_STATE_NOT_OPER;
diff --git a/drivers/s390/net/claw.c b/drivers/s390/net/claw.c
index 26e95858a8f9..8f83fc994f50 100644
--- a/drivers/s390/net/claw.c
+++ b/drivers/s390/net/claw.c
@@ -2880,7 +2880,8 @@ claw_new_device(struct ccwgroup_device *cgdev)
2880 int ret; 2880 int ret;
2881 struct ccw_dev_id dev_id; 2881 struct ccw_dev_id dev_id;
2882 2882
2883 printk(KERN_INFO "claw: add for %s\n",cgdev->cdev[READ]->dev.bus_id); 2883 printk(KERN_INFO "claw: add for %s\n",
2884 dev_name(&cgdev->cdev[READ]->dev));
2884 CLAW_DBF_TEXT(2, setup, "new_dev"); 2885 CLAW_DBF_TEXT(2, setup, "new_dev");
2885 privptr = cgdev->dev.driver_data; 2886 privptr = cgdev->dev.driver_data;
2886 cgdev->cdev[READ]->dev.driver_data = privptr; 2887 cgdev->cdev[READ]->dev.driver_data = privptr;
@@ -2904,14 +2905,16 @@ claw_new_device(struct ccwgroup_device *cgdev)
2904 if (ret != 0) { 2905 if (ret != 0) {
2905 printk(KERN_WARNING 2906 printk(KERN_WARNING
2906 "claw: ccw_device_set_online %s READ failed " 2907 "claw: ccw_device_set_online %s READ failed "
2907 "with ret = %d\n",cgdev->cdev[READ]->dev.bus_id,ret); 2908 "with ret = %d\n", dev_name(&cgdev->cdev[READ]->dev),
2909 ret);
2908 goto out; 2910 goto out;
2909 } 2911 }
2910 ret = ccw_device_set_online(cgdev->cdev[WRITE]); 2912 ret = ccw_device_set_online(cgdev->cdev[WRITE]);
2911 if (ret != 0) { 2913 if (ret != 0) {
2912 printk(KERN_WARNING 2914 printk(KERN_WARNING
2913 "claw: ccw_device_set_online %s WRITE failed " 2915 "claw: ccw_device_set_online %s WRITE failed "
2914 "with ret = %d\n",cgdev->cdev[WRITE]->dev.bus_id, ret); 2916 "with ret = %d\n", dev_name(&cgdev->cdev[WRITE]->dev)
2917 ret);
2915 goto out; 2918 goto out;
2916 } 2919 }
2917 dev = alloc_netdev(0,"claw%d",claw_init_netdevice); 2920 dev = alloc_netdev(0,"claw%d",claw_init_netdevice);
@@ -2987,7 +2990,7 @@ claw_shutdown_device(struct ccwgroup_device *cgdev)
2987 struct net_device *ndev; 2990 struct net_device *ndev;
2988 int ret; 2991 int ret;
2989 2992
2990 CLAW_DBF_TEXT_(2, setup, "%s", cgdev->dev.bus_id); 2993 CLAW_DBF_TEXT_(2, setup, "%s", dev_name(&cgdev->dev));
2991 priv = cgdev->dev.driver_data; 2994 priv = cgdev->dev.driver_data;
2992 if (!priv) 2995 if (!priv)
2993 return -ENODEV; 2996 return -ENODEV;
@@ -3017,7 +3020,7 @@ claw_remove_device(struct ccwgroup_device *cgdev)
3017 struct claw_privbk *priv; 3020 struct claw_privbk *priv;
3018 3021
3019 BUG_ON(!cgdev); 3022 BUG_ON(!cgdev);
3020 CLAW_DBF_TEXT_(2, setup, "%s", cgdev->dev.bus_id); 3023 CLAW_DBF_TEXT_(2, setup, "%s", dev_name(&cgdev->dev));
3021 priv = cgdev->dev.driver_data; 3024 priv = cgdev->dev.driver_data;
3022 BUG_ON(!priv); 3025 BUG_ON(!priv);
3023 printk(KERN_INFO "claw: %s() called %s will be removed.\n", 3026 printk(KERN_INFO "claw: %s() called %s will be removed.\n",
diff --git a/drivers/s390/net/ctcm_main.c b/drivers/s390/net/ctcm_main.c
index d2374cf4c4b9..a4e29836a2aa 100644
--- a/drivers/s390/net/ctcm_main.c
+++ b/drivers/s390/net/ctcm_main.c
@@ -1518,8 +1518,8 @@ static int ctcm_new_device(struct ccwgroup_device *cgdev)
1518 1518
1519 type = get_channel_type(&cdev0->id); 1519 type = get_channel_type(&cdev0->id);
1520 1520
1521 snprintf(read_id, CTCM_ID_SIZE, "ch-%s", cdev0->dev.bus_id); 1521 snprintf(read_id, CTCM_ID_SIZE, "ch-%s", dev_name(&cdev0->dev));
1522 snprintf(write_id, CTCM_ID_SIZE, "ch-%s", cdev1->dev.bus_id); 1522 snprintf(write_id, CTCM_ID_SIZE, "ch-%s", dev_name(&cdev1->dev));
1523 1523
1524 ret = add_channel(cdev0, type, priv); 1524 ret = add_channel(cdev0, type, priv);
1525 if (ret) 1525 if (ret)
diff --git a/drivers/s390/scsi/zfcp_def.h b/drivers/s390/scsi/zfcp_def.h
index c69345f1f73c..8a13071c444c 100644
--- a/drivers/s390/scsi/zfcp_def.h
+++ b/drivers/s390/scsi/zfcp_def.h
@@ -619,7 +619,7 @@ struct zfcp_fsf_req_qtcb {
619#define ZFCP_SET 0x00000100 619#define ZFCP_SET 0x00000100
620#define ZFCP_CLEAR 0x00000200 620#define ZFCP_CLEAR 0x00000200
621 621
622#define zfcp_get_busid_by_adapter(adapter) (adapter->ccw_device->dev.bus_id) 622#define zfcp_get_busid_by_adapter(adapter) (dev_name(&adapter->ccw_device->dev))
623 623
624/* 624/*
625 * Helper functions for request ID management. 625 * Helper functions for request ID management.
diff --git a/drivers/s390/scsi/zfcp_erp.c b/drivers/s390/scsi/zfcp_erp.c
index 782313131870..9040f738ff33 100644
--- a/drivers/s390/scsi/zfcp_erp.c
+++ b/drivers/s390/scsi/zfcp_erp.c
@@ -1376,7 +1376,7 @@ static int zfcp_erp_thread(void *data)
1376 struct zfcp_erp_action *act; 1376 struct zfcp_erp_action *act;
1377 unsigned long flags; 1377 unsigned long flags;
1378 1378
1379 daemonize("zfcperp%s", adapter->ccw_device->dev.bus_id); 1379 daemonize("zfcperp%s", dev_name(&adapter->ccw_device->dev));
1380 /* Block all signals */ 1380 /* Block all signals */
1381 siginitsetinv(&current->blocked, 0); 1381 siginitsetinv(&current->blocked, 0);
1382 atomic_set_mask(ZFCP_STATUS_ADAPTER_ERP_THREAD_UP, &adapter->status); 1382 atomic_set_mask(ZFCP_STATUS_ADAPTER_ERP_THREAD_UP, &adapter->status);
diff --git a/drivers/s390/scsi/zfcp_sysfs.c b/drivers/s390/scsi/zfcp_sysfs.c
index 2809d789b55c..ca9293ba1766 100644
--- a/drivers/s390/scsi/zfcp_sysfs.c
+++ b/drivers/s390/scsi/zfcp_sysfs.c
@@ -381,7 +381,7 @@ static ssize_t zfcp_sysfs_scsi_##_name##_show(struct device *dev, \
381static DEVICE_ATTR(_name, S_IRUGO, zfcp_sysfs_scsi_##_name##_show, NULL); 381static DEVICE_ATTR(_name, S_IRUGO, zfcp_sysfs_scsi_##_name##_show, NULL);
382 382
383ZFCP_DEFINE_SCSI_ATTR(hba_id, "%s\n", 383ZFCP_DEFINE_SCSI_ATTR(hba_id, "%s\n",
384 unit->port->adapter->ccw_device->dev.bus_id); 384 dev_name(&unit->port->adapter->ccw_device->dev));
385ZFCP_DEFINE_SCSI_ATTR(wwpn, "0x%016llx\n", 385ZFCP_DEFINE_SCSI_ATTR(wwpn, "0x%016llx\n",
386 (unsigned long long) unit->port->wwpn); 386 (unsigned long long) unit->port->wwpn);
387ZFCP_DEFINE_SCSI_ATTR(fcp_lun, "0x%016llx\n", 387ZFCP_DEFINE_SCSI_ATTR(fcp_lun, "0x%016llx\n",