pcmcia: replace kio_addr_t with unsigned int everywhere
Remove kio_addr_t, and replace it with unsigned int. No known architecture needs more than 32 bits for IO addresses and ports and having a separate type for it is just messy. Signed-off-by: Olof Johansson <olof@lixom.net> Cc: Christoph Hellwig <hch@lst.de> Cc: Matthew Wilcox <matthew@wil.cx> Cc: Alan Cox <alan@lxorguk.ukuu.org.uk> Cc: Dominik Brodowski <linux@dominikbrodowski.net> Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
committed by
Linus Torvalds
parent
ecb8a8472f
commit
906da809c5
@ -195,7 +195,7 @@ static int netwave_pcmcia_config(struct pcmcia_device *arg); /* Runs after card
|
||||
static void netwave_detach(struct pcmcia_device *p_dev); /* Destroy instance */
|
||||
|
||||
/* Hardware configuration */
|
||||
static void netwave_doreset(kio_addr_t iobase, u_char __iomem *ramBase);
|
||||
static void netwave_doreset(unsigned int iobase, u_char __iomem *ramBase);
|
||||
static void netwave_reset(struct net_device *dev);
|
||||
|
||||
/* Misc device stuff */
|
||||
@ -309,7 +309,7 @@ static inline void wait_WOC(unsigned int iobase)
|
||||
}
|
||||
|
||||
static void netwave_snapshot(netwave_private *priv, u_char __iomem *ramBase,
|
||||
kio_addr_t iobase) {
|
||||
unsigned int iobase) {
|
||||
u_short resultBuffer;
|
||||
|
||||
/* if time since last snapshot is > 1 sec. (100 jiffies?) then take
|
||||
@ -340,7 +340,7 @@ static void netwave_snapshot(netwave_private *priv, u_char __iomem *ramBase,
|
||||
static struct iw_statistics *netwave_get_wireless_stats(struct net_device *dev)
|
||||
{
|
||||
unsigned long flags;
|
||||
kio_addr_t iobase = dev->base_addr;
|
||||
unsigned int iobase = dev->base_addr;
|
||||
netwave_private *priv = netdev_priv(dev);
|
||||
u_char __iomem *ramBase = priv->ramBase;
|
||||
struct iw_statistics* wstats;
|
||||
@ -471,7 +471,7 @@ static int netwave_set_nwid(struct net_device *dev,
|
||||
char *extra)
|
||||
{
|
||||
unsigned long flags;
|
||||
kio_addr_t iobase = dev->base_addr;
|
||||
unsigned int iobase = dev->base_addr;
|
||||
netwave_private *priv = netdev_priv(dev);
|
||||
u_char __iomem *ramBase = priv->ramBase;
|
||||
|
||||
@ -518,7 +518,7 @@ static int netwave_set_scramble(struct net_device *dev,
|
||||
char *key)
|
||||
{
|
||||
unsigned long flags;
|
||||
kio_addr_t iobase = dev->base_addr;
|
||||
unsigned int iobase = dev->base_addr;
|
||||
netwave_private *priv = netdev_priv(dev);
|
||||
u_char __iomem *ramBase = priv->ramBase;
|
||||
|
||||
@ -621,7 +621,7 @@ static int netwave_get_snap(struct net_device *dev,
|
||||
char *extra)
|
||||
{
|
||||
unsigned long flags;
|
||||
kio_addr_t iobase = dev->base_addr;
|
||||
unsigned int iobase = dev->base_addr;
|
||||
netwave_private *priv = netdev_priv(dev);
|
||||
u_char __iomem *ramBase = priv->ramBase;
|
||||
|
||||
@ -874,7 +874,7 @@ static int netwave_resume(struct pcmcia_device *link)
|
||||
*
|
||||
* Proper hardware reset of the card.
|
||||
*/
|
||||
static void netwave_doreset(kio_addr_t ioBase, u_char __iomem *ramBase)
|
||||
static void netwave_doreset(unsigned int ioBase, u_char __iomem *ramBase)
|
||||
{
|
||||
/* Reset card */
|
||||
wait_WOC(ioBase);
|
||||
@ -892,7 +892,7 @@ static void netwave_reset(struct net_device *dev) {
|
||||
/* u_char state; */
|
||||
netwave_private *priv = netdev_priv(dev);
|
||||
u_char __iomem *ramBase = priv->ramBase;
|
||||
kio_addr_t iobase = dev->base_addr;
|
||||
unsigned int iobase = dev->base_addr;
|
||||
|
||||
DEBUG(0, "netwave_reset: Done with hardware reset\n");
|
||||
|
||||
@ -973,7 +973,7 @@ static int netwave_hw_xmit(unsigned char* data, int len,
|
||||
|
||||
netwave_private *priv = netdev_priv(dev);
|
||||
u_char __iomem * ramBase = priv->ramBase;
|
||||
kio_addr_t iobase = dev->base_addr;
|
||||
unsigned int iobase = dev->base_addr;
|
||||
|
||||
/* Disable interrupts & save flags */
|
||||
spin_lock_irqsave(&priv->spinlock, flags);
|
||||
@ -1065,7 +1065,7 @@ static int netwave_start_xmit(struct sk_buff *skb, struct net_device *dev) {
|
||||
*/
|
||||
static irqreturn_t netwave_interrupt(int irq, void* dev_id)
|
||||
{
|
||||
kio_addr_t iobase;
|
||||
unsigned int iobase;
|
||||
u_char __iomem *ramBase;
|
||||
struct net_device *dev = (struct net_device *)dev_id;
|
||||
struct netwave_private *priv = netdev_priv(dev);
|
||||
@ -1235,7 +1235,7 @@ static int netwave_rx(struct net_device *dev)
|
||||
{
|
||||
netwave_private *priv = netdev_priv(dev);
|
||||
u_char __iomem *ramBase = priv->ramBase;
|
||||
kio_addr_t iobase = dev->base_addr;
|
||||
unsigned int iobase = dev->base_addr;
|
||||
u_char rxStatus;
|
||||
struct sk_buff *skb = NULL;
|
||||
unsigned int curBuffer,
|
||||
@ -1388,7 +1388,7 @@ module_exit(exit_netwave_cs);
|
||||
*/
|
||||
static void set_multicast_list(struct net_device *dev)
|
||||
{
|
||||
kio_addr_t iobase = dev->base_addr;
|
||||
unsigned int iobase = dev->base_addr;
|
||||
netwave_private *priv = netdev_priv(dev);
|
||||
u_char __iomem * ramBase = priv->ramBase;
|
||||
u_char rcvMode = 0;
|
||||
|
Reference in New Issue
Block a user