From: Atsushi Nemoto 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: Atsushi Nemoto Cc: Alessandro Zummo Cc: David Brownell Cc: Ralf Baechle Signed-off-by: Andrew Morton --- arch/mips/jmr3927/rbhma3100/setup.c | 2 +- arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_setup.c | 2 +- drivers/rtc/rtc-ds1742.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff -puN arch/mips/jmr3927/rbhma3100/setup.c~rtc-make-rtc-ds1742-driver-hotplug-aware-take-2 arch/mips/jmr3927/rbhma3100/setup.c --- a/arch/mips/jmr3927/rbhma3100/setup.c~rtc-make-rtc-ds1742-driver-hotplug-aware-take-2 +++ a/arch/mips/jmr3927/rbhma3100/setup.c @@ -427,7 +427,7 @@ static int __init jmr3927_rtc_init(void) .flags = IORESOURCE_MEM, }; 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; } device_initcall(jmr3927_rtc_init); diff -puN arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_setup.c~rtc-make-rtc-ds1742-driver-hotplug-aware-take-2 arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_setup.c --- a/arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_setup.c~rtc-make-rtc-ds1742-driver-hotplug-aware-take-2 +++ a/arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_setup.c @@ -969,7 +969,7 @@ static int __init toshiba_rbtx4927_rtc_i .flags = IORESOURCE_MEM, }; 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; } device_initcall(toshiba_rbtx4927_rtc_init); diff -puN drivers/rtc/rtc-ds1742.c~rtc-make-rtc-ds1742-driver-hotplug-aware-take-2 drivers/rtc/rtc-ds1742.c --- a/drivers/rtc/rtc-ds1742.c~rtc-make-rtc-ds1742-driver-hotplug-aware-take-2 +++ a/drivers/rtc/rtc-ds1742.c @@ -251,7 +251,7 @@ static struct platform_driver ds1742_rtc .probe = ds1742_rtc_probe, .remove = __devexit_p(ds1742_rtc_remove), .driver = { - .name = "ds1742", + .name = "rtc-ds1742", .owner = THIS_MODULE, }, }; _