The patch titled
     Char: cyclades, fix sparse warning
has been added to the -mm tree.  Its filename is
     char-cyclades-fix-sparse-warning.patch

*** Remember to use Documentation/SubmitChecklist when testing your code ***

See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this

------------------------------------------------------
Subject: Char: cyclades, fix sparse warning
From: Jiri Slaby <[EMAIL PROTECTED]>

cyclades, fix sparse warning

Signed-off-by: Jiri Slaby <[EMAIL PROTECTED]>
Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
---

 drivers/char/cyclades.c |   18 ++++++++----------
 1 files changed, 8 insertions(+), 10 deletions(-)

diff -puN drivers/char/cyclades.c~char-cyclades-fix-sparse-warning 
drivers/char/cyclades.c
--- a/drivers/char/cyclades.c~char-cyclades-fix-sparse-warning
+++ a/drivers/char/cyclades.c
@@ -1890,11 +1890,11 @@ static void cyz_poll(unsigned long arg)
        struct cyclades_card *cinfo;
        struct cyclades_port *info;
        struct tty_struct *tty;
-       static struct FIRM_ID *firm_id;
-       static struct ZFW_CTRL *zfw_ctrl;
-       static struct BOARD_CTRL *board_ctrl;
-       static struct CH_CTRL *ch_ctrl;
-       static struct BUF_CTRL *buf_ctrl;
+       struct FIRM_ID __iomem *firm_id;
+       struct ZFW_CTRL __iomem *zfw_ctrl;
+       struct BOARD_CTRL __iomem *board_ctrl;
+       struct CH_CTRL __iomem *ch_ctrl;
+       struct BUF_CTRL __iomem *buf_ctrl;
        unsigned long expires = jiffies + HZ;
        int card, port;
 
@@ -2038,7 +2038,6 @@ static int startup(struct cyclades_port 
                struct ZFW_CTRL __iomem *zfw_ctrl;
                struct BOARD_CTRL __iomem *board_ctrl;
                struct CH_CTRL __iomem *ch_ctrl;
-               int retval;
 
                base_addr = card->base_addr;
 
@@ -2410,7 +2409,6 @@ block_til_ready(struct tty_struct *tty, 
                struct ZFW_CTRL __iomem *zfw_ctrl;
                struct BOARD_CTRL __iomem *board_ctrl;
                struct CH_CTRL __iomem *ch_ctrl;
-               int retval;
 
                base_addr = cinfo->base_addr;
                firm_id = base_addr + ID_ADDRESS;
@@ -4906,7 +4904,7 @@ static int __devinit cyz_load_fw(struct 
        struct FIRM_ID __iomem *fid = base_addr + ID_ADDRESS;
        struct CUSTOM_REG __iomem *cust = base_addr;
        struct ZFW_CTRL __iomem *pt_zfwctrl;
-       u8 *tmp;
+       void __iomem *tmp;
        u32 mailbox, status;
        unsigned int i;
        int retval;
@@ -4968,13 +4966,13 @@ static int __devinit cyz_load_fw(struct 
        udelay(100);
 
        /* clear memory */
-       for (tmp = base_addr; (void *)tmp < base_addr + RAM_SIZE; tmp++)
+       for (tmp = base_addr; tmp < base_addr + RAM_SIZE; tmp++)
                cy_writeb(tmp, 255);
        if (mailbox != 0) {
                /* set window to last 512K of RAM */
                cy_writel(&ctl_addr->loc_addr_base, WIN_RAM + RAM_SIZE);
                //sleep(1);
-               for (tmp = base_addr; (void *)tmp < base_addr + RAM_SIZE; tmp++)
+               for (tmp = base_addr; tmp < base_addr + RAM_SIZE; tmp++)
                        cy_writeb(tmp, 255);
                /* set window to beginning of RAM */
                cy_writel(&ctl_addr->loc_addr_base, WIN_RAM);
_

Patches currently in -mm which might be from [EMAIL PROTECTED] are

cinergyt2-fix-file-release-handler.patch
auerswald-fix-file-release-handler.patch
char-cyclades-fix-deadlock.patch
char-cyclades-add-firmware-loading.patch
char-cyclades-fix-sparse-warning.patch
shrink_slab-handle-bad-shrinkers.patch

-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to