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

Commit 02c33330 authored by Yehuda Yitschak's avatar Yehuda Yitschak Committed by Greg Kroah-Hartman
Browse files

serial: mvebu-uart: use driver name when requesting an interrupt 



Use the driver name when requesting an interrupt for consistency.

Avoids possible confusion with DW8250 driver interrupt names in
/proc/interrupts.

Signed-off-by: default avatarYehuda Yitschak <yehuday@marvell.com>
Signed-off-by: default avatarMiquel Raynal <miquel.raynal@free-electrons.com>
Reviewed-by: default avatarGregory CLEMENT <gregory.clement@free-electrons.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent bdff1480

drivers/tty/serial/mvebu-uart.c

+4 −3
Original line number Original line Diff line number Diff line
@@ -90,6 +90,7 @@ 
#define MVEBU_NR_UARTS		1

#define MVEBU_NR_UARTS		1





#define MVEBU_UART_TYPE		"mvebu-uart"

#define MVEBU_UART_TYPE		"mvebu-uart"

#define DRIVER_NAME		"mvebu_serial"





static struct uart_port mvebu_uart_ports[MVEBU_NR_UARTS];

static struct uart_port mvebu_uart_ports[MVEBU_NR_UARTS];
@@ -287,8 +288,8 @@ static int mvebu_uart_startup(struct uart_port *port) 
	udelay(1);

	udelay(1);

	writel(CTRL_RX_INT, port->membase + UART_CTRL);

	writel(CTRL_RX_INT, port->membase + UART_CTRL);





	ret = request_irq(port->irq, mvebu_uart_isr, port->irqflags, "serial",

	ret = request_irq(port->irq, mvebu_uart_isr, port->irqflags,

			  port);

			  DRIVER_NAME, port);

	if (ret) {

	if (ret) {

		dev_err(port->dev, "failed to request irq\n");

		dev_err(port->dev, "failed to request irq\n");

		return ret;

		return ret;
@@ -538,7 +539,7 @@ console_initcall(mvebu_uart_console_init); 




static struct uart_driver mvebu_uart_driver = {

static struct uart_driver mvebu_uart_driver = {

	.owner			= THIS_MODULE,

	.owner			= THIS_MODULE,

	.driver_name		= "mvebu_serial",

	.driver_name		= DRIVER_NAME,

	.dev_name		= "ttyMV",

	.dev_name		= "ttyMV",

	.nr			= MVEBU_NR_UARTS,

	.nr			= MVEBU_NR_UARTS,

#ifdef CONFIG_SERIAL_MVEBU_CONSOLE

#ifdef CONFIG_SERIAL_MVEBU_CONSOLE