From: James Nelson <james4765@cwazy.co.uk>
To: linux-kernel@vger.kernel.org, kernel-janitors@lists.osdl.org
Cc: akpm@osdl.org, James Nelson <james4765@cwazy.co.uk>
Subject: [PATCH 12/13] serial_tx3912: remove cli()/sti() in drivers/char/serial_tx3912.c
Date: Sun, 16 Jan 2005 07:53:45 -0600 [thread overview]
Message-ID: <20050116135345.30109.2401.51604@localhost.localdomain> (raw)
In-Reply-To: <20050116135223.30109.26479.55757@localhost.localdomain>
Signed-off-by: James Nelson <james4765@gmail.com>
diff -urN --exclude='*~' linux-2.6.11-rc1-mm1-original/drivers/char/serial_tx3912.c linux-2.6.11-rc1-mm1/drivers/char/serial_tx3912.c
--- linux-2.6.11-rc1-mm1-original/drivers/char/serial_tx3912.c 2004-12-24 16:34:57.000000000 -0500
+++ linux-2.6.11-rc1-mm1/drivers/char/serial_tx3912.c 2005-01-16 07:32:19.514527630 -0500
@@ -222,7 +222,7 @@
unsigned long flags;
unsigned long ints;
- save_and_cli(flags);
+ local_irq_save(flags);
port = (struct rs_port *)dev_id;
rs_dprintk (TX3912_UART_DEBUG_INTERRUPTS, "rs_interrupt (port %p, shift %d)...", port, intshift);
@@ -241,10 +241,8 @@
INTTYPE(UART_PARITYERR_INT) |
INTTYPE(UART_RX_INT)) << intshift);
- if (!port || !port->gs.tty) {
- restore_flags(flags);
- return;
- }
+ if (!port || !port->gs.tty)
+ goto out;
/* RX Receiver Holding Register Overrun */
if (ints & INTTYPE(UART_RXOVERRUN_INT)) {
@@ -275,7 +273,7 @@
receive_char_pio(port);
}
- restore_flags(flags);
+out: local_irq_restore(flags);
rs_dprintk (TX3912_UART_DEBUG_INTERRUPTS, "end.\n");
}
@@ -288,7 +286,7 @@
unsigned long flags;
unsigned long ints;
- save_and_cli(flags);
+ local_irq_save(flags);
port = (struct rs_port *)dev_id;
rs_dprintk (TX3912_UART_DEBUG_INTERRUPTS, "rs_interrupt (port %p, shift %d)...", port, intshift);
@@ -296,10 +294,8 @@
/* Get the interrrupts we have enabled */
int2status = IntStatus2 & IntEnable2;
- if (!port || !port->gs.tty) {
- restore_flags(flags);
- return;
- }
+ if (!port || !port->gs.tty)
+ goto out;
/* Get interrupts in easy to use form */
ints = int2status >> intshift;
@@ -324,7 +320,7 @@
check_modem_status();
*/
- restore_flags(flags);
+out: local_irq_restore(flags);
rs_dprintk (TX3912_UART_DEBUG_INTERRUPTS, "end.\n");
}
@@ -352,7 +348,7 @@
struct rs_port *port = ptr;
unsigned long flags;
- save_and_cli(flags);
+ local_irq_save(flags);
port->gs.flags &= ~GS_TX_INTEN;
IntEnable2 &= ~((INTTYPE(UART_TX_INT) |
@@ -363,7 +359,7 @@
INTTYPE(UART_EMPTY_INT) |
INTTYPE(UART_TXOVERRUN_INT)) << port->intshift;
- restore_flags(flags);
+ local_irq_restore(flags);
}
static void rs_enable_tx_interrupts (void * ptr)
@@ -371,7 +367,7 @@
struct rs_port *port = ptr;
unsigned long flags;
- save_and_cli(flags);
+ local_irq_save(flags);
IntClear2 = (INTTYPE(UART_TX_INT) |
INTTYPE(UART_EMPTY_INT) |
@@ -384,7 +380,7 @@
/* Send a char to start TX interrupts happening */
transmit_char_pio(port);
- restore_flags(flags);
+ local_irq_restore(flags);
}
static void rs_disable_rx_interrupts (void * ptr)
@@ -392,7 +388,7 @@
struct rs_port *port = ptr;
unsigned long flags;
- save_and_cli(flags);
+ local_irq_save(flags);
IntEnable2 &= ~((INTTYPE(UART_RX_INT) |
INTTYPE(UART_RXOVERRUN_INT) |
@@ -406,7 +402,7 @@
INTTYPE(UART_BREAK_INT) |
INTTYPE(UART_PARITYERR_INT)) << port->intshift;
- restore_flags(flags);
+ local_irq_restore(flags);
}
static void rs_enable_rx_interrupts (void * ptr)
@@ -414,7 +410,7 @@
struct rs_port *port = ptr;
unsigned long flags;
- save_and_cli(flags);
+ local_irq_save(flags);
IntEnable2 |= (INTTYPE(UART_RX_INT) |
INTTYPE(UART_RXOVERRUN_INT) |
@@ -433,7 +429,7 @@
INTTYPE(UART_BREAK_INT) |
INTTYPE(UART_PARITYERR_INT)) << port->intshift;
- restore_flags(flags);
+ local_irq_restore(flags);
}
next prev parent reply other threads:[~2005-01-16 14:09 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2005-01-16 13:52 [PATCH 0/13] remove cli()/sti() in drivers/char/* James Nelson
2005-01-16 13:52 ` [PATCH 1/13] epca: remove cli()/sti() in drivers/char/epca.c James Nelson
2005-01-16 13:52 ` [PATCH 2/13] esp: remove cli()/sti() in drivers/char/esp.c James Nelson
2005-01-16 13:52 ` [PATCH 3/13] ftape: remove cli()/sti() in drivers/char/ftape/lowlevel/ftape-format.c James Nelson
2005-01-16 21:10 ` Alan Cox
2005-01-16 13:52 ` [PATCH 4/13] ftape: remove cli()/sti() in drivers/char/ftape/lowlevel/ftape-io.c James Nelson
2005-01-16 21:11 ` Alan Cox
2005-01-16 13:52 ` [PATCH 5/13] generic_serial: remove cli()/sti() in drivers/char/generic_serial.c James Nelson
2005-01-16 13:53 ` [PATCH 6/13] ip2: remove cli()/sti() in drivers/char/ip2main.c James Nelson
2005-01-16 13:53 ` [PATCH 7/13] istallion: remove cli()/sti() in drivers/char/istallion.c James Nelson
2005-01-16 13:53 ` [PATCH 8/13] ite_gpio: remove cli()/sti() in drivers/char/ite_gpio.c James Nelson
2005-01-16 13:53 ` [PATCH 9/13] moxa: remove cli()/sti() in drivers/char/moxa.c James Nelson
2005-01-16 13:53 ` [PATCH 10/13] pcxx: remove cli()/sti() in drivers/char/pcxx.c James Nelson
2005-01-16 13:53 ` [PATCH 11/13] riscom8: remove cli()/sti() in drivers/char/riscom8.c James Nelson
2005-01-16 13:53 ` James Nelson [this message]
2005-01-16 13:53 ` [PATCH 13/13] stallion: remove cli()/sti() in drivers/char/stallion.c James Nelson
2005-01-16 19:25 ` [PATCH 0/13] remove cli()/sti() in drivers/char/* Randy.Dunlap
2005-01-16 20:13 ` Jim Nelson
2005-01-16 21:04 ` Andrew Morton
2005-01-16 21:10 ` Alan Cox
2005-01-16 22:33 ` Jim Nelson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20050116135345.30109.2401.51604@localhost.localdomain \
--to=james4765@cwazy.co.uk \
--cc=akpm@osdl.org \
--cc=kernel-janitors@lists.osdl.org \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®