Skip to content

Commit a4ed1e4

Browse files
author
Bryan Wu
committed
8250 Serial Driver: revert extra IRQ flag definition patch
As Russell pointed out, original patch will break some serial configurations because of the dependency of the <asm/serial.h> header file. Revert it first and try to find out other solution later Cc: Javier Herrero <[email protected]> Cc: Alan Cox <[email protected]> Cc: Russell King <[email protected]> Signed-off-by: Bryan Wu <[email protected]>
1 parent a70ce07 commit a4ed1e4

File tree

2 files changed

+1
-8
lines changed

2 files changed

+1
-8
lines changed

drivers/serial/8250.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@
4343

4444
#include <asm/io.h>
4545
#include <asm/irq.h>
46-
#include <asm/serial.h>
4746

4847
#include "8250.h"
4948

@@ -93,6 +92,7 @@ static unsigned int nr_uarts = CONFIG_SERIAL_8250_RUNTIME_UARTS;
9392
*/
9493
#define CONFIG_HUB6 1
9594

95+
#include <asm/serial.h>
9696
/*
9797
* SERIAL_PORT_DFNS tells us about built-in ports that have no
9898
* standard enumeration mechanism. Platforms that can find all
@@ -1547,8 +1547,6 @@ static int serial_link_irq_chain(struct uart_8250_port *up)
15471547
i->head = &up->list;
15481548
spin_unlock_irq(&i->lock);
15491549

1550-
irq_flags |= SERIAL_EXTRA_IRQ_FLAGS;
1551-
15521550
ret = request_irq(up->port.irq, serial8250_interrupt,
15531551
irq_flags, "serial", i);
15541552
if (ret < 0)

drivers/serial/8250.h

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -78,8 +78,3 @@ struct serial8250_config {
7878
#else
7979
#define ALPHA_KLUDGE_MCR 0
8080
#endif
81-
82-
#ifndef SERIAL_EXTRA_IRQ_FLAGS
83-
#define SERIAL_EXTRA_IRQ_FLAGS 0
84-
#endif
85-

0 commit comments

Comments
 (0)