DRIVER_NAME is too generic to be used in a driver-specific platform
data file. Use a name specific to the driver instead, to avoid
collisions.
Signed-off-by: Jean Delvare <jdelvare@xxxxxxx>
Cc: Tony Lindgren <tony@xxxxxxxxxxx>
Cc: Jiri Slaby <jslaby@xxxxxxxx>
Cc: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
arch/arm/mach-omap2/serial.c | 2 +-
drivers/tty/serial/omap-serial.c | 2 +-
include/linux/platform_data/serial-omap.h | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
--- linux-4.5-rc0.orig/arch/arm/mach-omap2/serial.c 2016-01-11 00:01:32.000000000 +0100
+++ linux-4.5-rc0/arch/arm/mach-omap2/serial.c 2016-01-21 09:23:49.430678093 +0100
@@ -252,7 +252,7 @@ void __init omap_serial_init_port(struct
info = omap_serial_default_info;
oh = uart->oh;
- name = DRIVER_NAME;
+ name = OMAP_SERIAL_DRIVER_NAME;
omap_up.dma_enabled = info->dma_enabled;
omap_up.uartclk = OMAP24XX_BASE_BAUD * 16;
--- linux-4.5-rc0.orig/drivers/tty/serial/omap-serial.c 2016-01-20 09:24:58.828571934 +0100
+++ linux-4.5-rc0/drivers/tty/serial/omap-serial.c 2016-01-21 09:24:04.590018356 +0100
@@ -1866,7 +1866,7 @@ static struct platform_driver serial_oma
.probe = serial_omap_probe,
.remove = serial_omap_remove,
.driver = {
- .name = DRIVER_NAME,
+ .name = OMAP_SERIAL_DRIVER_NAME,
.pm = &serial_omap_dev_pm_ops,
.of_match_table = of_match_ptr(omap_serial_of_match),
},
--- linux-4.5-rc0.orig/include/linux/platform_data/serial-omap.h 2016-01-11 00:01:32.000000000 +0100
+++ linux-4.5-rc0/include/linux/platform_data/serial-omap.h 2016-01-21 09:23:32.692302387 +0100
@@ -21,7 +21,7 @@
#include <linux/device.h>
#include <linux/pm_qos.h>
-#define DRIVER_NAME "omap_uart"
+#define OMAP_SERIAL_DRIVER_NAME "omap_uart"
/*
* Use tty device name as ttyO, [O -> OMAP]
--
Jean Delvare
SUSE L3 Support
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
