From: Alan Cox <alan@redhat.com>
To: torvalds@osdl.org, linux-kernel@vger.kernel.org,
linux-serial@vger.kernel.org
Subject: [PATCH 18/27] ip2, fix sparse warnings
Date: Fri, 10 Oct 2008 11:50:22 +0100 [thread overview]
Message-ID: <20081010105016.31597.30633.stgit@localhost.localdomain> (raw)
In-Reply-To: <20081010103447.31597.42992.stgit@localhost.localdomain>
From: Jiri Slaby <jirislaby@gmail.com>
Signed-off-by: Jiri Slaby <jirislaby@gmail.com>
Signed-off-by: Alan Cox <alan@redhat.com>
---
drivers/char/ip2/ip2main.c | 14 +++++---------
1 files changed, 5 insertions(+), 9 deletions(-)
diff --git a/drivers/char/ip2/ip2main.c b/drivers/char/ip2/ip2main.c
index 1d46284..098c9de 100644
--- a/drivers/char/ip2/ip2main.c
+++ b/drivers/char/ip2/ip2main.c
@@ -375,9 +375,7 @@ have_requested_irq( char irq )
/* handle subsequent installations of the driver. All memory allocated by the */
/* driver should be returned since it may be unloaded from memory. */
/******************************************************************************/
-#ifdef MODULE
-void __exit
-ip2_cleanup_module(void)
+static void __exit ip2_cleanup_module(void)
{
int err;
int i;
@@ -431,7 +429,8 @@ ip2_cleanup_module(void)
ip2config.pci_dev[i] = NULL;
}
#endif
- if ((pB = i2BoardPtrTable[i]) != 0 ) {
+ pB = i2BoardPtrTable[i];
+ if (pB != NULL) {
kfree ( pB );
i2BoardPtrTable[i] = NULL;
}
@@ -448,7 +447,6 @@ ip2_cleanup_module(void)
#endif
}
module_exit(ip2_cleanup_module);
-#endif /* MODULE */
static const struct tty_operations ip2_ops = {
.open = ip2_open,
@@ -1255,9 +1253,8 @@ ip2_polled_interrupt(void)
{
int i;
i2eBordStrPtr pB;
- const int irq = 0;
- ip2trace (ITRC_NO_PORT, ITRC_INTR, 99, 1, irq );
+ ip2trace(ITRC_NO_PORT, ITRC_INTR, 99, 1, 0);
/* Service just the boards on the list using this irq */
for( i = 0; i < i2nBoards; ++i ) {
@@ -1266,9 +1263,8 @@ ip2_polled_interrupt(void)
// Only process those boards which match our IRQ.
// IRQ = 0 for polled boards, we won't poll "IRQ" boards
- if ( pB && (pB->i2eUsingIrq == irq) ) {
+ if (pB && pB->i2eUsingIrq == 0)
ip2_irq_work(pB);
- }
}
++irq_counter;
next prev parent reply other threads:[~2008-10-10 10:53 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-10-10 10:36 [PATCH 00/27] First block of the tty backlog Alan Cox
2008-10-10 10:36 ` [PATCH 01/27] drivers/serial/crisv10.c: add missing put_tty_driver Alan Cox
2008-12-28 22:24 ` Should <linux/serial.h> define __u32? walt
2008-12-29 0:53 ` Alan Cox
2008-12-29 12:35 ` Mike Frysinger
2008-10-10 10:36 ` [PATCH 02/27] drivers/char/hvc_console.c: adjust call to put_tty_driver Alan Cox
2008-10-10 10:36 ` [PATCH 03/27] coldfire: scheduled SERIAL_COLDFIRE removal Alan Cox
2008-10-10 10:37 ` [PATCH 04/27] epca: call tty_port_init Alan Cox
2008-10-10 10:48 ` [PATCH 05/27] Blackfin Serial Driver: use __initdata for data, not __init Alan Cox
2008-10-10 10:48 ` [PATCH 06/27] Blackfin Serial Driver: Fix bug - should suspend/resume/remove all uart ports Alan Cox
2008-10-10 10:48 ` [PATCH 07/27] Blackfin Serial Driver: trim trailing whitespace -- no functional changes Alan Cox
2008-10-10 10:48 ` [PATCH 08/27] Blackfin Serial Driver: move common variables out of serial headers and into the serial driver Alan Cox
2008-10-10 10:48 ` [PATCH 09/27] Blackfin Serial Driver: Remove useless stop Alan Cox
2008-10-10 10:49 ` [PATCH 10/27] Blackfin Serial Driver: Fix bug - Don't call tx_stop in tx_transfer Alan Cox
2008-10-10 10:49 ` [PATCH 11/27] Blackfin Serial Driver: Fix bug - ircp fails on sir over Blackfin UART Alan Cox
2008-10-10 10:49 ` [PATCH 12/27] Blackfin Serial Driver: Fix bug - request UART2/3 peripheral mapped interrupts in PIO mode Alan Cox
2008-10-10 10:49 ` [PATCH 13/27] Fix oti6858 debug level Alan Cox
2008-10-10 10:49 ` [PATCH 14/27] Char: cyclades. remove bogus iomap Alan Cox
2008-10-10 10:49 ` [PATCH 15/27] Char: sx, fix io unmapping Alan Cox
2008-10-10 10:50 ` [PATCH 16/27] Char: merge ip2main and ip2base Alan Cox
2008-10-10 10:50 ` [PATCH 17/27] ip2, cleanup globals Alan Cox
2008-10-10 10:50 ` Alan Cox [this message]
2008-10-10 10:50 ` [PATCH 19/27] ip2, init/deinit cleanup Alan Cox
2008-10-10 10:50 ` [PATCH 20/27] ip2: avoid add_timer with pending timer Alan Cox
2008-10-10 10:50 ` [PATCH 21/27] audit: Handle embedded NUL in TTY input auditing Alan Cox
2008-10-10 10:50 ` [PATCH 22/27] serial: Make uart_port's ioport "unsigned long" Alan Cox
2008-10-10 12:54 ` Josh Boyer
2008-10-10 16:19 ` David Miller
2008-10-10 10:51 ` [PATCH 23/27] nozomi: Fix close on error Alan Cox
2008-10-10 10:51 ` [PATCH 24/27] serial-make-uart_ports-ioport-unsigned-long-fix Alan Cox
2008-10-10 10:51 ` [PATCH 25/27] usb: fix pl2303 initialization Alan Cox
2008-10-10 10:51 ` [PATCH 26/27] ftdi: A few errors are err() that should be debug which causes much spewage Alan Cox
2008-10-10 10:52 ` [PATCH 27/27] serial_8250: pci_enable_device fail is not fully handled Alan Cox
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=20081010105016.31597.30633.stgit@localhost.localdomain \
--to=alan@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-serial@vger.kernel.org \
--cc=torvalds@osdl.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