Skip to content

L
linux
Commit 8809c077 authored by David S. Miller's avatar David S. Miller
Browse files
Options

[SUNHME]: Fix iomem warnings. 

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent ae506c09
Show whitespace changes
Inline Side-by-side
Showing with 46 additions and 45 deletions
drivers/net/sunhme.c
View file @ 8809c077
...@@ -203,12 +203,12 @@ MODULE_DEVICE_TABLE(pci, happymeal_pci_ids); ...@@ -203,12 +203,12 @@ MODULE_DEVICE_TABLE(pci, happymeal_pci_ids);
*/ */
#if defined(CONFIG_SBUS) && defined(CONFIG_PCI) #if defined(CONFIG_SBUS) && defined(CONFIG_PCI)
static void sbus_hme_write32(unsigned long reg, u32 val) static void sbus_hme_write32(void __iomem *reg, u32 val)
{ {
sbus_writel(val, reg); sbus_writel(val, reg);
} }
static u32 sbus_hme_read32(unsigned long reg) static u32 sbus_hme_read32(void __iomem *reg)
{ {
return sbus_readl(reg); return sbus_readl(reg);
} }
...@@ -232,12 +232,12 @@ static u32 sbus_hme_read_desc32(u32 *p) ...@@ -232,12 +232,12 @@ static u32 sbus_hme_read_desc32(u32 *p)
return *p; return *p;
} }
static void pci_hme_write32(unsigned long reg, u32 val) static void pci_hme_write32(void __iomem *reg, u32 val)
{ {
writel(val, reg); writel(val, reg);
} }
static u32 pci_hme_read32(unsigned long reg) static u32 pci_hme_read32(void __iomem *reg)
{ {
return readl(reg); return readl(reg);
} }
...@@ -354,7 +354,7 @@ do { (__txd)->tx_addr = cpu_to_le32(__addr); \ ...@@ -354,7 +354,7 @@ do { (__txd)->tx_addr = cpu_to_le32(__addr); \
/* Oh yes, the MIF BitBang is mighty fun to program. BitBucket is more like it. */ /* Oh yes, the MIF BitBang is mighty fun to program. BitBucket is more like it. */
static void BB_PUT_BIT(struct happy_meal *hp, unsigned long tregs, int bit) static void BB_PUT_BIT(struct happy_meal *hp, void __iomem *tregs, int bit)
{ {
hme_write32(hp, tregs + TCVR_BBDATA, bit); hme_write32(hp, tregs + TCVR_BBDATA, bit);
hme_write32(hp, tregs + TCVR_BBCLOCK, 0); hme_write32(hp, tregs + TCVR_BBCLOCK, 0);
...@@ -362,7 +362,7 @@ static void BB_PUT_BIT(struct happy_meal *hp, unsigned long tregs, int bit) ...@@ -362,7 +362,7 @@ static void BB_PUT_BIT(struct happy_meal *hp, unsigned long tregs, int bit)
} }
#if 0 #if 0
static u32 BB_GET_BIT(struct happy_meal *hp, unsigned long tregs, int internal) static u32 BB_GET_BIT(struct happy_meal *hp, void __iomem *tregs, int internal)
{ {
u32 ret; u32 ret;
...@@ -378,7 +378,7 @@ static u32 BB_GET_BIT(struct happy_meal *hp, unsigned long tregs, int internal) ...@@ -378,7 +378,7 @@ static u32 BB_GET_BIT(struct happy_meal *hp, unsigned long tregs, int internal)
} }
#endif #endif
static u32 BB_GET_BIT2(struct happy_meal *hp, unsigned long tregs, int internal) static u32 BB_GET_BIT2(struct happy_meal *hp, void __iomem *tregs, int internal)
{ {
u32 retval; u32 retval;
...@@ -397,7 +397,7 @@ static u32 BB_GET_BIT2(struct happy_meal *hp, unsigned long tregs, int internal) ...@@ -397,7 +397,7 @@ static u32 BB_GET_BIT2(struct happy_meal *hp, unsigned long tregs, int internal)
#define TCVR_FAILURE 0x80000000 /* Impossible MIF read value */ #define TCVR_FAILURE 0x80000000 /* Impossible MIF read value */
static int happy_meal_bb_read(struct happy_meal *hp, static int happy_meal_bb_read(struct happy_meal *hp,
unsigned long tregs, int reg) void __iomem *tregs, int reg)
{ {
u32 tmp; u32 tmp;
int retval = 0; int retval = 0;
...@@ -443,7 +443,7 @@ static int happy_meal_bb_read(struct happy_meal *hp, ...@@ -443,7 +443,7 @@ static int happy_meal_bb_read(struct happy_meal *hp,
} }
static void happy_meal_bb_write(struct happy_meal *hp, static void happy_meal_bb_write(struct happy_meal *hp,
unsigned long tregs, int reg, void __iomem *tregs, int reg,
unsigned short value) unsigned short value)
{ {
u32 tmp; u32 tmp;
...@@ -488,7 +488,7 @@ static void happy_meal_bb_write(struct happy_meal *hp, ...@@ -488,7 +488,7 @@ static void happy_meal_bb_write(struct happy_meal *hp,
#define TCVR_READ_TRIES 16 #define TCVR_READ_TRIES 16
static int happy_meal_tcvr_read(struct happy_meal *hp, static int happy_meal_tcvr_read(struct happy_meal *hp,
unsigned long tregs, int reg) void __iomem *tregs, int reg)
{ {
int tries = TCVR_READ_TRIES; int tries = TCVR_READ_TRIES;
int retval; int retval;
...@@ -520,7 +520,7 @@ static int happy_meal_tcvr_read(struct happy_meal *hp, ...@@ -520,7 +520,7 @@ static int happy_meal_tcvr_read(struct happy_meal *hp,
#define TCVR_WRITE_TRIES 16 #define TCVR_WRITE_TRIES 16
static void happy_meal_tcvr_write(struct happy_meal *hp, static void happy_meal_tcvr_write(struct happy_meal *hp,
unsigned long tregs, int reg, void __iomem *tregs, int reg,
unsigned short value) unsigned short value)
{ {
int tries = TCVR_WRITE_TRIES; int tries = TCVR_WRITE_TRIES;
...@@ -579,7 +579,7 @@ static void happy_meal_tcvr_write(struct happy_meal *hp, ...@@ -579,7 +579,7 @@ static void happy_meal_tcvr_write(struct happy_meal *hp,
* service routine, and the chip is reset, or the link is ifconfig'd down * service routine, and the chip is reset, or the link is ifconfig'd down
* and then back up, this entire process repeats itself all over again. * and then back up, this entire process repeats itself all over again.
*/ */
static int try_next_permutation(struct happy_meal *hp, unsigned long tregs) static int try_next_permutation(struct happy_meal *hp, void __iomem *tregs)
{ {
hp->sw_bmcr = happy_meal_tcvr_read(hp, tregs, MII_BMCR); hp->sw_bmcr = happy_meal_tcvr_read(hp, tregs, MII_BMCR);
...@@ -603,7 +603,7 @@ static int try_next_permutation(struct happy_meal *hp, unsigned long tregs) ...@@ -603,7 +603,7 @@ static int try_next_permutation(struct happy_meal *hp, unsigned long tregs)
return -1; return -1;
} }
static void display_link_mode(struct happy_meal *hp, unsigned long tregs) static void display_link_mode(struct happy_meal *hp, void __iomem *tregs)
{ {
printk(KERN_INFO "%s: Link is up using ", hp->dev->name); printk(KERN_INFO "%s: Link is up using ", hp->dev->name);
if (hp->tcvr_type == external) if (hp->tcvr_type == external)
...@@ -625,7 +625,7 @@ static void display_link_mode(struct happy_meal *hp, unsigned long tregs) ...@@ -625,7 +625,7 @@ static void display_link_mode(struct happy_meal *hp, unsigned long tregs)
} }
} }
static void display_forced_link_mode(struct happy_meal *hp, unsigned long tregs) static void display_forced_link_mode(struct happy_meal *hp, void __iomem *tregs)
{ {
printk(KERN_INFO "%s: Link has been forced up using ", hp->dev->name); printk(KERN_INFO "%s: Link has been forced up using ", hp->dev->name);
if (hp->tcvr_type == external) if (hp->tcvr_type == external)
...@@ -644,7 +644,7 @@ static void display_forced_link_mode(struct happy_meal *hp, unsigned long tregs) ...@@ -644,7 +644,7 @@ static void display_forced_link_mode(struct happy_meal *hp, unsigned long tregs)
printk("Half Duplex.\n"); printk("Half Duplex.\n");
} }
static int set_happy_link_modes(struct happy_meal *hp, unsigned long tregs) static int set_happy_link_modes(struct happy_meal *hp, void __iomem *tregs)
{ {
int full; int full;
...@@ -708,7 +708,7 @@ static int happy_meal_init(struct happy_meal *hp); ...@@ -708,7 +708,7 @@ static int happy_meal_init(struct happy_meal *hp);
static int is_lucent_phy(struct happy_meal *hp) static int is_lucent_phy(struct happy_meal *hp)
{ {
unsigned long tregs = hp->tcvregs; void __iomem *tregs = hp->tcvregs;
unsigned short mr2, mr3; unsigned short mr2, mr3;
int ret = 0; int ret = 0;
...@@ -724,7 +724,7 @@ static int is_lucent_phy(struct happy_meal *hp) ...@@ -724,7 +724,7 @@ static int is_lucent_phy(struct happy_meal *hp)
static void happy_meal_timer(unsigned long data) static void happy_meal_timer(unsigned long data)
{ {
struct happy_meal *hp = (struct happy_meal *) data; struct happy_meal *hp = (struct happy_meal *) data;
unsigned long tregs = hp->tcvregs; void __iomem *tregs = hp->tcvregs;
int restart_timer = 0; int restart_timer = 0;
spin_lock_irq(&hp->happy_lock); spin_lock_irq(&hp->happy_lock);
...@@ -905,7 +905,7 @@ static void happy_meal_timer(unsigned long data) ...@@ -905,7 +905,7 @@ static void happy_meal_timer(unsigned long data)
#define RX_RESET_TRIES 32 #define RX_RESET_TRIES 32
/* hp->happy_lock must be held */ /* hp->happy_lock must be held */
static void happy_meal_tx_reset(struct happy_meal *hp, unsigned long bregs) static void happy_meal_tx_reset(struct happy_meal *hp, void __iomem *bregs)
{ {
int tries = TX_RESET_TRIES; int tries = TX_RESET_TRIES;
...@@ -925,7 +925,7 @@ static void happy_meal_tx_reset(struct happy_meal *hp, unsigned long bregs) ...@@ -925,7 +925,7 @@ static void happy_meal_tx_reset(struct happy_meal *hp, unsigned long bregs)
} }
/* hp->happy_lock must be held */ /* hp->happy_lock must be held */
static void happy_meal_rx_reset(struct happy_meal *hp, unsigned long bregs) static void happy_meal_rx_reset(struct happy_meal *hp, void __iomem *bregs)
{ {
int tries = RX_RESET_TRIES; int tries = RX_RESET_TRIES;
...@@ -947,7 +947,7 @@ static void happy_meal_rx_reset(struct happy_meal *hp, unsigned long bregs) ...@@ -947,7 +947,7 @@ static void happy_meal_rx_reset(struct happy_meal *hp, unsigned long bregs)
#define STOP_TRIES 16 #define STOP_TRIES 16
/* hp->happy_lock must be held */ /* hp->happy_lock must be held */
static void happy_meal_stop(struct happy_meal *hp, unsigned long gregs) static void happy_meal_stop(struct happy_meal *hp, void __iomem *gregs)
{ {
int tries = STOP_TRIES; int tries = STOP_TRIES;
...@@ -967,7 +967,7 @@ static void happy_meal_stop(struct happy_meal *hp, unsigned long gregs) ...@@ -967,7 +967,7 @@ static void happy_meal_stop(struct happy_meal *hp, unsigned long gregs)
} }
/* hp->happy_lock must be held */ /* hp->happy_lock must be held */
static void happy_meal_get_counters(struct happy_meal *hp, unsigned long bregs) static void happy_meal_get_counters(struct happy_meal *hp, void __iomem *bregs)
{ {
struct net_device_stats *stats = &hp->net_stats; struct net_device_stats *stats = &hp->net_stats;
...@@ -990,7 +990,7 @@ static void happy_meal_get_counters(struct happy_meal *hp, unsigned long bregs) ...@@ -990,7 +990,7 @@ static void happy_meal_get_counters(struct happy_meal *hp, unsigned long bregs)
} }
/* hp->happy_lock must be held */ /* hp->happy_lock must be held */
static void happy_meal_poll_stop(struct happy_meal *hp, unsigned long tregs) static void happy_meal_poll_stop(struct happy_meal *hp, void __iomem *tregs)
{ {
ASD(("happy_meal_poll_stop: ")); ASD(("happy_meal_poll_stop: "));
...@@ -1025,7 +1025,7 @@ static void happy_meal_poll_stop(struct happy_meal *hp, unsigned long tregs) ...@@ -1025,7 +1025,7 @@ static void happy_meal_poll_stop(struct happy_meal *hp, unsigned long tregs)
#define TCVR_UNISOLATE_TRIES 32 /* Dis-isolation can take longer. */ #define TCVR_UNISOLATE_TRIES 32 /* Dis-isolation can take longer. */
/* hp->happy_lock must be held */ /* hp->happy_lock must be held */
static int happy_meal_tcvr_reset(struct happy_meal *hp, unsigned long tregs) static int happy_meal_tcvr_reset(struct happy_meal *hp, void __iomem *tregs)
{ {
u32 tconfig; u32 tconfig;
int result, tries = TCVR_RESET_TRIES; int result, tries = TCVR_RESET_TRIES;
...@@ -1123,7 +1123,7 @@ static int happy_meal_tcvr_reset(struct happy_meal *hp, unsigned long tregs) ...@@ -1123,7 +1123,7 @@ static int happy_meal_tcvr_reset(struct happy_meal *hp, unsigned long tregs)
* *
* hp->happy_lock must be held * hp->happy_lock must be held
*/ */
static void happy_meal_transceiver_check(struct happy_meal *hp, unsigned long tregs) static void happy_meal_transceiver_check(struct happy_meal *hp, void __iomem *tregs)
{ {
unsigned long tconfig = hme_read32(hp, tregs + TCVR_CFG); unsigned long tconfig = hme_read32(hp, tregs + TCVR_CFG);
...@@ -1318,7 +1318,7 @@ static void happy_meal_init_rings(struct happy_meal *hp) ...@@ -1318,7 +1318,7 @@ static void happy_meal_init_rings(struct happy_meal *hp)
/* hp->happy_lock must be held */ /* hp->happy_lock must be held */
static void happy_meal_begin_auto_negotiation(struct happy_meal *hp, static void happy_meal_begin_auto_negotiation(struct happy_meal *hp,
unsigned long tregs, void __iomem *tregs,
struct ethtool_cmd *ep) struct ethtool_cmd *ep)
{ {
int timeout; int timeout;
...@@ -1443,11 +1443,11 @@ static void happy_meal_begin_auto_negotiation(struct happy_meal *hp, ...@@ -1443,11 +1443,11 @@ static void happy_meal_begin_auto_negotiation(struct happy_meal *hp,
/* hp->happy_lock must be held */ /* hp->happy_lock must be held */
static int happy_meal_init(struct happy_meal *hp) static int happy_meal_init(struct happy_meal *hp)
{ {
unsigned long gregs = hp->gregs; void __iomem *gregs = hp->gregs;
unsigned long etxregs = hp->etxregs; void __iomem *etxregs = hp->etxregs;
unsigned long erxregs = hp->erxregs; void __iomem *erxregs = hp->erxregs;
unsigned long bregs = hp->bigmacregs; void __iomem *bregs = hp->bigmacregs;
unsigned long tregs = hp->tcvregs; void __iomem *tregs = hp->tcvregs;
u32 regtmp, rxcfg; u32 regtmp, rxcfg;
unsigned char *e = &hp->dev->dev_addr[0]; unsigned char *e = &hp->dev->dev_addr[0];
...@@ -1736,9 +1736,9 @@ static int happy_meal_init(struct happy_meal *hp) ...@@ -1736,9 +1736,9 @@ static int happy_meal_init(struct happy_meal *hp)
/* hp->happy_lock must be held */ /* hp->happy_lock must be held */
static void happy_meal_set_initial_advertisement(struct happy_meal *hp) static void happy_meal_set_initial_advertisement(struct happy_meal *hp)
{ {
unsigned long tregs = hp->tcvregs; void __iomem *tregs = hp->tcvregs;
unsigned long bregs = hp->bigmacregs; void __iomem *bregs = hp->bigmacregs;
unsigned long gregs = hp->gregs; void __iomem *gregs = hp->gregs;
happy_meal_stop(hp, gregs); happy_meal_stop(hp, gregs);
hme_write32(hp, tregs + TCVR_IMASK, 0xffff); hme_write32(hp, tregs + TCVR_IMASK, 0xffff);
...@@ -1910,7 +1910,7 @@ static int happy_meal_is_not_so_happy(struct happy_meal *hp, u32 status) ...@@ -1910,7 +1910,7 @@ static int happy_meal_is_not_so_happy(struct happy_meal *hp, u32 status)
/* hp->happy_lock must be held */ /* hp->happy_lock must be held */
static void happy_meal_mif_interrupt(struct happy_meal *hp) static void happy_meal_mif_interrupt(struct happy_meal *hp)
{ {
unsigned long tregs = hp->tcvregs; void __iomem *tregs = hp->tcvregs;
printk(KERN_INFO "%s: Link status change.\n", hp->dev->name); printk(KERN_INFO "%s: Link status change.\n", hp->dev->name);
hp->sw_bmcr = happy_meal_tcvr_read(hp, tregs, MII_BMCR); hp->sw_bmcr = happy_meal_tcvr_read(hp, tregs, MII_BMCR);
...@@ -2390,7 +2390,7 @@ static struct net_device_stats *happy_meal_get_stats(struct net_device *dev) ...@@ -2390,7 +2390,7 @@ static struct net_device_stats *happy_meal_get_stats(struct net_device *dev)
static void happy_meal_set_multicast(struct net_device *dev) static void happy_meal_set_multicast(struct net_device *dev)
{ {
struct happy_meal *hp = dev->priv; struct happy_meal *hp = dev->priv;
unsigned long bregs = hp->bigmacregs; void __iomem *bregs = hp->bigmacregs;
struct dev_mc_list *dmi = dev->mc_list; struct dev_mc_list *dmi = dev->mc_list;
char *addrs; char *addrs;
int i; int i;
...@@ -3025,7 +3025,8 @@ static int __init happy_meal_pci_init(struct pci_dev *pdev) ...@@ -3025,7 +3025,8 @@ static int __init happy_meal_pci_init(struct pci_dev *pdev)
#endif #endif
struct happy_meal *hp; struct happy_meal *hp;
struct net_device *dev; struct net_device *dev;
unsigned long hpreg_base; void __iomem *hpreg_base;
unsigned long hpreg_res;
int i, qfe_slot = -1; int i, qfe_slot = -1;
char prom_name[64]; char prom_name[64];
int err; int err;
...@@ -3084,7 +3085,7 @@ static int __init happy_meal_pci_init(struct pci_dev *pdev) ...@@ -3084,7 +3085,7 @@ static int __init happy_meal_pci_init(struct pci_dev *pdev)
qp->happy_meals[qfe_slot] = dev; qp->happy_meals[qfe_slot] = dev;
} }
hpreg_base = pci_resource_start(pdev, 0); hpreg_res = pci_resource_start(pdev, 0);
err = -ENODEV; err = -ENODEV;
if ((pci_resource_flags(pdev, 0) & IORESOURCE_IO) != 0) { if ((pci_resource_flags(pdev, 0) & IORESOURCE_IO) != 0) {
printk(KERN_ERR "happymeal(PCI): Cannot find proper PCI device base address.\n"); printk(KERN_ERR "happymeal(PCI): Cannot find proper PCI device base address.\n");
...@@ -3096,7 +3097,7 @@ static int __init happy_meal_pci_init(struct pci_dev *pdev) ...@@ -3096,7 +3097,7 @@ static int __init happy_meal_pci_init(struct pci_dev *pdev)
goto err_out_clear_quattro; goto err_out_clear_quattro;
} }
if ((hpreg_base = (unsigned long) ioremap(hpreg_base, 0x8000)) == 0) { if ((hpreg_base = ioremap(hpreg_res, 0x8000)) == 0) {
printk(KERN_ERR "happymeal(PCI): Unable to remap card memory.\n"); printk(KERN_ERR "happymeal(PCI): Unable to remap card memory.\n");
goto err_out_free_res; goto err_out_free_res;
} }
......
drivers/net/sunhme.h
View file @ 8809c077
...@@ -397,7 +397,7 @@ struct quattro; ...@@ -397,7 +397,7 @@ struct quattro;
/* Happy happy, joy joy! */ /* Happy happy, joy joy! */
struct happy_meal { struct happy_meal {
unsigned long gregs; /* Happy meal global registers */ void __iomem *gregs; /* Happy meal global registers */
struct hmeal_init_block *happy_block; /* RX and TX descriptors (CPU addr) */ struct hmeal_init_block *happy_block; /* RX and TX descriptors (CPU addr) */
#if defined(CONFIG_SBUS) && defined(CONFIG_PCI) #if defined(CONFIG_SBUS) && defined(CONFIG_PCI)
...@@ -423,14 +423,14 @@ struct happy_meal { ...@@ -423,14 +423,14 @@ struct happy_meal {
struct net_device_stats net_stats; /* Statistical counters */ struct net_device_stats net_stats; /* Statistical counters */
#if defined(CONFIG_SBUS) && defined(CONFIG_PCI) #if defined(CONFIG_SBUS) && defined(CONFIG_PCI)
u32 (*read32)(unsigned long); u32 (*read32)(void __iomem *);
void (*write32)(unsigned long, u32); void (*write32)(void __iomem *, u32);
#endif #endif
unsigned long etxregs; /* External transmitter regs */ void __iomem *etxregs; /* External transmitter regs */
unsigned long erxregs; /* External receiver regs */ void __iomem *erxregs; /* External receiver regs */
unsigned long bigmacregs; /* BIGMAC core regs */ void __iomem *bigmacregs; /* BIGMAC core regs */
unsigned long tcvregs; /* MIF transceiver regs */ void __iomem *tcvregs; /* MIF transceiver regs */
dma_addr_t hblock_dvma; /* DVMA visible address happy block */ dma_addr_t hblock_dvma; /* DVMA visible address happy block */
unsigned int happy_flags; /* Driver state flags */ unsigned int happy_flags; /* Driver state flags */
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7