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

Commit a4128b03 authored by David Howells's avatar David Howells Committed by Linus Torvalds
Browse files

MN10300: Fix up the IRQ names for the on-chip serial ports 



Fix up the IRQ names for the MN10300 on-chip serial ports in the driver as
request_interrupt() no longer allows names containing slashes, giving a warning
like the following if one is encountered:

	------------[ cut here ]------------
	WARNING: at fs/proc/generic.c:323 __xlate_proc_name+0x62/0x7c()
	name 'ttySM0/Rx'

Signed-off-by: default avatarDavid Howells <dhowells@redhat.com>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 65e0b598

arch/mn10300/kernel/mn10300-serial.c

+11 −11
Original line number Diff line number Diff line
@@ -156,17 +156,17 @@ struct mn10300_serial_port mn10300_serial_port_sif0 = { 
	._intr		= &SC0ICR,

	._rxb		= &SC0RXB,

	._txb		= &SC0TXB,

	.rx_name	= "ttySM0/Rx",

	.tx_name	= "ttySM0/Tx",

	.rx_name	= "ttySM0:Rx",

	.tx_name	= "ttySM0:Tx",

#ifdef CONFIG_MN10300_TTYSM0_TIMER8

	.tm_name	= "ttySM0/Timer8",

	.tm_name	= "ttySM0:Timer8",

	._tmxmd		= &TM8MD,

	._tmxbr		= &TM8BR,

	._tmicr		= &TM8ICR,

	.tm_irq		= TM8IRQ,

	.div_timer	= MNSCx_DIV_TIMER_16BIT,

#else /* CONFIG_MN10300_TTYSM0_TIMER2 */

	.tm_name	= "ttySM0/Timer2",

	.tm_name	= "ttySM0:Timer2",

	._tmxmd		= &TM2MD,

	._tmxbr		= (volatile u16 *) &TM2BR,

	._tmicr		= &TM2ICR,
@@ -209,17 +209,17 @@ struct mn10300_serial_port mn10300_serial_port_sif1 = { 
	._intr		= &SC1ICR,

	._rxb		= &SC1RXB,

	._txb		= &SC1TXB,

	.rx_name	= "ttySM1/Rx",

	.tx_name	= "ttySM1/Tx",

	.rx_name	= "ttySM1:Rx",

	.tx_name	= "ttySM1:Tx",

#ifdef CONFIG_MN10300_TTYSM1_TIMER9

	.tm_name	= "ttySM1/Timer9",

	.tm_name	= "ttySM1:Timer9",

	._tmxmd		= &TM9MD,

	._tmxbr		= &TM9BR,

	._tmicr		= &TM9ICR,

	.tm_irq		= TM9IRQ,

	.div_timer	= MNSCx_DIV_TIMER_16BIT,

#else /* CONFIG_MN10300_TTYSM1_TIMER3 */

	.tm_name	= "ttySM1/Timer3",

	.tm_name	= "ttySM1:Timer3",

	._tmxmd		= &TM3MD,

	._tmxbr		= (volatile u16 *) &TM3BR,

	._tmicr		= &TM3ICR,
@@ -260,9 +260,9 @@ struct mn10300_serial_port mn10300_serial_port_sif2 = { 
	.uart.lock	=

	__SPIN_LOCK_UNLOCKED(mn10300_serial_port_sif2.uart.lock),

	.name		= "ttySM2",

	.rx_name	= "ttySM2/Rx",

	.tx_name	= "ttySM2/Tx",

	.tm_name	= "ttySM2/Timer10",

	.rx_name	= "ttySM2:Rx",

	.tx_name	= "ttySM2:Tx",

	.tm_name	= "ttySM2:Timer10",

	._iobase	= &SC2CTR,

	._control	= &SC2CTR,

	._status	= &SC2STR,