diff options
author | Kay Sievers <kay.sievers@vrfy.org> | 2009-03-24 19:38:22 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-03-24 19:38:22 -0400 |
commit | 9591463af7ea3a2d723c7e39c08aa05ad27e7bfc (patch) | |
tree | fd47d56c358ef5bebe16cd1e2f5c61666df07e76 | |
parent | 9d6b4c82bffbe6de624ff86cb279166867f46365 (diff) |
dio: struct device - replace bus_id with dev_name(), dev_set_name()
Acked-by: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: Kay Sievers <kay.sievers@vrfy.org>
-rw-r--r-- | drivers/dio/dio.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/dio/dio.c b/drivers/dio/dio.c index 10c3c498358c..55dd88d82d6d 100644 --- a/drivers/dio/dio.c +++ b/drivers/dio/dio.c | |||
@@ -182,7 +182,7 @@ static int __init dio_init(void) | |||
182 | 182 | ||
183 | /* Initialize the DIO bus */ | 183 | /* Initialize the DIO bus */ |
184 | INIT_LIST_HEAD(&dio_bus.devices); | 184 | INIT_LIST_HEAD(&dio_bus.devices); |
185 | strcpy(dio_bus.dev.bus_id, "dio"); | 185 | dev_set_name(&dio_bus.dev, "dio"); |
186 | error = device_register(&dio_bus.dev); | 186 | error = device_register(&dio_bus.dev); |
187 | if (error) { | 187 | if (error) { |
188 | pr_err("DIO: Error registering dio_bus\n"); | 188 | pr_err("DIO: Error registering dio_bus\n"); |
@@ -237,7 +237,7 @@ static int __init dio_init(void) | |||
237 | dev->scode = scode; | 237 | dev->scode = scode; |
238 | dev->resource.start = pa; | 238 | dev->resource.start = pa; |
239 | dev->resource.end = pa + DIO_SIZE(scode, va); | 239 | dev->resource.end = pa + DIO_SIZE(scode, va); |
240 | sprintf(dev->dev.bus_id,"%02x", scode); | 240 | dev_set_name(&dev->dev, "%02x", scode); |
241 | 241 | ||
242 | /* read the ID byte(s) and encode if necessary. */ | 242 | /* read the ID byte(s) and encode if necessary. */ |
243 | prid = DIO_ID(va); | 243 | prid = DIO_ID(va); |