aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/s390/cio/css.c
diff options
context:
space:
mode:
authorCornelia Huck <cornelia.huck@de.ibm.com>2008-10-10 21:33:10 +0200
committerMartin Schwidefsky <schwidefsky@de.ibm.com>2008-10-10 21:33:50 +0200
commit1bf5b2853925cf92bfc5f0eddb68a8ed18782845 (patch)
treeacc51c9017ea2c8f155be805f49cfe68a23c6a9b /drivers/s390/cio/css.c
parent2a0217d5c7d22d6dd28f8ae5d20b06d24dc426b8 (diff)
downloadkernel_samsung_smdk4412-1bf5b2853925cf92bfc5f0eddb68a8ed18782845.zip
kernel_samsung_smdk4412-1bf5b2853925cf92bfc5f0eddb68a8ed18782845.tar.gz
kernel_samsung_smdk4412-1bf5b2853925cf92bfc5f0eddb68a8ed18782845.tar.bz2
[S390] bus_id -> dev_set_name() changes
Convert most s390 users setting bus_id to dev_set_name(). css and ccw busses are deferred since they need some special treatment. 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>
Diffstat (limited to 'drivers/s390/cio/css.c')
-rw-r--r--drivers/s390/cio/css.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/s390/cio/css.c b/drivers/s390/cio/css.c
index 1261e1a..76bbb1e 100644
--- a/drivers/s390/cio/css.c
+++ b/drivers/s390/cio/css.c
@@ -698,7 +698,7 @@ static int __init setup_css(int nr)
return -ENOMEM;
css->pseudo_subchannel->dev.parent = &css->device;
css->pseudo_subchannel->dev.release = css_subchannel_release;
- sprintf(css->pseudo_subchannel->dev.bus_id, "defunct");
+ dev_set_name(&css->pseudo_subchannel->dev, "defunct");
ret = cio_create_sch_lock(css->pseudo_subchannel);
if (ret) {
kfree(css->pseudo_subchannel);
@@ -707,7 +707,7 @@ static int __init setup_css(int nr)
mutex_init(&css->mutex);
css->valid = 1;
css->cssid = nr;
- sprintf(css->device.bus_id, "css%x", nr);
+ dev_set_name(&css->device, "css%x", nr);
css->device.release = channel_subsystem_release;
tod_high = (u32) (get_clock() >> 32);
css_generate_pgid(css, tod_high);