Commit a95e23a2 authored by Atsushi Nemoto's avatar Atsushi Nemoto Committed by Linus Torvalds

rtc: make rtc-ds1742 driver hotplug-aware

The rtc-ds1742 platform driver name doesn't match its module name,
which might prevents it from properly hotplugging.  There is only two
in-tree user of its driver, which are fixed by this patch too.
Signed-off-by: default avatarAtsushi Nemoto <anemo@mba.ocn.ne.jp>
Cc: Alessandro Zummo <a.zummo@towertech.it>
Cc: David Brownell <david-b@pacbell.net>
Cc: Ralf Baechle <ralf@linux-mips.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent e7634c27
...@@ -425,7 +425,7 @@ static int __init jmr3927_rtc_init(void) ...@@ -425,7 +425,7 @@ static int __init jmr3927_rtc_init(void)
.flags = IORESOURCE_MEM, .flags = IORESOURCE_MEM,
}; };
struct platform_device *dev; struct platform_device *dev;
dev = platform_device_register_simple("ds1742", -1, &res, 1); dev = platform_device_register_simple("rtc-ds1742", -1, &res, 1);
return IS_ERR(dev) ? PTR_ERR(dev) : 0; return IS_ERR(dev) ? PTR_ERR(dev) : 0;
} }
device_initcall(jmr3927_rtc_init); device_initcall(jmr3927_rtc_init);
...@@ -963,7 +963,7 @@ static int __init toshiba_rbtx4927_rtc_init(void) ...@@ -963,7 +963,7 @@ static int __init toshiba_rbtx4927_rtc_init(void)
.flags = IORESOURCE_MEM, .flags = IORESOURCE_MEM,
}; };
struct platform_device *dev = struct platform_device *dev =
platform_device_register_simple("ds1742", -1, &res, 1); platform_device_register_simple("rtc-ds1742", -1, &res, 1);
return IS_ERR(dev) ? PTR_ERR(dev) : 0; return IS_ERR(dev) ? PTR_ERR(dev) : 0;
} }
device_initcall(toshiba_rbtx4927_rtc_init); device_initcall(toshiba_rbtx4927_rtc_init);
......
...@@ -251,7 +251,7 @@ static struct platform_driver ds1742_rtc_driver = { ...@@ -251,7 +251,7 @@ static struct platform_driver ds1742_rtc_driver = {
.probe = ds1742_rtc_probe, .probe = ds1742_rtc_probe,
.remove = __devexit_p(ds1742_rtc_remove), .remove = __devexit_p(ds1742_rtc_remove),
.driver = { .driver = {
.name = "ds1742", .name = "rtc-ds1742",
.owner = THIS_MODULE, .owner = THIS_MODULE,
}, },
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment