s390: more bus_id -> dev_name conversions

PATCH In review Greg KH 1 participant 1 message Jul 2, 2008

Subsystems (4)

Network drivers s390 s390 network drivers s390 zfcp driver

lore

Share & tools

lore

Greg KH

author

2008-07-02 15:49 UTC #0 lore raw

PATCH 3/4 s390: more bus_id -> dev_name conversions

From: Cornelia Huck <[email protected]>

Some further bus_id -> dev_name() conversions in s390 code.

Cc Kay Sievers <[email protected]>

Signed-off-by Cornelia Huck <[email protected]>

Signed-off-by Greg Kroah-Hartman <[email protected]>

---
 drivers/s390/char/raw3270.c  |    4 ++--
 drivers/s390/net/claw.c      |   20 +++++++++++---------
 drivers/s390/net/ctcm_main.c |    6 ++++--
 drivers/s390/scsi/zfcp_def.h |    2 +-
 4 files changed, 18 insertions(+), 14 deletions(-)

drivers/s390/char/raw3270.c +2 -2

@@ -1181,7 +1181,7 @@ static int raw3270_create_attributes(str
 	rp->clttydev = device_create_drvdata(class3270, &rp->cdev->dev,
 					     MKDEV(IBM_TTY3270_MAJOR, rp->minor),
 					     NULL,
-					     "tty%s", rp->cdev->dev.bus_id);
+					     "tty%s", dev_name(&rp->cdev->dev));
 	if (IS_ERR(rp->clttydev)) {
 		rc = PTR_ERR(rp->clttydev);
 		goto out_ttydev;

@@ -1190,7 +1190,7 @@ static int raw3270_create_attributes(str
 	rp->cltubdev = device_create_drvdata(class3270, &rp->cdev->dev,
 					     MKDEV(IBM_FS3270_MAJOR, rp->minor),
 					     NULL,
-					     "tub%s", rp->cdev->dev.bus_id);
+					     "tub%s", dev_name(&rp->cdev->dev));
 	if (!IS_ERR(rp->cltubdev))
 		goto out;

drivers/s390/net/claw.c +11 -9

@@ -323,7 +323,7 @@ claw_probe(struct ccwgroup_device *cgdev
                 probe_error(cgdev);
 		put_device(&cgdev->dev);
 		printk(KERN_WARNING "Out of memory %s %s Exit Line %d \n",
-			cgdev->cdev[0]->dev.bus_id,__func__,__LINE__);
+		       dev_name(&cgdev->cdev[0]->dev),__func__,__LINE__);
 		CLAW_DBF_TEXT_(2,setup,"probex%d",-ENOMEM);
                 return -ENOMEM;
         }

@@ -340,11 +340,12 @@ claw_probe(struct ccwgroup_device *cgdev
 		probe_error(cgdev);
 		put_device(&cgdev->dev);
 		printk(KERN_WARNING "add_files failed %s %s Exit Line %d \n",
-			cgdev->cdev[0]->dev.bus_id,__func__,__LINE__);
+		       dev_name(&cgdev->cdev[0]->dev),__func__,__LINE__);
 		CLAW_DBF_TEXT_(2,setup,"probex%d",rc);
 		return rc;
 	}
-	printk(KERN_INFO "claw: sysfs files added for %s\n",cgdev->cdev[0]->dev.bus_id);
+	printk(KERN_INFO "claw: sysfs files added for %s\n",
+	       dev_name(&cgdev->cdev[0]->dev));
 	privptr->p_env->p_priv = privptr;
         cgdev->cdev[0]->handler = claw_irq_handler;
 	cgdev->cdev[1]->handler = claw_irq_handler;

@@ -3953,7 +3954,8 @@ claw_new_device(struct ccwgroup_device *
 	struct ccw_dev_id dev_id;
 
 	pr_debug("%s() called\n", __func__);
-	printk(KERN_INFO "claw: add for %s\n",cgdev->cdev[READ]->dev.bus_id);
+	printk(KERN_INFO "claw: add for %s\n",
+	       dev_name(&cgdev->cdev[READ]->dev));
 	CLAW_DBF_TEXT(2,setup,"new_dev");
 	privptr = cgdev->dev.driver_data;
 	cgdev->cdev[READ]->dev.driver_data = privptr;

@@ -3978,14 +3980,14 @@ claw_new_device(struct ccwgroup_device *
 	if (ret != 0) {
 		printk(KERN_WARNING
 		 "claw: ccw_device_set_online %s READ failed "
-			"with ret = %d\n",cgdev->cdev[READ]->dev.bus_id,ret);
+		 "with ret = %d\n", dev_name(&cgdev->cdev[READ]->dev),ret);
 		goto out;
 	}
 	ret = ccw_device_set_online(cgdev->cdev[WRITE]);
 	if (ret != 0) {
 		printk(KERN_WARNING
 		 "claw: ccw_device_set_online %s WRITE failed "
-			"with ret = %d\n",cgdev->cdev[WRITE]->dev.bus_id, ret);
+		  "with ret = %d\n", dev_name(&cgdev->cdev[WRITE]->dev), ret);
 		goto out;
 	}
 	dev = alloc_netdev(0,"claw%d",claw_init_netdevice);

@@ -4066,7 +4068,7 @@ claw_shutdown_device(struct ccwgroup_dev
 	int	ret;
 
 	pr_debug("%s() called\n", __func__);
-	CLAW_DBF_TEXT_(2,setup,"%s",cgdev->dev.bus_id);
+	CLAW_DBF_TEXT_(2,setup,"%s", dev_name(&cgdev->dev));
 	priv = cgdev->dev.driver_data;
 	if (!priv)
 		return -ENODEV;

@@ -4096,14 +4098,14 @@ claw_remove_device(struct ccwgroup_devic
 	struct claw_privbk *priv;
 
 	pr_debug("%s() called\n", __func__);
-	CLAW_DBF_TEXT_(2,setup,"%s",cgdev->dev.bus_id);
+	CLAW_DBF_TEXT_(2,setup,"%s", dev_name(&cgdev->dev));
 	priv = cgdev->dev.driver_data;
 	if (!priv) {
 		printk(KERN_WARNING "claw: %s() no Priv exiting\n",__func__);
 		return;
 	}
 	printk(KERN_INFO "claw: %s() called %s will be removed.\n",
-			__func__,cgdev->cdev[0]->dev.bus_id);
+	       __func__, dev_name(&cgdev->cdev[0]->dev));
 	if (cgdev->state == CCWGROUP_ONLINE)
 		claw_shutdown_device(cgdev);
 	claw_remove_files(&cgdev->dev);

drivers/s390/net/ctcm_main.c +4 -2

@@ -1550,8 +1550,10 @@ static int ctcm_new_device(struct ccwgro
 
 	type = get_channel_type(&cgdev->cdev[0]->id);
 
-	snprintf(read_id, CTCM_ID_SIZE, "ch-%s", cgdev->cdev[0]->dev.bus_id);
-	snprintf(write_id, CTCM_ID_SIZE, "ch-%s", cgdev->cdev[1]->dev.bus_id);
+	snprintf(read_id, CTCM_ID_SIZE, "ch-%s",
+		 dev_name(&cgdev->cdev[0]->dev));
+	snprintf(write_id, CTCM_ID_SIZE, "ch-%s",
+		 dev_name(&cgdev->cdev[1]->dev));
 
 	ret = add_channel(cgdev->cdev[0], type, priv);
 	if (ret)

drivers/s390/scsi/zfcp_def.h +1 -1

@@ -922,7 +922,7 @@ extern void _zfcp_hex_dump(char *, int);
 			_zfcp_hex_dump(addr, count); \
 		}
 
-#define zfcp_get_busid_by_adapter(adapter) (adapter->ccw_device->dev.bus_id)
+#define zfcp_get_busid_by_adapter(adapter) (dev_name(&adapter->ccw_device->dev))
 #define zfcp_get_busid_by_port(port) (zfcp_get_busid_by_adapter(port->adapter))
 #define zfcp_get_busid_by_unit(unit) (zfcp_get_busid_by_port(unit->port))