* [merged] serial167-kill-unused-variables.patch removed from -mm tree
@ 2010-05-06 16:09 akpm
0 siblings, 0 replies; only message in thread
From: akpm @ 2010-05-06 16:09 UTC (permalink / raw)
To: geert, alan, greg, mm-commits
The patch titled
serial167: kill unused variables
has been removed from the -mm tree. Its filename was
serial167-kill-unused-variables.patch
This patch was dropped because it was merged into mainline or a subsystem tree
The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/
------------------------------------------------------
Subject: serial167: kill unused variables
From: Geert Uytterhoeven <geert@linux-m68k.org>
commits 638157bc1461f6718eeca06bedd9a09cf1f35c36 ("serial167: prepare to
push BKL down into drivers") and 4165fe4ef7305609a96c7f248cefb9c414d0ede5
("tty: Fix up char drivers request_room usage") removed code without
removing the corresponding variables:
| drivers/char/serial167.c: In function 'cd2401_rx_interrupt':
| drivers/char/serial167.c:630: warning: unused variable 'len'
| drivers/char/serial167.c: In function 'cy_ioctl':
| drivers/char/serial167.c:1531: warning: unused variable 'val'
Remove the variables to kill the warnings.
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Cc: Alan Cox <alan@lxorguk.ukuu.org.uk>
Cc: Greg KH <greg@kroah.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---
drivers/char/serial167.c | 2 --
1 file changed, 2 deletions(-)
diff -puN drivers/char/serial167.c~serial167-kill-unused-variables drivers/char/serial167.c
--- a/drivers/char/serial167.c~serial167-kill-unused-variables
+++ a/drivers/char/serial167.c
@@ -627,7 +627,6 @@ static irqreturn_t cd2401_rx_interrupt(i
char data;
int char_count;
int save_cnt;
- int len;
/* determine the channel and change to that context */
channel = (u_short) (base_addr[CyLICR] >> 2);
@@ -1528,7 +1527,6 @@ static int
cy_ioctl(struct tty_struct *tty, struct file *file,
unsigned int cmd, unsigned long arg)
{
- unsigned long val;
struct cyclades_port *info = tty->driver_data;
int ret_val = 0;
void __user *argp = (void __user *)arg;
_
Patches currently in -mm which might be from geert@linux-m68k.org are
origin.patch
linux-next.patch
endian-define-__byte_order.patch
m68k-use-asm-generic-scatterlisth.patch
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2010-05-06 19:11 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-05-06 16:09 [merged] serial167-kill-unused-variables.patch removed from -mm tree akpm
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox