Skip to content

Commit

Permalink
[PATCH] m32r: SMC91x driver update
Browse files Browse the repository at this point in the history 
Update SMC91x driver for m32r.

- Remove needless NONCACHE_OFFSET adjustment.
  > [PATCH 2.6.14-rc4] m32r: NONCACHE_OFFSET in _port2addr
  > Change _port2addr() not to add NONCACHE_OFFSET.
  > Adding NONCACHE_OFFSET requires needless address adjusting by a driver
  > using ioremap() like a SMC91x driver.

- Fix lots of warnings as following:
/usr/src/ctest/git/kernel/drivers/net/smc91x.c: In function `smc_reset':
/usr/src/ctest/git/kernel/drivers/net/smc91x.c:324: warning: passing arg 2 of `_outw' makes integer from pointer without a cast
/usr/src/ctest/git/kernel/drivers/net/smc91x.c:325: warning: passing arg 2 of `_outw' makes integer from pointer without a cast
/usr/src/ctest/git/kernel/drivers/net/smc91x.c:341: warning: passing arg 2 of `_outw' makes integer from pointer without a cast
/usr/src/ctest/git/kernel/drivers/net/smc91x.c:342: warning: passing arg 2 of `_outw' makes integer from pointer without a cast
  :
/usr/src/ctest/git/kernel/drivers/net/smc91x.c:1915: warning: passing arg 1 of `_inw' makes integer from pointer without a cast
/usr/src/ctest/git/kernel/drivers/net/smc91x.c:1915: warning: passing arg 1 of `_inw' makes integer from pointer without a cast

Signed-off-by: Hayato Fujiwara <fujiwara@linux-m32r.org>
Signed-off-by: Hirokazu Takata <takata@linux-m32r.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
  • Loading branch information
Hirokazu Takata authored and Linus Torvalds committed Oct 31, 2005
1 parent 1343f77 commit f3ac9fb
Show file tree
Hide file tree
Showing 5 changed files with 19 additions and 21 deletions.
6 changes: 3 additions & 3 deletions arch/m32r/kernel/io_m32700ut.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,11 +64,11 @@ static inline void *__port2addr_ata(unsigned long port)
* from 0x10000000 to 0x13ffffff on physical address.
* The base address of LAN controller(LAN91C111) is 0x300.
*/
#define LAN_IOSTART 0x300
#define LAN_IOEND 0x320
#define LAN_IOSTART 0xa0000300
#define LAN_IOEND 0xa0000320
static inline void *_port2addr_ne(unsigned long port)
{
return (void *)(port + NONCACHE_OFFSET + 0x10000000);
return (void *)(port + 0x10000000);
}
static inline void *_port2addr_usb(unsigned long port)
{
Expand Down
9 changes: 4 additions & 5 deletions arch/m32r/kernel/io_mappi2.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,6 @@ static inline void *_port2addr(unsigned long port)
return (void *)(port | (NONCACHE_OFFSET));
}

#define LAN_IOSTART 0x300
#define LAN_IOEND 0x320

#if defined(CONFIG_IDE) && !defined(CONFIG_M32R_CFC)
static inline void *__port2addr_ata(unsigned long port)
{
Expand All @@ -59,15 +56,17 @@ static inline void *__port2addr_ata(unsigned long port)
}
#endif

#define LAN_IOSTART 0xa0000300
#define LAN_IOEND 0xa0000320
#ifdef CONFIG_CHIP_OPSP
static inline void *_port2addr_ne(unsigned long port)
{
return (void *)(port + NONCACHE_OFFSET + 0x10000000);
return (void *)(port + 0x10000000);
}
#else
static inline void *_port2addr_ne(unsigned long port)
{
return (void *)(port + NONCACHE_OFFSET + 0x04000000);
return (void *)(port + 0x04000000);
}
#endif
static inline void *_port2addr_usb(unsigned long port)
Expand Down
7 changes: 3 additions & 4 deletions arch/m32r/kernel/io_mappi3.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,6 @@ static inline void *_port2addr(unsigned long port)
return (void *)(port + NONCACHE_OFFSET);
}

#define LAN_IOSTART 0x300
#define LAN_IOEND 0x320

#if defined(CONFIG_IDE) && !defined(CONFIG_M32R_CFC)
static inline void *__port2addr_ata(unsigned long port)
{
Expand All @@ -59,9 +56,11 @@ static inline void *__port2addr_ata(unsigned long port)
}
#endif

#define LAN_IOSTART 0xa0000300
#define LAN_IOEND 0xa0000320
static inline void *_port2addr_ne(unsigned long port)
{
return (void *)(port + NONCACHE_OFFSET + 0x10000000);
return (void *)(port + 0x10000000);
}

static inline void *_port2addr_usb(unsigned long port)
Expand Down
6 changes: 3 additions & 3 deletions arch/m32r/kernel/io_opsput.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,11 +44,11 @@ static inline void *_port2addr(unsigned long port)
* from 0x10000000 to 0x13ffffff on physical address.
* The base address of LAN controller(LAN91C111) is 0x300.
*/
#define LAN_IOSTART 0x300
#define LAN_IOEND 0x320
#define LAN_IOSTART 0xa0000300
#define LAN_IOEND 0xa0000320
static inline void *_port2addr_ne(unsigned long port)
{
return (void *)(port + NONCACHE_OFFSET + 0x10000000);
return (void *)(port + 0x10000000);
}
static inline void *_port2addr_usb(unsigned long port)
{
Expand Down
12 changes: 6 additions & 6 deletions drivers/net/smc91x.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -230,12 +230,12 @@ SMC_outw(u16 val, void __iomem *ioaddr, int reg)
#define SMC_CAN_USE_16BIT 1
#define SMC_CAN_USE_32BIT 0

#define SMC_inb(a, r) inb((a) + (r) - 0xa0000000)
#define SMC_inw(a, r) inw((a) + (r) - 0xa0000000)
#define SMC_outb(v, a, r) outb(v, (a) + (r) - 0xa0000000)
#define SMC_outw(v, a, r) outw(v, (a) + (r) - 0xa0000000)
#define SMC_insw(a, r, p, l) insw((a) + (r) - 0xa0000000, p, l)
#define SMC_outsw(a, r, p, l) outsw((a) + (r) - 0xa0000000, p, l)
#define SMC_inb(a, r) inb((u32)a) + (r))
#define SMC_inw(a, r) inw(((u32)a) + (r))
#define SMC_outb(v, a, r) outb(v, ((u32)a) + (r))
#define SMC_outw(v, a, r) outw(v, ((u32)a) + (r))
#define SMC_insw(a, r, p, l) insw(((u32)a) + (r), p, l)
#define SMC_outsw(a, r, p, l) outsw(((u32)a) + (r), p, l)

#define set_irq_type(irq, type) do {} while(0)

Expand Down

0 comments on commit f3ac9fb

Please sign in to comment.