diff options
| author | Mark Hounschell <markh@compro.net> | 2014-04-24 09:22:12 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-05-16 12:16:58 -0700 |
| commit | 630b2abf9cee48d5db766a4241caa0132b92de09 (patch) | |
| tree | 4a078e6ef461b4a386232d73b7b25f1c50df4f08 /drivers/staging/dgap | |
| parent | 6a30cddba4d2415cc41cd7db30d79122490a224d (diff) | |
staging: dgap: fix a few misc sparse warnings
This patch fixes a few misc sparse warnings related to __iomem
Signed-off-by: Mark Hounschell <markh@compro.net>
Tested-by: Mark Hounschell <markh@compro.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/dgap')
| -rw-r--r-- | drivers/staging/dgap/dgap.c | 20 | ||||
| -rw-r--r-- | drivers/staging/dgap/dgap.h | 6 |
2 files changed, 13 insertions, 13 deletions
diff --git a/drivers/staging/dgap/dgap.c b/drivers/staging/dgap/dgap.c index 1e7f40eff90..67e4adf1dba 100644 --- a/drivers/staging/dgap/dgap.c +++ b/drivers/staging/dgap/dgap.c @@ -1365,8 +1365,8 @@ static int dgap_tty_init(struct board_t *brd) ch = brd->channels[0]; vaddr = brd->re_map_membase; - bs = (struct bs_t *) ((ulong) vaddr + CHANBUF); - cm = (struct cm_t *) ((ulong) vaddr + CMDBUF); + bs = (struct bs_t __iomem *) ((ulong) vaddr + CHANBUF); + cm = (struct cm_t __iomem *) ((ulong) vaddr + CMDBUF); brd->bd_bs = bs; @@ -1786,7 +1786,7 @@ static void dgap_input(struct channel_t *ch) if (s <= 0) break; - memcpy_fromio(buf, (char *) ch->ch_raddr + tail, s); + memcpy_fromio(buf, ch->ch_raddr + tail, s); dgap_sniff_nowait_nolock(ch, "USER READ", buf, s); tail += s; @@ -2742,7 +2742,7 @@ static int dgap_tty_write(struct tty_struct *tty, const unsigned char *buf, struct channel_t *ch = NULL; struct un_t *un = NULL; struct bs_t __iomem *bs; - char *vaddr = NULL; + char __iomem *vaddr; u16 head, tail, tmask, remain; int bufcount = 0, n = 0; int orig_count = 0; @@ -4935,7 +4935,7 @@ static void dgap_cmdw_ext(struct channel_t *ch, u16 cmd, u16 word, uint ncmds) if (!vaddr) return; - cm_addr = (struct cm_t *) (vaddr + CMDBUF); + cm_addr = (struct cm_t __iomem *) (vaddr + CMDBUF); head = readw(&(cm_addr->cm_head)); /* @@ -4951,19 +4951,19 @@ static void dgap_cmdw_ext(struct channel_t *ch, u16 cmd, u16 word, uint ncmds) */ /* Write an FF to tell the FEP that we want an extended command */ - writeb((u8) 0xff, (char *) (vaddr + head + CMDSTART + 0)); + writeb((u8) 0xff, (vaddr + head + CMDSTART + 0)); - writeb((u8) ch->ch_portnum, (u8 *) (vaddr + head + CMDSTART + 1)); - writew((u16) cmd, (char *) (vaddr + head + CMDSTART + 2)); + writeb((u8) ch->ch_portnum, (vaddr + head + CMDSTART + 1)); + writew((u16) cmd, (vaddr + head + CMDSTART + 2)); /* * If the second part of the command won't fit, * put it at the beginning of the circular buffer. */ if (((head + 4) >= ((CMDMAX - CMDSTART)) || (head & 03))) - writew((u16) word, (char *) (vaddr + CMDSTART)); + writew((u16) word, (vaddr + CMDSTART)); else - writew((u16) word, (char *) (vaddr + head + CMDSTART + 4)); + writew((u16) word, (vaddr + head + CMDSTART + 4)); head = (head + 8) & (CMDMAX - CMDSTART - 4); diff --git a/drivers/staging/dgap/dgap.h b/drivers/staging/dgap/dgap.h index e8bb8c630cc..2bbb51ff12f 100644 --- a/drivers/staging/dgap/dgap.h +++ b/drivers/staging/dgap/dgap.h @@ -971,9 +971,9 @@ struct channel_t { struct bs_t __iomem *ch_bs; /* Base structure pointer */ struct cm_t __iomem *ch_cm; /* Command queue pointer */ struct board_t *ch_bd; /* Board structure pointer */ - unsigned char *ch_vaddr; /* FEP memory origin */ - unsigned char *ch_taddr; /* Write buffer origin */ - unsigned char *ch_raddr; /* Read buffer origin */ + u8 __iomem *ch_vaddr; /* FEP memory origin */ + u8 __iomem *ch_taddr; /* Write buffer origin */ + u8 __iomem *ch_raddr; /* Read buffer origin */ struct digi_t ch_digi; /* Transparent Print structure */ struct un_t ch_tun; /* Terminal unit info */ struct un_t ch_pun; /* Printer unit info */ |