hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[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>
This commit is contained in:
Cornelia Huck 2008-10-10 21:33:11 +02:00 committed by Martin Schwidefsky
parent 1bf5b28539
commit b9d3aed7e1
7 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/s390/char/raw3270.c
View File

@ -1171,7 +1171,7 @@ static int raw3270_create_attributes(struct raw3270 *rp)
rp->clttydev = device_create_drvdata(class3270, &rp->cdev->dev, rp->clttydev = device_create_drvdata(class3270, &rp->cdev->dev,
MKDEV(IBM_TTY3270_MAJOR, rp->minor), MKDEV(IBM_TTY3270_MAJOR, rp->minor),
NULL, NULL,
"tty%s", rp->cdev->dev.bus_id); "tty%s", dev_name(&rp->cdev->dev));
if (IS_ERR(rp->clttydev)) { if (IS_ERR(rp->clttydev)) {
rc = PTR_ERR(rp->clttydev); rc = PTR_ERR(rp->clttydev);
goto out_ttydev; goto out_ttydev;
@ -1180,7 +1180,7 @@ static int raw3270_create_attributes(struct raw3270 *rp)
rp->cltubdev = device_create_drvdata(class3270, &rp->cdev->dev, rp->cltubdev = device_create_drvdata(class3270, &rp->cdev->dev,
MKDEV(IBM_FS3270_MAJOR, rp->minor), MKDEV(IBM_FS3270_MAJOR, rp->minor),
NULL, NULL,
"tub%s", rp->cdev->dev.bus_id); "tub%s", dev_name(&rp->cdev->dev));
if (!IS_ERR(rp->cltubdev)) if (!IS_ERR(rp->cltubdev))
goto out; goto out;

2
drivers/s390/cio/device.c
View File

@ -1526,7 +1526,7 @@ void ccw_device_set_notoper(struct ccw_device *cdev)
struct subchannel *sch = to_subchannel(cdev->dev.parent); struct subchannel *sch = to_subchannel(cdev->dev.parent);
CIO_TRACE_EVENT(2, "notoper"); 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); ccw_device_set_timeout(cdev, 0);
cio_disable_subchannel(sch); cio_disable_subchannel(sch);
cdev->private->state = DEV_STATE_NOT_OPER; cdev->private->state = DEV_STATE_NOT_OPER;

13
drivers/s390/net/claw.c
View File

@ -2880,7 +2880,8 @@ claw_new_device(struct ccwgroup_device *cgdev)
int ret; int ret;
struct ccw_dev_id dev_id; 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"); CLAW_DBF_TEXT(2, setup, "new_dev");
privptr = cgdev->dev.driver_data; privptr = cgdev->dev.driver_data;
cgdev->cdev[READ]->dev.driver_data = privptr; cgdev->cdev[READ]->dev.driver_data = privptr;
@ -2904,14 +2905,16 @@ claw_new_device(struct ccwgroup_device *cgdev)
if (ret != 0) { if (ret != 0) {
printk(KERN_WARNING printk(KERN_WARNING
"claw: ccw_device_set_online %s READ failed " "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; goto out;
} }
ret = ccw_device_set_online(cgdev->cdev[WRITE]); ret = ccw_device_set_online(cgdev->cdev[WRITE]);
if (ret != 0) { if (ret != 0) {
printk(KERN_WARNING printk(KERN_WARNING
"claw: ccw_device_set_online %s WRITE failed " "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; goto out;
} }
dev = alloc_netdev(0,"claw%d",claw_init_netdevice); dev = alloc_netdev(0,"claw%d",claw_init_netdevice);
@ -2987,7 +2990,7 @@ claw_shutdown_device(struct ccwgroup_device *cgdev)
struct net_device *ndev; struct net_device *ndev;
int ret; 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; priv = cgdev->dev.driver_data;
if (!priv) if (!priv)
return -ENODEV; return -ENODEV;
@ -3017,7 +3020,7 @@ claw_remove_device(struct ccwgroup_device *cgdev)
struct claw_privbk *priv; struct claw_privbk *priv;
BUG_ON(!cgdev); 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; priv = cgdev->dev.driver_data;
BUG_ON(!priv); BUG_ON(!priv);
printk(KERN_INFO "claw: %s() called %s will be removed.\n", printk(KERN_INFO "claw: %s() called %s will be removed.\n",

4
drivers/s390/net/ctcm_main.c
View File

@ -1518,8 +1518,8 @@ static int ctcm_new_device(struct ccwgroup_device *cgdev)
type = get_channel_type(&cdev0->id); type = get_channel_type(&cdev0->id);
snprintf(read_id, CTCM_ID_SIZE, "ch-%s", cdev0->dev.bus_id); snprintf(read_id, CTCM_ID_SIZE, "ch-%s", dev_name(&cdev0->dev));
snprintf(write_id, CTCM_ID_SIZE, "ch-%s", cdev1->dev.bus_id); snprintf(write_id, CTCM_ID_SIZE, "ch-%s", dev_name(&cdev1->dev));
ret = add_channel(cdev0, type, priv); ret = add_channel(cdev0, type, priv);
if (ret) if (ret)

2
drivers/s390/scsi/zfcp_def.h
View File

@ -619,7 +619,7 @@ struct zfcp_fsf_req_qtcb {
#define ZFCP_SET 0x00000100 #define ZFCP_SET 0x00000100
#define ZFCP_CLEAR 0x00000200 #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. * Helper functions for request ID management.

2
drivers/s390/scsi/zfcp_erp.c
View File

@ -1376,7 +1376,7 @@ static int zfcp_erp_thread(void *data)
struct zfcp_erp_action *act; struct zfcp_erp_action *act;
unsigned long flags; unsigned long flags;
daemonize("zfcperp%s", adapter->ccw_device->dev.bus_id); daemonize("zfcperp%s", dev_name(&adapter->ccw_device->dev));
/* Block all signals */ /* Block all signals */
siginitsetinv(&current->blocked, 0); siginitsetinv(&current->blocked, 0);
atomic_set_mask(ZFCP_STATUS_ADAPTER_ERP_THREAD_UP, &adapter->status); atomic_set_mask(ZFCP_STATUS_ADAPTER_ERP_THREAD_UP, &adapter->status);

2
drivers/s390/scsi/zfcp_sysfs.c
View File

@ -381,7 +381,7 @@ static ssize_t zfcp_sysfs_scsi_##_name##_show(struct device *dev, \
static DEVICE_ATTR(_name, S_IRUGO, zfcp_sysfs_scsi_##_name##_show, NULL); static DEVICE_ATTR(_name, S_IRUGO, zfcp_sysfs_scsi_##_name##_show, NULL);
ZFCP_DEFINE_SCSI_ATTR(hba_id, "%s\n", ZFCP_DEFINE_SCSI_ATTR(hba_id, "%s\n",
unit->port->adapter->ccw_device->dev.bus_id); dev_name(&unit->port->adapter->ccw_device->dev));
ZFCP_DEFINE_SCSI_ATTR(wwpn, "0x%016llx\n", ZFCP_DEFINE_SCSI_ATTR(wwpn, "0x%016llx\n",
(unsigned long long) unit->port->wwpn); (unsigned long long) unit->port->wwpn);
ZFCP_DEFINE_SCSI_ATTR(fcp_lun, "0x%016llx\n", ZFCP_DEFINE_SCSI_ATTR(fcp_lun, "0x%016llx\n",