The patch titled Subject: rtc: omap: remove DRIVER_NAME macro has been removed from the -mm tree. Its filename was rtc-omap-remove-driver_name-macro.patch This patch was dropped because it was merged into mainline or a subsystem tree ------------------------------------------------------ From: Johan Hovold <johan@xxxxxxxxxx> Subject: rtc: omap: remove DRIVER_NAME macro Remove DRIVER_NAME macro which was used for unrelated strings (e.g. id-table entry and module name), but not for related ones (e.g. module name and alias). Also move the module alias to the other module-info entries. Signed-off-by: Johan Hovold <johan@xxxxxxxxxx> Cc: Alessandro Zummo <a.zummo@xxxxxxxxxxxx> Cc: Tony Lindgren <tony@xxxxxxxxxxx> Cc: Benot Cousson <bcousson@xxxxxxxxxxxx> Cc: Lokesh Vutla <lokeshvutla@xxxxxx> Cc: Guenter Roeck <linux@xxxxxxxxxxxx> Cc: Sekhar Nori <nsekhar@xxxxxx> Cc: Tero Kristo <t-kristo@xxxxxx> Tested-by: Felipe Balbi <balbi@xxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- drivers/rtc/rtc-omap.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff -puN drivers/rtc/rtc-omap.c~rtc-omap-remove-driver_name-macro drivers/rtc/rtc-omap.c --- a/drivers/rtc/rtc-omap.c~rtc-omap-remove-driver_name-macro +++ a/drivers/rtc/rtc-omap.c @@ -39,8 +39,6 @@ * the SoC). See the BOARD-SPECIFIC CUSTOMIZATION comment. */ -#define DRIVER_NAME "omap_rtc" - /* RTC registers */ #define OMAP_RTC_SECONDS_REG 0x00 #define OMAP_RTC_MINUTES_REG 0x04 @@ -360,7 +358,7 @@ static struct rtc_class_ops omap_rtc_ops static const struct platform_device_id omap_rtc_devtype[] = { { - .name = DRIVER_NAME, + .name = "omap_rtc", }, [OMAP_RTC_DATA_AM3352_IDX] = { .name = "am3352-rtc", @@ -587,12 +585,11 @@ static void omap_rtc_shutdown(struct pla rtc_write(rtc, OMAP_RTC_INTERRUPTS_REG, 0); } -MODULE_ALIAS("platform:omap_rtc"); static struct platform_driver omap_rtc_driver = { .remove = __exit_p(omap_rtc_remove), .shutdown = omap_rtc_shutdown, .driver = { - .name = DRIVER_NAME, + .name = "omap_rtc", .owner = THIS_MODULE, .pm = &omap_rtc_pm_ops, .of_match_table = omap_rtc_of_match, @@ -602,5 +599,6 @@ static struct platform_driver omap_rtc_d module_platform_driver_probe(omap_rtc_driver, omap_rtc_probe); +MODULE_ALIAS("platform:omap_rtc"); MODULE_AUTHOR("George G. Davis (and others)"); MODULE_LICENSE("GPL"); _ Patches currently in -mm which might be from johan@xxxxxxxxxx are origin.patch linux-next.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html