From: Alan Cox <alan@lxorguk.ukuu.org.uk>
To: torvalds@linux-foundation.org, linux-kernel@vger.kernel.org
Subject: [PATCH 22/27] icom: remove unused variables
Date: Mon, 06 Apr 2009 17:34:53 +0100 [thread overview]
Message-ID: <20090406163439.12934.78144.stgit@t61.ukuu.org.uk> (raw)
In-Reply-To: <20090406162959.12934.97904.stgit@t61.ukuu.org.uk>
From: Breno Leitao <leitao@linux.vnet.ibm.com>
Signed-off-by: Breno Leitao <leitao@linux.vnet.ibm.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Alan Cox <alan@lxorguk.ukuu.org.uk>
---
drivers/serial/icom.c | 14 ++------------
1 files changed, 2 insertions(+), 12 deletions(-)
diff --git a/drivers/serial/icom.c b/drivers/serial/icom.c
index 2b7531d..6579e2b 100644
--- a/drivers/serial/icom.c
+++ b/drivers/serial/icom.c
@@ -1098,7 +1098,6 @@ static void icom_set_termios(struct uart_port *port,
{
int baud;
unsigned cflag, iflag;
- int bits;
char new_config2;
char new_config3 = 0;
char tmp_byte;
@@ -1119,34 +1118,27 @@ static void icom_set_termios(struct uart_port *port,
switch (cflag & CSIZE) {
case CS5: /* 5 bits/char */
new_config2 |= ICOM_ACFG_5BPC;
- bits = 7;
break;
case CS6: /* 6 bits/char */
new_config2 |= ICOM_ACFG_6BPC;
- bits = 8;
break;
case CS7: /* 7 bits/char */
new_config2 |= ICOM_ACFG_7BPC;
- bits = 9;
break;
case CS8: /* 8 bits/char */
new_config2 |= ICOM_ACFG_8BPC;
- bits = 10;
break;
default:
- bits = 10;
break;
}
if (cflag & CSTOPB) {
/* 2 stop bits */
new_config2 |= ICOM_ACFG_2STOP_BIT;
- bits++;
}
if (cflag & PARENB) {
/* parity bit enabled */
new_config2 |= ICOM_ACFG_PARITY_ENAB;
trace(ICOM_PORT, "PARENB", 0);
- bits++;
}
if (cflag & PARODD) {
/* odd parity */
@@ -1322,7 +1314,6 @@ static struct uart_driver icom_uart_driver = {
static int __devinit icom_init_ports(struct icom_adapter *icom_adapter)
{
u32 subsystem_id = icom_adapter->subsystem_id;
- int retval = 0;
int i;
struct icom_port *icom_port;
@@ -1368,7 +1359,7 @@ static int __devinit icom_init_ports(struct icom_adapter *icom_adapter)
}
}
- return retval;
+ return 0;
}
static void icom_port_active(struct icom_port *icom_port, struct icom_adapter *icom_adapter, int port_num)
@@ -1391,7 +1382,6 @@ static int __devinit icom_load_ports(struct icom_adapter *icom_adapter)
{
struct icom_port *icom_port;
int port_num;
- int retval;
for (port_num = 0; port_num < icom_adapter->numb_ports; port_num++) {
@@ -1405,7 +1395,7 @@ static int __devinit icom_load_ports(struct icom_adapter *icom_adapter)
icom_port->adapter = icom_adapter;
/* get port memory */
- if ((retval = get_port_memory(icom_port)) != 0) {
+ if (get_port_memory(icom_port) != 0) {
dev_err(&icom_port->adapter->pci_dev->dev,
"Memory allocation for port FAILED\n");
}
next prev parent reply other threads:[~2009-04-06 15:38 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-04-06 16:31 [RESEND PATCH 00/27] Serial updates for 2.6.30 Alan Cox
2009-04-06 16:31 ` [PATCH 01/27] 8250_pnp.c: add another Wacom tablet Alan Cox
2009-04-06 16:32 ` [PATCH 02/27] serial: Update PNP IDs Alan Cox
2009-04-06 16:32 ` [PATCH 03/27] 8250_pci: add support for National Instruments 843x RS232 devices Alan Cox
2009-04-06 16:32 ` [PATCH 04/27] 8250_pci: add support for National Instruments legacy 8420 RS232 boards Alan Cox
2009-04-06 16:32 ` [PATCH 05/27] blackfin: BF538/9 serial uart support Alan Cox
2009-04-06 16:32 ` [PATCH 06/27] blackfin: Use unsigned long for flags with irq functions Alan Cox
2009-04-06 16:32 ` [PATCH 07/27] blackfin: Fix tty compile error in PIO mode Alan Cox
2009-04-06 16:32 ` [PATCH 08/27] Fix DMA rx ring buffer handling Alan Cox
2009-04-06 16:32 ` [PATCH 09/27] blackfin: Subtract ANOMALY_05000230 on quot Alan Cox
2009-04-06 16:32 ` [PATCH 10/27] applicom: Auto-load applicom module when device opened Alan Cox
2009-04-06 16:33 ` [PATCH 11/27] cyclades: Auto-load cyclades " Alan Cox
2009-04-06 16:33 ` [PATCH 12/27] specialix: Auto-load specialix " Alan Cox
2009-04-06 16:33 ` [PATCH 13/27] usb: Auto-load cdc_acm " Alan Cox
2009-04-06 16:33 ` [PATCH 14/27] riscom8: Auto-load riscom8 " Alan Cox
2009-04-06 16:33 ` [PATCH 15/27] ucc: Fix leaky error path Alan Cox
2009-04-06 16:33 ` [PATCH 16/27] isicom: isicom kref leak fix Alan Cox
2009-04-06 16:34 ` [PATCH 17/27] tty: moxa, fix refcounting in moxa_poll_port Alan Cox
2009-04-06 16:34 ` [PATCH 18/27] mxser: remove tty_port_tty_get from mxser_check_modem_status Alan Cox
2009-04-06 16:34 ` [PATCH 19/27] jsm: define init function as __devinit Alan Cox
2009-04-06 16:34 ` [PATCH 20/27] jsm: Fix the return variable and removing the unused retval Alan Cox
2009-04-06 16:34 ` [PATCH 21/27] mux: fix build problem Alan Cox
2009-04-06 16:34 ` Alan Cox [this message]
2009-04-06 16:35 ` [PATCH 23/27] cdc-acm: zydas 1602 identifier needed Alan Cox
2009-04-06 16:35 ` [PATCH 24/27] tty: pl2303 needs identifiers for Siemens S81 as well as EF81 Alan Cox
2009-04-06 16:35 ` [PATCH 25/27] symbol: Remove various bits of left over junk Alan Cox
2009-04-06 16:35 ` [PATCH 26/27] rio: addition has higher precedence than ?: Alan Cox
2009-04-06 16:35 ` [PATCH 27/27] 8250: Fix warning 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=20090406163439.12934.78144.stgit@t61.ukuu.org.uk \
--to=alan@lxorguk.ukuu.org.uk \
--cc=linux-kernel@vger.kernel.org \
--cc=torvalds@linux-foundation.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®