Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b9d3aed7 authored by Cornelia Huck's avatar Cornelia Huck Committed by Martin Schwidefsky
Browse files

[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: default avatarCornelia Huck <cornelia.huck@de.ibm.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
parent 1bf5b285

drivers/s390/char/raw3270.c

+2 −2
Original line number Diff line number Diff line
@@ -1171,7 +1171,7 @@ static int raw3270_create_attributes(struct raw3270 *rp) 
	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;
@@ -1180,7 +1180,7 @@ static int raw3270_create_attributes(struct raw3270 *rp) 
	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/cio/device.c

+1 −1
Original line number Diff line number Diff line
@@ -1526,7 +1526,7 @@ void ccw_device_set_notoper(struct ccw_device *cdev) 
	struct subchannel *sch = to_subchannel(cdev->dev.parent);



	CIO_TRACE_EVENT(2, "notoper");

	CIO_TRACE_EVENT(2, sch->dev.bus_id);

	CIO_TRACE_EVENT(2, dev_name(&sch->dev));

	ccw_device_set_timeout(cdev, 0);

	cio_disable_subchannel(sch);

	cdev->private->state = DEV_STATE_NOT_OPER;

drivers/s390/net/claw.c

+8 −5
Original line number Diff line number Diff line
@@ -2880,7 +2880,8 @@ claw_new_device(struct ccwgroup_device *cgdev) 
	int ret;

	struct ccw_dev_id dev_id;



	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;
@@ -2904,14 +2905,16 @@ claw_new_device(struct ccwgroup_device *cgdev) 
	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);
@@ -2987,7 +2990,7 @@ claw_shutdown_device(struct ccwgroup_device *cgdev) 
	struct net_device *ndev;

	int	ret;



	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;
@@ -3017,7 +3020,7 @@ claw_remove_device(struct ccwgroup_device *cgdev) 
	struct claw_privbk *priv;



	BUG_ON(!cgdev);

	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;

	BUG_ON(!priv);

	printk(KERN_INFO "claw: %s() called %s will be removed.\n",

drivers/s390/net/ctcm_main.c

+2 −2
Original line number Diff line number Diff line
@@ -1518,8 +1518,8 @@ static int ctcm_new_device(struct ccwgroup_device *cgdev) 


	type = get_channel_type(&cdev0->id);



	snprintf(read_id, CTCM_ID_SIZE, "ch-%s", cdev0->dev.bus_id);

	snprintf(write_id, CTCM_ID_SIZE, "ch-%s", cdev1->dev.bus_id);

	snprintf(read_id, CTCM_ID_SIZE, "ch-%s", dev_name(&cdev0->dev));

	snprintf(write_id, CTCM_ID_SIZE, "ch-%s", dev_name(&cdev1->dev));



	ret = add_channel(cdev0, type, priv);

	if (ret)

drivers/s390/scsi/zfcp_def.h

+1 −1
Original line number Diff line number Diff line
@@ -619,7 +619,7 @@ struct zfcp_fsf_req_qtcb { 
#define ZFCP_SET                0x00000100

#define ZFCP_CLEAR              0x00000200



#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))



/*

 * Helper functions for request ID management.