aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/s390/cio/cio.c
diff options
context:
space:
mode:
authorKay Sievers <kay.sievers@vrfy.org>2008-10-10 15:33:09 -0400
committerMartin Schwidefsky <schwidefsky@de.ibm.com>2008-10-10 15:33:49 -0400
commit2a0217d5c7d22d6dd28f8ae5d20b06d24dc426b8 (patch)
tree0a7d60ac06dbc234d48da5a5b2ce8fa186a20182 /drivers/s390/cio/cio.c
parente4a1afaeb1d9ebc09f46d8b229ac96116974b1b8 (diff)
[S390] bus_id -> dev_name conversions
bus_id -> dev_name() conversions in s390 code. [cornelia.huck@de.ibm.com: minor adaptions] Signed-off-by: Kay Sievers <kay.sievers@vrfy.org> Cc: 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/cio.c')
-rw-r--r--drivers/s390/cio/cio.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/drivers/s390/cio/cio.c b/drivers/s390/cio/cio.c
index 326f4cc7f92c..8759912734e0 100644
--- a/drivers/s390/cio/cio.c
+++ b/drivers/s390/cio/cio.c
@@ -153,7 +153,7 @@ cio_start_handle_notoper(struct subchannel *sch, __u8 lpm)
153 CIO_MSG_EVENT(2, "cio_start: 'not oper' status for " 153 CIO_MSG_EVENT(2, "cio_start: 'not oper' status for "
154 "subchannel 0.%x.%04x!\n", sch->schid.ssid, 154 "subchannel 0.%x.%04x!\n", sch->schid.ssid,
155 sch->schid.sch_no); 155 sch->schid.sch_no);
156 sprintf(dbf_text, "no%s", sch->dev.bus_id); 156 sprintf(dbf_text, "no%s", dev_name(&sch->dev));
157 CIO_TRACE_EVENT(0, dbf_text); 157 CIO_TRACE_EVENT(0, dbf_text);
158 CIO_HEX_EVENT(0, &sch->schib, sizeof (struct schib)); 158 CIO_HEX_EVENT(0, &sch->schib, sizeof (struct schib));
159 159
@@ -171,7 +171,7 @@ cio_start_key (struct subchannel *sch, /* subchannel structure */
171 union orb *orb; 171 union orb *orb;
172 172
173 CIO_TRACE_EVENT(4, "stIO"); 173 CIO_TRACE_EVENT(4, "stIO");
174 CIO_TRACE_EVENT(4, sch->dev.bus_id); 174 CIO_TRACE_EVENT(4, dev_name(&sch->dev));
175 175
176 orb = &to_io_private(sch)->orb; 176 orb = &to_io_private(sch)->orb;
177 memset(orb, 0, sizeof(union orb)); 177 memset(orb, 0, sizeof(union orb));
@@ -232,7 +232,7 @@ cio_resume (struct subchannel *sch)
232 int ccode; 232 int ccode;
233 233
234 CIO_TRACE_EVENT (4, "resIO"); 234 CIO_TRACE_EVENT (4, "resIO");
235 CIO_TRACE_EVENT (4, sch->dev.bus_id); 235 CIO_TRACE_EVENT(4, dev_name(&sch->dev));
236 236
237 ccode = rsch (sch->schid); 237 ccode = rsch (sch->schid);
238 238
@@ -269,7 +269,7 @@ cio_halt(struct subchannel *sch)
269 return -ENODEV; 269 return -ENODEV;
270 270
271 CIO_TRACE_EVENT (2, "haltIO"); 271 CIO_TRACE_EVENT (2, "haltIO");
272 CIO_TRACE_EVENT (2, sch->dev.bus_id); 272 CIO_TRACE_EVENT(2, dev_name(&sch->dev));
273 273
274 /* 274 /*
275 * Issue "Halt subchannel" and process condition code 275 * Issue "Halt subchannel" and process condition code
@@ -304,7 +304,7 @@ cio_clear(struct subchannel *sch)
304 return -ENODEV; 304 return -ENODEV;
305 305
306 CIO_TRACE_EVENT (2, "clearIO"); 306 CIO_TRACE_EVENT (2, "clearIO");
307 CIO_TRACE_EVENT (2, sch->dev.bus_id); 307 CIO_TRACE_EVENT(2, dev_name(&sch->dev));
308 308
309 /* 309 /*
310 * Issue "Clear subchannel" and process condition code 310 * Issue "Clear subchannel" and process condition code
@@ -340,7 +340,7 @@ cio_cancel (struct subchannel *sch)
340 return -ENODEV; 340 return -ENODEV;
341 341
342 CIO_TRACE_EVENT (2, "cancelIO"); 342 CIO_TRACE_EVENT (2, "cancelIO");
343 CIO_TRACE_EVENT (2, sch->dev.bus_id); 343 CIO_TRACE_EVENT(2, dev_name(&sch->dev));
344 344
345 ccode = xsch (sch->schid); 345 ccode = xsch (sch->schid);
346 346
@@ -404,7 +404,7 @@ int cio_enable_subchannel(struct subchannel *sch, u32 intparm)
404 int ret; 404 int ret;
405 405
406 CIO_TRACE_EVENT (2, "ensch"); 406 CIO_TRACE_EVENT (2, "ensch");
407 CIO_TRACE_EVENT (2, sch->dev.bus_id); 407 CIO_TRACE_EVENT(2, dev_name(&sch->dev));
408 408
409 if (sch_is_pseudo_sch(sch)) 409 if (sch_is_pseudo_sch(sch))
410 return -EINVAL; 410 return -EINVAL;
@@ -454,7 +454,7 @@ int cio_disable_subchannel(struct subchannel *sch)
454 int ret; 454 int ret;
455 455
456 CIO_TRACE_EVENT (2, "dissch"); 456 CIO_TRACE_EVENT (2, "dissch");
457 CIO_TRACE_EVENT (2, sch->dev.bus_id); 457 CIO_TRACE_EVENT(2, dev_name(&sch->dev));
458 458
459 if (sch_is_pseudo_sch(sch)) 459 if (sch_is_pseudo_sch(sch))
460 return 0; 460 return 0;