git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes...
[pandora-kernel.git]
/
drivers
/
dio
/
dio.c
diff --git
a/drivers/dio/dio.c
b/drivers/dio/dio.c
index
10c3c49
..
55dd88d
100644
(file)
--- a/
drivers/dio/dio.c
+++ b/
drivers/dio/dio.c
@@
-182,7
+182,7
@@
static int __init dio_init(void)
/* Initialize the DIO bus */
INIT_LIST_HEAD(&dio_bus.devices);
/* Initialize the DIO bus */
INIT_LIST_HEAD(&dio_bus.devices);
-
strcpy(dio_bus.dev.bus_id
, "dio");
+
dev_set_name(&dio_bus.dev
, "dio");
error = device_register(&dio_bus.dev);
if (error) {
pr_err("DIO: Error registering dio_bus\n");
error = device_register(&dio_bus.dev);
if (error) {
pr_err("DIO: Error registering dio_bus\n");
@@
-237,7
+237,7
@@
static int __init dio_init(void)
dev->scode = scode;
dev->resource.start = pa;
dev->resource.end = pa + DIO_SIZE(scode, va);
dev->scode = scode;
dev->resource.start = pa;
dev->resource.end = pa + DIO_SIZE(scode, va);
-
sprintf(dev->dev.bus_id,
"%02x", scode);
+
dev_set_name(&dev->dev,
"%02x", scode);
/* read the ID byte(s) and encode if necessary. */
prid = DIO_ID(va);
/* read the ID byte(s) and encode if necessary. */
prid = DIO_ID(va);