Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

ARM: OMAP: serial: Rename DRIVER_NAME

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@suse.de>
Acked-by: Tony Lindgren <tony@atomide.com>
Cc: Jiri Slaby <jslaby@suse.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

authored by

Jean Delvare and committed by
Greg Kroah-Hartman
1349ba02 9e370d2c

+3 -3
+1 -1
arch/arm/mach-omap2/serial.c
··· 252 252 info = omap_serial_default_info; 253 253 254 254 oh = uart->oh; 255 - name = DRIVER_NAME; 255 + name = OMAP_SERIAL_DRIVER_NAME; 256 256 257 257 omap_up.dma_enabled = info->dma_enabled; 258 258 omap_up.uartclk = OMAP24XX_BASE_BAUD * 16;
+1 -1
drivers/tty/serial/omap-serial.c
··· 1866 1866 .probe = serial_omap_probe, 1867 1867 .remove = serial_omap_remove, 1868 1868 .driver = { 1869 - .name = DRIVER_NAME, 1869 + .name = OMAP_SERIAL_DRIVER_NAME, 1870 1870 .pm = &serial_omap_dev_pm_ops, 1871 1871 .of_match_table = of_match_ptr(omap_serial_of_match), 1872 1872 },
+1 -1
include/linux/platform_data/serial-omap.h
··· 21 21 #include <linux/device.h> 22 22 #include <linux/pm_qos.h> 23 23 24 - #define DRIVER_NAME "omap_uart" 24 + #define OMAP_SERIAL_DRIVER_NAME "omap_uart" 25 25 26 26 /* 27 27 * Use tty device name as ttyO, [O -> OMAP]