The patch titled
isicom-bring-into-coding-style-fix
has been removed from the -mm tree. Its filename was
isicom-bring-into-coding-style-fix.patch
This patch was dropped because it was folded into isicom-bring-into-coding-style.patch
The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/
------------------------------------------------------
Subject: isicom-bring-into-coding-style-fix
From: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
arm:
drivers/char/isicom.c:817: warning: comparison between pointer and integer
drivers/char/isicom.c: At top level:
- We expect a variable called `page' to be `struct page *'. Rename it.
- Fix warning there.
drivers/char/isicom.c:1473: warning: initialization from incompatible pointer type
- Fix that too.
Cc: Alan Cox <alan@xxxxxxxxxxxxxxxxxxx>
Cc: Jiri Slaby <jirislaby@xxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
drivers/char/isicom.c | 24 ++++++++++++------------
1 file changed, 12 insertions(+), 12 deletions(-)
diff -puN drivers/char/isicom.c~isicom-bring-into-coding-style-fix drivers/char/isicom.c
--- a/drivers/char/isicom.c~isicom-bring-into-coding-style-fix
+++ a/drivers/char/isicom.c
@@ -813,14 +813,15 @@ static int isicom_setup_port(struct isi_
return 0;
if (!port->xmit_buf) {
/* Relies on BKL */
- unsigned long page = get_zeroed_page(GFP_KERNEL);
- if (page == NULL)
+ void *xmit_buf = (void *)get_zeroed_page(GFP_KERNEL);
+
+ if (xmit_buf == NULL)
return -ENOMEM;
if (port->xmit_buf) {
- free_page(page);
+ free_page((unsigned long)xmit_buf);
return -ERESTARTSYS;
}
- port->xmit_buf = (unsigned char *) page;
+ port->xmit_buf = xmit_buf;
}
spin_lock_irqsave(&card->card_lock, flags);
@@ -1139,29 +1140,28 @@ static int isicom_write(struct tty_struc
}
/* put_char et all */
-static int isicom_put_char(struct tty_struct *tty, unsigned char ch)
+static void isicom_put_char(struct tty_struct *tty, unsigned char ch)
{
struct isi_port *port = tty->driver_data;
struct isi_board *card = port->card;
unsigned long flags;
if (isicom_paranoia_check(port, tty->name, "isicom_put_char"))
- return 0;
+ return;
if (!port->xmit_buf)
- return 0;
+ return;
spin_lock_irqsave(&card->card_lock, flags);
- if (port->xmit_cnt >= SERIAL_XMIT_SIZE - 1) {
- spin_unlock_irqrestore(&card->card_lock, flags);
- return 0;
- }
+ if (port->xmit_cnt >= SERIAL_XMIT_SIZE - 1)
+ goto out;
port->xmit_buf[port->xmit_head++] = ch;
port->xmit_head &= (SERIAL_XMIT_SIZE - 1);
port->xmit_cnt++;
spin_unlock_irqrestore(&card->card_lock, flags);
- return 1;
+out:
+ return;
}
/* flush_chars et all */
_
Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are
origin.patch
blackfin-serial-driver-this-driver-enable-sports-on-blackfin-emulate-uart-fix.patch
sgi-altix-mmtimer-allow-larger-number-of-timers-per-node.patch
epcac-static-functions-and-integer-as-null-pointer-fixes.patch
isicom-bring-into-coding-style.patch
isicom-bring-into-coding-style-fix.patch
tty-the-big-operations-rework-fix-2.patch
tty-the-big-operations-rework-isicom-fix.patch
tty-the-big-operations-rework-simserial-fix.patch
tty-the-big-operations-rework-vs-git-kgdb-light.patch
tty-the-big-operations-rework-vs-kgdb-2.patch
devpts-factor-out-pty-index-allocation-fix.patch
mm-bdi-export-bdi-attributes-in-sysfs-ia64-fix.patch
fuse-fix-race-in-llseek-fix.patch
basic-braille-screen-reader-support-ppc-fix.patch
hfs-fix-warning-with-64k-page_size.patch
hfsplus-fix-warning-with-64k-page_size.patch
alloc_uid-cleanup.patch
add-macros-similar-to-min-max-min_t-max_t.patch
rename-div64_64-to-div64_u64-fix.patch
reiser4.patch
jens-broke-reiser4patch-added-to-mm-tree.patch
page-owner-tracking-leak-detector.patch
nr_blockdev_pages-in_interrupt-warning.patch
slab-leaks3-default-y.patch
put_bh-debug.patch
shrink_slab-handle-bad-shrinkers.patch
getblk-handle-2tb-devices.patch
getblk-handle-2tb-devices-fix.patch
undeprecate-pci_find_device.patch
notify_change-callers-must-hold-i_mutex.patch
x86-ioremap-add-checks-for-virtual-addresses-fix.patch
profile-likely-unlikely-macros.patch
drivers-net-bonding-bond_sysfsc-suppress-uninitialized-var-warning.patch
w1-build-fix.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
