Commit c4923b4f authored by Jiri Slaby's avatar Jiri Slaby Committed by Linus Torvalds

Char: cyclades, fix sparse warning

cyclades, fix sparse warning
Signed-off-by: default avatarJiri Slaby <jirislaby@gmail.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 054f5b0a
...@@ -1890,11 +1890,11 @@ static void cyz_poll(unsigned long arg) ...@@ -1890,11 +1890,11 @@ static void cyz_poll(unsigned long arg)
struct cyclades_card *cinfo; struct cyclades_card *cinfo;
struct cyclades_port *info; struct cyclades_port *info;
struct tty_struct *tty; struct tty_struct *tty;
static struct FIRM_ID *firm_id; struct FIRM_ID __iomem *firm_id;
static struct ZFW_CTRL *zfw_ctrl; struct ZFW_CTRL __iomem *zfw_ctrl;
static struct BOARD_CTRL *board_ctrl; struct BOARD_CTRL __iomem *board_ctrl;
static struct CH_CTRL *ch_ctrl; struct CH_CTRL __iomem *ch_ctrl;
static struct BUF_CTRL *buf_ctrl; struct BUF_CTRL __iomem *buf_ctrl;
unsigned long expires = jiffies + HZ; unsigned long expires = jiffies + HZ;
int card, port; int card, port;
...@@ -2038,7 +2038,6 @@ static int startup(struct cyclades_port *info) ...@@ -2038,7 +2038,6 @@ static int startup(struct cyclades_port *info)
struct ZFW_CTRL __iomem *zfw_ctrl; struct ZFW_CTRL __iomem *zfw_ctrl;
struct BOARD_CTRL __iomem *board_ctrl; struct BOARD_CTRL __iomem *board_ctrl;
struct CH_CTRL __iomem *ch_ctrl; struct CH_CTRL __iomem *ch_ctrl;
int retval;
base_addr = card->base_addr; base_addr = card->base_addr;
...@@ -2410,7 +2409,6 @@ block_til_ready(struct tty_struct *tty, struct file *filp, ...@@ -2410,7 +2409,6 @@ block_til_ready(struct tty_struct *tty, struct file *filp,
struct ZFW_CTRL __iomem *zfw_ctrl; struct ZFW_CTRL __iomem *zfw_ctrl;
struct BOARD_CTRL __iomem *board_ctrl; struct BOARD_CTRL __iomem *board_ctrl;
struct CH_CTRL __iomem *ch_ctrl; struct CH_CTRL __iomem *ch_ctrl;
int retval;
base_addr = cinfo->base_addr; base_addr = cinfo->base_addr;
firm_id = base_addr + ID_ADDRESS; firm_id = base_addr + ID_ADDRESS;
...@@ -4902,7 +4900,7 @@ static int __devinit cyz_load_fw(struct pci_dev *pdev, void __iomem *base_addr, ...@@ -4902,7 +4900,7 @@ static int __devinit cyz_load_fw(struct pci_dev *pdev, void __iomem *base_addr,
struct FIRM_ID __iomem *fid = base_addr + ID_ADDRESS; struct FIRM_ID __iomem *fid = base_addr + ID_ADDRESS;
struct CUSTOM_REG __iomem *cust = base_addr; struct CUSTOM_REG __iomem *cust = base_addr;
struct ZFW_CTRL __iomem *pt_zfwctrl; struct ZFW_CTRL __iomem *pt_zfwctrl;
u8 *tmp; void __iomem *tmp;
u32 mailbox, status; u32 mailbox, status;
unsigned int i; unsigned int i;
int retval; int retval;
...@@ -4964,13 +4962,13 @@ static int __devinit cyz_load_fw(struct pci_dev *pdev, void __iomem *base_addr, ...@@ -4964,13 +4962,13 @@ static int __devinit cyz_load_fw(struct pci_dev *pdev, void __iomem *base_addr,
udelay(100); udelay(100);
/* clear memory */ /* 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); cy_writeb(tmp, 255);
if (mailbox != 0) { if (mailbox != 0) {
/* set window to last 512K of RAM */ /* set window to last 512K of RAM */
cy_writel(&ctl_addr->loc_addr_base, WIN_RAM + RAM_SIZE); cy_writel(&ctl_addr->loc_addr_base, WIN_RAM + RAM_SIZE);
//sleep(1); //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); cy_writeb(tmp, 255);
/* set window to beginning of RAM */ /* set window to beginning of RAM */
cy_writel(&ctl_addr->loc_addr_base, WIN_RAM); cy_writel(&ctl_addr->loc_addr_base, WIN_RAM);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment