diff -urN RC13-git12-amd64-irq/drivers/net/ibm_emac/ibm_emac_core.c RC13-git12-ibm_emac/drivers/net/ibm_emac/ibm_emac_core.c --- RC13-git12-amd64-irq/drivers/net/ibm_emac/ibm_emac_core.c 2005-08-28 23:09:44.000000000 -0400 +++ RC13-git12-ibm_emac/drivers/net/ibm_emac/ibm_emac_core.c 2005-09-12 14:50:25.000000000 -0400 @@ -179,8 +179,7 @@ memset(rgmii, 0, sizeof(*rgmii)); - rgmii->base = - (struct rgmii_regs *)ioremap(rgmii_dev->def->paddr, + rgmii->base = ioremap(rgmii_dev->def->paddr, sizeof(*rgmii->base)); if (rgmii->base == NULL) { printk(KERN_ERR @@ -265,7 +264,7 @@ if (!--rgmii->users) { ocp_set_drvdata(ocpdev, NULL); - iounmap((void *)rgmii->base); + iounmap(rgmii->base); kfree(rgmii); } } @@ -286,8 +285,7 @@ } memset(zmii, 0, sizeof(*zmii)); - zmii->base = - (struct zmii_regs *)ioremap(zmii_dev->def->paddr, + zmii->base = ioremap(zmii_dev->def->paddr, sizeof(*zmii->base)); if (zmii->base == NULL) { printk(KERN_ERR @@ -371,7 +369,7 @@ if (!--zmii->users) { ocp_set_drvdata(ocpdev, NULL); - iounmap((void *)zmii->base); + iounmap(zmii->base); kfree(zmii); } } @@ -381,7 +379,7 @@ int count; uint32_t stacr; struct ocp_enet_private *fep = dev->priv; - emac_t *emacp = fep->emacp; + emac_t __iomem *emacp = fep->emacp; MDIO_DEBUG(("%s: phy_read, id: 0x%x, reg: 0x%x\n", dev->name, mii_id, reg)); @@ -441,7 +439,7 @@ int count; uint32_t stacr; struct ocp_enet_private *fep = dev->priv; - emac_t *emacp = fep->emacp; + emac_t __iomem *emacp = fep->emacp; MDIO_DEBUG(("%s phy_write, id: 0x%x, reg: 0x%x, data: 0x%x\n", dev->name, mii_id, reg, data)); @@ -859,7 +857,7 @@ { struct net_device *dev = dev_instance; struct ocp_enet_private *fep = dev->priv; - emac_t *emacp = fep->emacp; + emac_t __iomem *emacp = fep->emacp; unsigned long tmp_em0isr; /* EMAC interrupt */ @@ -900,7 +898,7 @@ unsigned short ctrl; unsigned long flags; struct ocp_enet_private *fep = dev->priv; - emac_t *emacp = fep->emacp; + emac_t __iomem *emacp = fep->emacp; int len = skb->len; unsigned int offset = 0, size, f, tx_slot_first; unsigned int nr_frags = skb_shinfo(skb)->nr_frags; @@ -1020,7 +1018,7 @@ static int emac_adjust_to_link(struct ocp_enet_private *fep) { - emac_t *emacp = fep->emacp; + emac_t __iomem *emacp = fep->emacp; unsigned long mode_reg; int full_duplex, speed; @@ -1094,7 +1092,7 @@ static int emac_set_mac_address(struct net_device *ndev, void *p) { struct ocp_enet_private *fep = ndev->priv; - emac_t *emacp = fep->emacp; + emac_t __iomem *emacp = fep->emacp; struct sockaddr *addr = p; if (!is_valid_ether_addr(addr->sa_data)) @@ -1119,7 +1117,7 @@ struct ocp_enet_private *fep = dev->priv; int old_mtu = dev->mtu; unsigned long mode_reg; - emac_t *emacp = fep->emacp; + emac_t __iomem *emacp = fep->emacp; u32 em0mr0; int i, full; unsigned long flags; @@ -1190,7 +1188,7 @@ static void __emac_set_multicast_list(struct net_device *dev) { struct ocp_enet_private *fep = dev->priv; - emac_t *emacp = fep->emacp; + emac_t __iomem *emacp = fep->emacp; u32 rmr = in_be32(&emacp->em0rmr); /* First clear all special bits, they can be set later */ @@ -1231,10 +1229,10 @@ static int emac_init_tah(struct ocp_enet_private *fep) { - tah_t *tahp; + tah_t __iomem *tahp; /* Initialize TAH and enable checksum verification */ - tahp = (tah_t *) ioremap(fep->tah_dev->def->paddr, sizeof(*tahp)); + tahp = ioremap(fep->tah_dev->def->paddr, sizeof(*tahp)); if (tahp == NULL) { printk(KERN_ERR "tah%d: Cannot ioremap TAH registers!\n", @@ -1308,7 +1306,7 @@ static void emac_reset_configure(struct ocp_enet_private *fep) { - emac_t *emacp = fep->emacp; + emac_t __iomem *emacp = fep->emacp; int i; mal_disable_tx_channels(fep->mal, fep->commac.tx_chan_mask); @@ -1381,7 +1379,7 @@ static void emac_kick(struct ocp_enet_private *fep) { - emac_t *emacp = fep->emacp; + emac_t __iomem *emacp = fep->emacp; unsigned long emac_ier; emac_ier = EMAC_ISR_PP | EMAC_ISR_BP | EMAC_ISR_RP | @@ -1649,7 +1647,7 @@ static int emac_close(struct net_device *dev) { struct ocp_enet_private *fep = dev->priv; - emac_t *emacp = fep->emacp; + emac_t __iomem *emacp = fep->emacp; /* XXX Stop IRQ emitting here */ spin_lock_irq(&fep->lock); @@ -1700,7 +1698,7 @@ unregister_netdev(dev); del_timer_sync(&ep->link_timer); mal_unregister_commac(ep->mal, &ep->commac); - iounmap((void *)ep->emacp); + iounmap(ep->emacp); kfree(dev); } @@ -1778,7 +1776,7 @@ commac_reg = 1; /* Map our MMIOs */ - ep->emacp = (emac_t *) ioremap(ocpdev->def->paddr, sizeof(emac_t)); + ep->emacp = ioremap(ocpdev->def->paddr, sizeof(emac_t)); /* Check if we need to attach to a ZMII */ if (emacdata->zmii_idx >= 0) { diff -urN RC13-git12-amd64-irq/drivers/net/ibm_emac/ibm_emac_core.h RC13-git12-ibm_emac/drivers/net/ibm_emac/ibm_emac_core.h --- RC13-git12-amd64-irq/drivers/net/ibm_emac/ibm_emac_core.h 2005-06-17 15:48:29.000000000 -0400 +++ RC13-git12-ibm_emac/drivers/net/ibm_emac/ibm_emac_core.h 2005-09-12 14:50:25.000000000 -0400 @@ -138,7 +138,7 @@ int opened; int going_away; int wol_irq; - emac_t *emacp; + emac_t __iomem *emacp; struct ocp_device *ocpdev; struct net_device *ndev; spinlock_t lock; diff -urN RC13-git12-amd64-irq/drivers/net/ibm_emac/ibm_emac_rgmii.h RC13-git12-ibm_emac/drivers/net/ibm_emac/ibm_emac_rgmii.h --- RC13-git12-amd64-irq/drivers/net/ibm_emac/ibm_emac_rgmii.h 2005-06-17 15:48:29.000000000 -0400 +++ RC13-git12-ibm_emac/drivers/net/ibm_emac/ibm_emac_rgmii.h 2005-09-12 14:50:25.000000000 -0400 @@ -28,7 +28,7 @@ /* RGMII device */ struct ibm_ocp_rgmii { - struct rgmii_regs *base; + struct rgmii_regs __iomem *base; int mode[RGMII_INPUTS]; int users; /* number of EMACs using this RGMII bridge */ }; diff -urN RC13-git12-amd64-irq/drivers/net/ibm_emac/ibm_emac_zmii.h RC13-git12-ibm_emac/drivers/net/ibm_emac/ibm_emac_zmii.h --- RC13-git12-amd64-irq/drivers/net/ibm_emac/ibm_emac_zmii.h 2005-06-17 15:48:29.000000000 -0400 +++ RC13-git12-ibm_emac/drivers/net/ibm_emac/ibm_emac_zmii.h 2005-09-12 14:50:25.000000000 -0400 @@ -30,7 +30,7 @@ /* ZMII device */ struct ibm_ocp_zmii { - struct zmii_regs *base; + struct zmii_regs __iomem *base; int mode[ZMII_INPUTS]; int users; /* number of EMACs using this ZMII bridge */ };