diff options
| author | Mike Frysinger <vapier@gentoo.org> | 2010-07-05 02:29:21 -0400 |
|---|---|---|
| committer | Ben Warren <biggerbadderben@gmail.com> | 2010-07-12 00:02:11 -0700 |
| commit | 67bee2fb64efae2591057c2fd651c526070f4f9a (patch) | |
| tree | dd4a67bb0788b6d11e803079a8687873896dcf16 /drivers/net | |
| parent | 26918b7994b5eb39aa83ccd2a760cd228c71c140 (diff) | |
| download | talos-obmc-uboot-67bee2fb64efae2591057c2fd651c526070f4f9a.tar.gz talos-obmc-uboot-67bee2fb64efae2591057c2fd651c526070f4f9a.zip | |
net: dm9000x: re-add casts to I/O pointers to fix gcc warnings
The DM9000 in/out helper functions were casting the register address when
it was accessing things directly (pre commit a45dde2293c816138e53c). But
when it was changed to using the in/out helpers, those casts were dropped
because those functions don't take pointers. Even more recently, those
functions were then changed to use the read/write helpers, but the casts
were not re-added. This is necessary because the read/write helpers do
take pointers. Otherwise we get a lot of warnings like:
dm9000x.c: In function 'dm9000_inblk_8bit':
dm9000x.c:172: warning: passing argument 1 of 'readb'
makes pointer from integer without a cast
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Tested-by: Thomas Weber <weber@corscience.de>
Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/dm9000x.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/net/dm9000x.c b/drivers/net/dm9000x.c index 137e41fef5..709f67aac2 100644 --- a/drivers/net/dm9000x.c +++ b/drivers/net/dm9000x.c @@ -117,12 +117,12 @@ static void DM9000_iow(int reg, u8 value); /* DM9000 network board routine ---------------------------- */ -#define DM9000_outb(d,r) writeb(d, r) -#define DM9000_outw(d,r) writew(d, r) -#define DM9000_outl(d,r) writel(d, r) -#define DM9000_inb(r) readb(r) -#define DM9000_inw(r) readw(r) -#define DM9000_inl(r) readl(r) +#define DM9000_outb(d,r) writeb(d, (volatile u8 *)(r)) +#define DM9000_outw(d,r) writew(d, (volatile u16 *)(r)) +#define DM9000_outl(d,r) writel(d, (volatile u32 *)(r)) +#define DM9000_inb(r) readb((volatile u8 *)(r)) +#define DM9000_inw(r) readw((volatile u16 *)(r)) +#define DM9000_inl(r) readl((volatile u32 *)(r)) #ifdef CONFIG_DM9000_DEBUG static void |
