Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1349ba02 authored by Jean Delvare's avatar Jean Delvare Committed by Greg Kroah-Hartman
Browse files

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: default avatarJean Delvare <jdelvare@suse.de>
Acked-by: default avatarTony Lindgren <tony@atomide.com>
Cc: Jiri Slaby <jslaby@suse.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 9e370d2c

arch/arm/mach-omap2/serial.c

+1 −1
Original line number Diff line number Diff line
@@ -252,7 +252,7 @@ void __init omap_serial_init_port(struct omap_board_data *bdata, 
		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;

drivers/tty/serial/omap-serial.c

+1 −1
Original line number Diff line number Diff line
@@ -1866,7 +1866,7 @@ static struct platform_driver serial_omap_driver = { 
	.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),

	},

include/linux/platform_data/serial-omap.h

+1 −1
Original line number Diff line number Diff line
@@ -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]