lkml.org 
[lkml]   [2003]   [Aug]   [29]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
SubjectRe: [PATCH] s390 (5/8): common i/o layer.
From
Date
Martin Schwidefsky <schwidefsky@de.ibm.com> writes:

> --- linux-2.6/drivers/s390/cio/css.c Sat Aug 23 01:52:24 2003
> +++ linux-2.6-s390/drivers/s390/cio/css.c Fri Aug 29 18:55:10 2003

[...]

> @@ -97,8 +85,7 @@
> sch->dev.bus = &css_bus_type;
>
> /* Set a name for the subchannel */
> - strlcpy (sch->dev.name, subchannel_types[sch->st], DEVICE_NAME_SIZE);
> - snprintf (sch->dev.bus_id, DEVICE_ID_SIZE, "0:%04x", sch->irq);
> + snprintf (sch->dev.bus_id, DEVICE_ID_SIZE, "0.0.%04x", sch->irq);
>
> /* make it known to the system */
> ret = device_register(&sch->dev);
> diff -urN linux-2.6/drivers/s390/cio/device.c linux-2.6-s390/drivers/s390/cio/device.c
> --- linux-2.6/drivers/s390/cio/device.c Sat Aug 23 01:58:10 2003
> +++ linux-2.6-s390/drivers/s390/cio/device.c Fri Aug 29 18:55:10 2003

[...]

> @@ -537,8 +537,7 @@
> init_timer(&cdev->private->timer);
>
> /* Set an initial name for the device. */
> - snprintf (cdev->dev.name, DEVICE_NAME_SIZE,"ccw device");
> - snprintf (cdev->dev.bus_id, DEVICE_ID_SIZE, "0:%04x",
> + snprintf (cdev->dev.bus_id, DEVICE_ID_SIZE, "0.0.%04x",
> sch->schib.pmcw.dev);
>
> /* Increase counter of devices currently in recognition. */

Shouldn't the above use BUS_ID_SIZE instead of DEVICE_ID_SIZE?
--
OGAWA Hirofumi <hirofumi@mail.parknet.co.jp>
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/

\
 
 \ /
  Last update: 2005-03-22 13:48    [W:0.113 / U:0.288 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site