diff -urN --exclude-from=/home/davej/.exclude linux/drivers/net/3c501.c linux-dj/drivers/net/3c501.c --- linux/drivers/net/3c501.c Tue Feb 13 21:15:05 2001 +++ linux-dj/drivers/net/3c501.c Mon Mar 19 09:29:20 2001 @@ -402,7 +402,7 @@ { int retval; int ioaddr = dev->base_addr; - struct net_local *lp = (struct net_local *)dev->priv; + struct net_local *lp = dev->priv; unsigned long flags; if (el_debug > 2) @@ -432,7 +432,7 @@ static void el_timeout(struct net_device *dev) { - struct net_local *lp = (struct net_local *)dev->priv; + struct net_local *lp = dev->priv; int ioaddr = dev->base_addr; if (el_debug) @@ -472,7 +472,7 @@ static int el_start_xmit(struct sk_buff *skb, struct net_device *dev) { - struct net_local *lp = (struct net_local *)dev->priv; + struct net_local *lp = dev->priv; int ioaddr = dev->base_addr; unsigned long flags; @@ -575,7 +575,7 @@ int axsr; /* Aux. status reg. */ ioaddr = dev->base_addr; - lp = (struct net_local *)dev->priv; + lp = dev->priv; spin_lock(&lp->lock); @@ -748,7 +748,7 @@ static void el_receive(struct net_device *dev) { - struct net_local *lp = (struct net_local *)dev->priv; + struct net_local *lp = dev->priv; int ioaddr = dev->base_addr; int pkt_len; struct sk_buff *skb; @@ -814,7 +814,7 @@ static void el_reset(struct net_device *dev) { - struct net_local *lp = (struct net_local *)dev->priv; + struct net_local *lp = dev->priv; int ioaddr = dev->base_addr; if (el_debug> 2) @@ -878,7 +878,7 @@ static struct net_device_stats *el1_get_stats(struct net_device *dev) { - struct net_local *lp = (struct net_local *)dev->priv; + struct net_local *lp = dev->priv; return &lp->stats; } diff -urN --exclude-from=/home/davej/.exclude linux/drivers/net/3c505.c linux-dj/drivers/net/3c505.c --- linux/drivers/net/3c505.c Tue Feb 13 21:15:05 2001 +++ linux-dj/drivers/net/3c505.c Mon Mar 19 22:56:59 2001 @@ -660,8 +660,8 @@ int timeout; dev = dev_id; - adapter = (elp_device *) dev->priv; - + adapter = dev->priv; + spin_lock(&adapter->lock); do { @@ -1118,7 +1118,7 @@ static struct net_device_stats *elp_get_stats(struct net_device *dev) { - elp_device *adapter = (elp_device *) dev->priv; + elp_device *adapter = dev->priv; if (elp_debug >= 3) printk("%s: request for stats\n", dev->name); @@ -1198,7 +1198,7 @@ static void elp_set_mc_list(struct net_device *dev) { - elp_device *adapter = (elp_device *) dev->priv; + elp_device *adapter = dev->priv; struct dev_mc_list *dmi = dev->mc_list; int i; unsigned long flags; @@ -1430,7 +1430,7 @@ /* * setup ptr to adapter specific information */ - adapter = (elp_device *) (dev->priv = kmalloc(sizeof(elp_device), GFP_KERNEL)); + adapter = dev->priv = kmalloc(sizeof(elp_device), GFP_KERNEL); if (adapter == NULL) { printk("%s: out of memory\n", dev->name); return -ENODEV; diff -urN --exclude-from=/home/davej/.exclude linux/drivers/net/3c507.c linux-dj/drivers/net/3c507.c --- linux/drivers/net/3c507.c Tue Feb 13 21:15:05 2001 +++ linux-dj/drivers/net/3c507.c Mon Mar 19 22:57:16 2001 @@ -447,7 +447,7 @@ static void el16_tx_timeout (struct net_device *dev) { - struct net_local *lp = (struct net_local *) dev->priv; + struct net_local *lp = dev->priv; int ioaddr = dev->base_addr; unsigned long shmem = dev->mem_start; @@ -476,7 +476,7 @@ static int el16_send_packet (struct sk_buff *skb, struct net_device *dev) { - struct net_local *lp = (struct net_local *) dev->priv; + struct net_local *lp = dev->priv; int ioaddr = dev->base_addr; unsigned long flags; short length = ETH_ZLEN < skb->len ? skb->len : ETH_ZLEN; @@ -521,7 +521,7 @@ } ioaddr = dev->base_addr; - lp = (struct net_local *)dev->priv; + lp = dev->priv; shmem = dev->mem_start; spin_lock(&lp->lock); @@ -630,7 +630,7 @@ closed. */ static struct net_device_stats *el16_get_stats(struct net_device *dev) { - struct net_local *lp = (struct net_local *)dev->priv; + struct net_local *lp = dev->priv; /* ToDo: decide if there are any useful statistics from the SCB. */ @@ -640,7 +640,7 @@ /* Initialize the Rx-block list. */ static void init_rx_bufs(struct net_device *dev) { - struct net_local *lp = (struct net_local *)dev->priv; + struct net_local *lp = dev->priv; unsigned long write_ptr; unsigned short SCB_base = SCB_BASE; @@ -683,7 +683,7 @@ static void init_82586_mem(struct net_device *dev) { - struct net_local *lp = (struct net_local *)dev->priv; + struct net_local *lp = dev->priv; short ioaddr = dev->base_addr; unsigned long shmem = dev->mem_start; @@ -741,7 +741,7 @@ static void hardware_send_packet(struct net_device *dev, void *buf, short length) { - struct net_local *lp = (struct net_local *)dev->priv; + struct net_local *lp = dev->priv; short ioaddr = dev->base_addr; ushort tx_block = lp->tx_head; unsigned long write_ptr = dev->mem_start + tx_block; @@ -786,7 +786,7 @@ static void el16_rx(struct net_device *dev) { - struct net_local *lp = (struct net_local *)dev->priv; + struct net_local *lp = dev->priv; unsigned long shmem = dev->mem_start; ushort rx_head = lp->rx_head; ushort rx_tail = lp->rx_tail; diff -urN --exclude-from=/home/davej/.exclude linux/drivers/net/3c509.c linux-dj/drivers/net/3c509.c --- linux/drivers/net/3c509.c Mon Mar 19 09:16:22 2001 +++ linux-dj/drivers/net/3c509.c Mon Mar 19 09:29:20 2001 @@ -608,7 +608,7 @@ static void el3_tx_timeout (struct net_device *dev) { - struct el3_private *lp = (struct el3_private *)dev->priv; + struct el3_private *lp = dev->priv; int ioaddr = dev->base_addr; /* Transmitter timeout, serious problems. */ @@ -628,7 +628,7 @@ static int el3_start_xmit(struct sk_buff *skb, struct net_device *dev) { - struct el3_private *lp = (struct el3_private *)dev->priv; + struct el3_private *lp = dev->priv; int ioaddr = dev->base_addr; unsigned long flags; @@ -712,7 +712,7 @@ static void el3_interrupt(int irq, void *dev_id, struct pt_regs *regs) { - struct net_device *dev = (struct net_device *)dev_id; + struct net_device *dev = dev_id; struct el3_private *lp; int ioaddr, status; int i = max_interrupt_work; @@ -722,7 +722,7 @@ return; } - lp = (struct el3_private *)dev->priv; + lp = dev->priv; spin_lock(&lp->lock); ioaddr = dev->base_addr; @@ -754,7 +754,7 @@ outw(AckIntr | RxEarly, ioaddr + EL3_CMD); } if (status & TxComplete) { /* Really Tx error. */ - struct el3_private *lp = (struct el3_private *)dev->priv; + struct el3_private *lp = dev->priv; short tx_status; int i = 4; @@ -801,7 +801,7 @@ static struct net_device_stats * el3_get_stats(struct net_device *dev) { - struct el3_private *lp = (struct el3_private *)dev->priv; + struct el3_private *lp = dev->priv; unsigned long flags; /* @@ -822,7 +822,7 @@ */ static void update_stats(struct net_device *dev) { - struct el3_private *lp = (struct el3_private *)dev->priv; + struct el3_private *lp = dev->priv; int ioaddr = dev->base_addr; if (el3_debug > 5) @@ -852,7 +852,7 @@ static int el3_rx(struct net_device *dev) { - struct el3_private *lp = (struct el3_private *)dev->priv; + struct el3_private *lp = dev->priv; int ioaddr = dev->base_addr; short rx_status; @@ -924,7 +924,7 @@ set_multicast_list(struct net_device *dev) { unsigned long flags; - struct el3_private *lp = (struct el3_private *)dev->priv; + struct el3_private *lp = dev->priv; int ioaddr = dev->base_addr; if (el3_debug > 1) { @@ -1024,7 +1024,7 @@ /* No need to check MOD_IN_USE, as sys_delete_module() checks. */ while (el3_root_dev) { - struct el3_private *lp = (struct el3_private *)el3_root_dev->priv; + struct el3_private *lp = el3_root_dev->priv; #ifdef CONFIG_MCA if(lp->mca_slot!=-1) mca_mark_as_unused(lp->mca_slot); diff -urN --exclude-from=/home/davej/.exclude linux/drivers/net/3c515.c linux-dj/drivers/net/3c515.c --- linux/drivers/net/3c515.c Mon Mar 19 09:16:22 2001 +++ linux-dj/drivers/net/3c515.c Mon Mar 19 09:29:20 2001 @@ -562,14 +562,14 @@ int dev_size = sizeof(struct net_device) + sizeof(struct corkscrew_private) + 15; /* Pad for alignment */ - dev = (struct net_device *) kmalloc(dev_size, GFP_KERNEL); + dev = kmalloc(dev_size, GFP_KERNEL); if (!dev) return NULL; memset(dev, 0, dev_size); /* Align the Rx and Tx ring entries. */ dev->priv = (void *) (((long) dev + sizeof(struct net_device) + 15) & ~15); - vp = (struct corkscrew_private *) dev->priv; + vp = dev->priv; dev->base_addr = ioaddr; dev->irq = irq; dev->dma = @@ -607,7 +607,7 @@ dev->irq = irq; dev->dma = (product_index == CORKSCREW_ID ? inw(ioaddr + 0x2000) & 7 : 0); - vp = (struct corkscrew_private *) dev->priv; + vp = dev->priv; vp->product_name = "3c515"; vp->options = options; if (options >= 0) { @@ -629,8 +629,7 @@ static int corkscrew_probe1(struct net_device *dev) { int ioaddr = dev->base_addr; - struct corkscrew_private *vp = - (struct corkscrew_private *) dev->priv; + struct corkscrew_private *vp = dev->priv; unsigned int eeprom[0x40], checksum = 0; /* EEPROM contents */ int i; @@ -722,8 +721,7 @@ static int corkscrew_open(struct net_device *dev) { int ioaddr = dev->base_addr; - struct corkscrew_private *vp = - (struct corkscrew_private *) dev->priv; + struct corkscrew_private *vp = dev->priv; union wn3_config config; int i; @@ -888,8 +886,7 @@ { #ifdef AUTOMEDIA struct net_device *dev = (struct net_device *) data; - struct corkscrew_private *vp = - (struct corkscrew_private *) dev->priv; + struct corkscrew_private *vp = dev->priv; int ioaddr = dev->base_addr; unsigned long flags; int ok = 0; @@ -979,8 +976,7 @@ static void corkscrew_timeout(struct net_device *dev) { int i; - struct corkscrew_private *vp = - (struct corkscrew_private *) dev->priv; + struct corkscrew_private *vp = dev->priv; int ioaddr = dev->base_addr; printk(KERN_WARNING @@ -1019,8 +1015,7 @@ static int corkscrew_start_xmit(struct sk_buff *skb, struct net_device *dev) { - struct corkscrew_private *vp = - (struct corkscrew_private *) dev->priv; + struct corkscrew_private *vp = dev->priv; int ioaddr = dev->base_addr; /* Block a timer-based transmit from overlapping. */ @@ -1158,7 +1153,7 @@ ioaddr = dev->base_addr; latency = inb(ioaddr + Timer); - lp = (struct corkscrew_private *) dev->priv; + lp = dev->priv; status = inw(ioaddr + EL3_STATUS); @@ -1296,7 +1291,7 @@ static int corkscrew_rx(struct net_device *dev) { - struct corkscrew_private *vp = (struct corkscrew_private *) dev->priv; + struct corkscrew_private *vp = dev->priv; int ioaddr = dev->base_addr; int i; short rx_status; @@ -1363,8 +1358,7 @@ static int boomerang_rx(struct net_device *dev) { - struct corkscrew_private *vp = - (struct corkscrew_private *) dev->priv; + struct corkscrew_private *vp = dev->priv; int entry = vp->cur_rx % RX_RING_SIZE; int ioaddr = dev->base_addr; int rx_status; @@ -1454,8 +1448,7 @@ static int corkscrew_close(struct net_device *dev) { - struct corkscrew_private *vp = - (struct corkscrew_private *) dev->priv; + struct corkscrew_private *vp = dev->priv; int ioaddr = dev->base_addr; int i; @@ -1510,8 +1503,7 @@ static struct net_device_stats *corkscrew_get_stats(struct net_device *dev) { - struct corkscrew_private *vp = - (struct corkscrew_private *) dev->priv; + struct corkscrew_private *vp = dev->priv; unsigned long flags; if (netif_running(dev)) { @@ -1532,8 +1524,7 @@ */ static void update_stats(int ioaddr, struct net_device *dev) { - struct corkscrew_private *vp = - (struct corkscrew_private *) dev->priv; + struct corkscrew_private *vp = dev->priv; /* Unlike the 3c5x9 we need not turn off stats updates while reading. */ /* Switch to the stats window, and read everything. */ diff -urN --exclude-from=/home/davej/.exclude linux/drivers/net/3c523.c linux-dj/drivers/net/3c523.c --- linux/drivers/net/3c523.c Tue Feb 13 21:15:05 2001 +++ linux-dj/drivers/net/3c523.c Mon Mar 19 09:29:20 2001 @@ -300,7 +300,7 @@ static int __init check586(struct net_device *dev, unsigned long where, unsigned size) { - struct priv *p = (struct priv *) dev->priv; + struct priv *p = dev->priv; char *iscp_addrs[2]; int i = 0; @@ -341,7 +341,7 @@ void alloc586(struct net_device *dev) { - struct priv *p = (struct priv *) dev->priv; + struct priv *p = dev->priv; elmc_id_reset586(); DELAY(2); @@ -374,7 +374,7 @@ static int elmc_getinfo(char *buf, int slot, void *d) { int len = 0; - struct net_device *dev = (struct net_device *) d; + struct net_device *dev = d; int i; if (dev == NULL) @@ -590,7 +590,7 @@ void *ptr; unsigned long s; int i, result = 0; - struct priv *p = (struct priv *) dev->priv; + struct priv *p = dev->priv; volatile struct configure_cmd_struct *cfg_cmd; volatile struct iasetup_cmd_struct *ias_cmd; volatile struct tdr_cmd_struct *tdr_cmd; @@ -825,10 +825,10 @@ static void *alloc_rfa(struct net_device *dev, void *ptr) { - volatile struct rfd_struct *rfd = (struct rfd_struct *) ptr; + volatile struct rfd_struct *rfd = ptr; volatile struct rbd_struct *rbd; int i; - struct priv *p = (struct priv *) dev->priv; + struct priv *p = dev->priv; memset((char *) rfd, 0, sizeof(struct rfd_struct) * p->num_recv_buffs); p->rfd_first = rfd; @@ -869,7 +869,7 @@ static void elmc_interrupt(int irq, void *dev_id, struct pt_regs *reg_ptr) { - struct net_device *dev = (struct net_device *) dev_id; + struct net_device *dev = dev_id; unsigned short stat; struct priv *p; @@ -891,7 +891,7 @@ } /* reading ELMC_CTRL also clears the INT bit. */ - p = (struct priv *) dev->priv; + p = dev->priv; while ((stat = p->scb->status & STAT_MASK)) { @@ -946,10 +946,10 @@ unsigned short totlen; struct sk_buff *skb; struct rbd_struct *rbd; - struct priv *p = (struct priv *) dev->priv; + struct priv *p = dev->priv; for (; (status = p->rfd_top->status) & STAT_COMPL;) { - rbd = (struct rbd_struct *) make32(p->rfd_top->rbd_offset); + rbd = make32(p->rfd_top->rbd_offset); if (status & STAT_OK) { /* frame received without error? */ if ((totlen = rbd->status) & RBD_LAST) { /* the first and the last buffer? */ @@ -991,7 +991,7 @@ static void elmc_rnr_int(struct net_device *dev) { - struct priv *p = (struct priv *) dev->priv; + struct priv *p = dev->priv; p->stats.rx_errors++; @@ -1014,7 +1014,7 @@ static void elmc_xmt_int(struct net_device *dev) { int status; - struct priv *p = (struct priv *) dev->priv; + struct priv *p = dev->priv; status = p->xmit_cmds[p->xmit_last]->cmd_status; if (!(status & STAT_COMPL)) { @@ -1057,7 +1057,7 @@ static void startrecv586(struct net_device *dev) { - struct priv *p = (struct priv *) dev->priv; + struct priv *p = dev->priv; p->scb->rfa_offset = make16(p->rfd_first); p->scb->cmd = RUC_START; @@ -1071,7 +1071,7 @@ static void elmc_timeout(struct net_device *dev) { - struct priv *p = (struct priv *) dev->priv; + struct priv *p = dev->priv; /* COMMAND-UNIT active? */ if (p->scb->status & CU_ACTIVE) { #ifdef DEBUG @@ -1107,7 +1107,7 @@ #ifndef NO_NOPCOMMANDS int next_nop; #endif - struct priv *p = (struct priv *) dev->priv; + struct priv *p = dev->priv; netif_stop_queue(dev); @@ -1175,7 +1175,7 @@ static struct net_device_stats *elmc_get_stats(struct net_device *dev) { - struct priv *p = (struct priv *) dev->priv; + struct priv *p = dev->priv; unsigned short crc, aln, rsc, ovrn; crc = p->scb->crc_errs; /* get error-statistic from the ni82586 */ @@ -1273,8 +1273,7 @@ io[this_dev] = 0; unregister_netdev(dev); - mca_set_adapter_procfn(((struct priv *) (dev->priv))->slot, - NULL, NULL); + mca_set_adapter_procfn((dev->priv)->slot, NULL, NULL); kfree(dev->priv); dev->priv = NULL; diff -urN --exclude-from=/home/davej/.exclude linux/drivers/net/3c527.c linux-dj/drivers/net/3c527.c --- linux/drivers/net/3c527.c Mon Mar 19 09:16:22 2001 +++ linux-dj/drivers/net/3c527.c Mon Mar 19 09:29:20 2001 @@ -555,7 +555,7 @@ static int mc32_command_nowait(struct net_device *dev, u16 cmd, void *data, int len) { - struct mc32_local *lp = (struct mc32_local *)dev->priv; + struct mc32_local *lp = dev->priv; int ioaddr = dev->base_addr; if(lp->exec_pending) @@ -607,7 +607,7 @@ static int mc32_command(struct net_device *dev, u16 cmd, void *data, int len) { - struct mc32_local *lp = (struct mc32_local *)dev->priv; + struct mc32_local *lp = dev->priv; int ioaddr = dev->base_addr; unsigned long flags; int ret = 0; @@ -678,7 +678,7 @@ static void mc32_start_transceiver(struct net_device *dev) { - struct mc32_local *lp = (struct mc32_local *)dev->priv; + struct mc32_local *lp = dev->priv; int ioaddr = dev->base_addr; /* Ignore RX overflow on device closure */ @@ -717,7 +717,7 @@ static void mc32_halt_transceiver(struct net_device *dev) { - struct mc32_local *lp = (struct mc32_local *)dev->priv; + struct mc32_local *lp = dev->priv; int ioaddr = dev->base_addr; unsigned long flags; @@ -762,7 +762,7 @@ static int mc32_load_rx_ring(struct net_device *dev) { - struct mc32_local *lp = (struct mc32_local *)dev->priv; + struct mc32_local *lp = dev->priv; int i; u16 rx_base; volatile struct skb_header *p; @@ -810,7 +810,7 @@ static void mc32_flush_rx_ring(struct net_device *dev) { - struct mc32_local *lp = (struct mc32_local *)dev->priv; + struct mc32_local *lp = dev->priv; struct sk_buff *skb; int i; @@ -845,7 +845,7 @@ static void mc32_load_tx_ring(struct net_device *dev) { - struct mc32_local *lp = (struct mc32_local *)dev->priv; + struct mc32_local *lp = dev->priv; volatile struct skb_header *p; int i; u16 tx_base; @@ -881,7 +881,7 @@ static void mc32_flush_tx_ring(struct net_device *dev) { - struct mc32_local *lp = (struct mc32_local *)dev->priv; + struct mc32_local *lp = dev->priv; if(lp->tx_ring_tail!=lp->tx_ring_head) { @@ -937,7 +937,7 @@ static int mc32_open(struct net_device *dev) { int ioaddr = dev->base_addr; - struct mc32_local *lp = (struct mc32_local *)dev->priv; + struct mc32_local *lp = dev->priv; u8 one=1; u8 regs; u16 descnumbuffs[2] = {TX_RING_LEN, RX_RING_LEN}; @@ -1049,7 +1049,7 @@ static int mc32_send_packet(struct sk_buff *skb, struct net_device *dev) { - struct mc32_local *lp = (struct mc32_local *)dev->priv; + struct mc32_local *lp = dev->priv; unsigned long flags; volatile struct skb_header *p, *np; @@ -1115,7 +1115,7 @@ static void mc32_update_stats(struct net_device *dev) { - struct mc32_local *lp = (struct mc32_local *)dev->priv; + struct mc32_local *lp = dev->priv; volatile struct mc32_stats *st = lp->stats; u32 rx_errors=0; @@ -1258,7 +1258,7 @@ static void mc32_tx_ring(struct net_device *dev) { - struct mc32_local *lp=(struct mc32_local *)dev->priv; + struct mc32_local *lp=dev->priv; volatile struct skb_header *np; /* NB: lp->tx_count=TX_RING_LEN-1 so that tx_ring_head cannot "lap" tail here */ @@ -1350,7 +1350,7 @@ } ioaddr = dev->base_addr; - lp = (struct mc32_local *)dev->priv; + lp = dev->priv; /* See whats cooking */ @@ -1478,7 +1478,7 @@ static int mc32_close(struct net_device *dev) { - struct mc32_local *lp = (struct mc32_local *)dev->priv; + struct mc32_local *lp = dev->priv; int ioaddr = dev->base_addr; u8 regs; @@ -1532,7 +1532,7 @@ mc32_update_stats(dev); - lp = (struct mc32_local *)dev->priv; + lp = dev->priv; return &lp->net_stats; } @@ -1563,7 +1563,7 @@ static void do_mc32_set_multicast_list(struct net_device *dev, int retry) { - struct mc32_local *lp = (struct mc32_local *)dev->priv; + struct mc32_local *lp = dev->priv; u16 filt = (1<<2); /* Save Bad Packets, for stats purposes */ if (dev->flags&IFF_PROMISC) diff -urN --exclude-from=/home/davej/.exclude linux/drivers/net/3c59x.c linux-dj/drivers/net/3c59x.c --- linux/drivers/net/3c59x.c Mon Mar 19 09:16:22 2001 +++ linux-dj/drivers/net/3c59x.c Mon Mar 19 09:29:20 2001 @@ -812,7 +812,7 @@ printk(KERN_DEBUG "vortex_suspend(%s)\n", dev->name); if (dev && dev->priv) { - struct vortex_private *vp = (struct vortex_private *)dev->priv; + struct vortex_private *vp = dev->priv; if (vp->open) { netif_device_detach(dev); vortex_down(dev); @@ -827,7 +827,7 @@ printk(KERN_DEBUG "vortex_resume(%s)\n", dev->name); if (dev && dev->priv) { - struct vortex_private *vp = (struct vortex_private *)dev->priv; + struct vortex_private *vp = dev->priv; if (vp->open) { vortex_up(dev); netif_device_attach(dev); @@ -1288,7 +1288,7 @@ vortex_up(struct net_device *dev) { long ioaddr = dev->base_addr; - struct vortex_private *vp = (struct vortex_private *)dev->priv; + struct vortex_private *vp = dev->priv; unsigned int config; int i; @@ -1473,7 +1473,7 @@ static int vortex_open(struct net_device *dev) { - struct vortex_private *vp = (struct vortex_private *)dev->priv; + struct vortex_private *vp = dev->priv; int i; int retval; @@ -1535,7 +1535,7 @@ vortex_timer(unsigned long data) { struct net_device *dev = (struct net_device *)data; - struct vortex_private *vp = (struct vortex_private *)dev->priv; + struct vortex_private *vp = dev->priv; long ioaddr = dev->base_addr; int next_tick = 60*HZ; int ok = 0; @@ -1651,7 +1651,7 @@ static void vortex_tx_timeout(struct net_device *dev) { - struct vortex_private *vp = (struct vortex_private *)dev->priv; + struct vortex_private *vp = dev->priv; long ioaddr = dev->base_addr; printk(KERN_ERR "%s: transmit timed out, tx_status %2.2x status %4.4x.\n", @@ -1719,7 +1719,7 @@ static void vortex_error(struct net_device *dev, int status) { - struct vortex_private *vp = (struct vortex_private *)dev->priv; + struct vortex_private *vp = dev->priv; long ioaddr = dev->base_addr; int do_tx_reset = 0, reset_mask = 0; unsigned char tx_status = 0; @@ -1816,7 +1816,7 @@ static int vortex_start_xmit(struct sk_buff *skb, struct net_device *dev) { - struct vortex_private *vp = (struct vortex_private *)dev->priv; + struct vortex_private *vp = dev->priv; long ioaddr = dev->base_addr; /* Put out the doubleword header... */ @@ -1871,7 +1871,7 @@ static int boomerang_start_xmit(struct sk_buff *skb, struct net_device *dev) { - struct vortex_private *vp = (struct vortex_private *)dev->priv; + struct vortex_private *vp = dev->priv; long ioaddr = dev->base_addr; /* Calculate the next Tx descriptor entry. */ int entry = vp->cur_tx % TX_RING_SIZE; @@ -1970,7 +1970,7 @@ static void vortex_interrupt(int irq, void *dev_id, struct pt_regs *regs) { struct net_device *dev = dev_id; - struct vortex_private *vp = (struct vortex_private *)dev->priv; + struct vortex_private *vp = dev->priv; long ioaddr; int status; int work_done = max_interrupt_work; @@ -2071,7 +2071,7 @@ static void boomerang_interrupt(int irq, void *dev_id, struct pt_regs *regs) { struct net_device *dev = dev_id; - struct vortex_private *vp = (struct vortex_private *)dev->priv; + struct vortex_private *vp = dev->priv; long ioaddr; int status; int work_done = max_interrupt_work; @@ -2195,7 +2195,7 @@ static int vortex_rx(struct net_device *dev) { - struct vortex_private *vp = (struct vortex_private *)dev->priv; + struct vortex_private *vp = dev->priv; long ioaddr = dev->base_addr; int i; short rx_status; @@ -2265,7 +2265,7 @@ static int boomerang_rx(struct net_device *dev) { - struct vortex_private *vp = (struct vortex_private *)dev->priv; + struct vortex_private *vp = dev->priv; int entry = vp->cur_rx % RX_RING_SIZE; long ioaddr = dev->base_addr; int rx_status; @@ -2368,7 +2368,7 @@ rx_oom_timer(unsigned long arg) { struct net_device *dev = (struct net_device *)arg; - struct vortex_private *vp = (struct vortex_private *)dev->priv; + struct vortex_private *vp = dev->priv; spin_lock_irq(&vp->lock); if ((vp->cur_rx - vp->dirty_rx) == RX_RING_SIZE) /* This test is redundant, but makes me feel good */ @@ -2383,7 +2383,7 @@ static void vortex_down(struct net_device *dev) { - struct vortex_private *vp = (struct vortex_private *)dev->priv; + struct vortex_private *vp = dev->priv; long ioaddr = dev->base_addr; netif_stop_queue (dev); @@ -2417,7 +2417,7 @@ static int vortex_close(struct net_device *dev) { - struct vortex_private *vp = (struct vortex_private *)dev->priv; + struct vortex_private *vp = dev->priv; long ioaddr = dev->base_addr; int i; @@ -2481,7 +2481,7 @@ dump_tx_ring(struct net_device *dev) { if (vortex_debug > 0) { - struct vortex_private *vp = (struct vortex_private *)dev->priv; + struct vortex_private *vp = dev->priv; long ioaddr = dev->base_addr; if (vp->full_bus_master_tx) { @@ -2514,7 +2514,7 @@ static struct net_device_stats *vortex_get_stats(struct net_device *dev) { - struct vortex_private *vp = (struct vortex_private *)dev->priv; + struct vortex_private *vp = dev->priv; unsigned long flags; if (netif_device_present(dev)) { /* AKPM: Used to be netif_running */ @@ -2534,7 +2534,7 @@ */ static void update_stats(long ioaddr, struct net_device *dev) { - struct vortex_private *vp = (struct vortex_private *)dev->priv; + struct vortex_private *vp = dev->priv; int old_window = inw(ioaddr + EL3_CMD); if (old_window == 0xffff) /* Chip suspended or ejected. */ @@ -2573,7 +2573,7 @@ static int vortex_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) { - struct vortex_private *vp = (struct vortex_private *)dev->priv; + struct vortex_private *vp = dev->priv; long ioaddr = dev->base_addr; u16 *data = (u16 *)&rq->ifr_data; int phy = vp->phys[0] & 0x1f; @@ -2658,7 +2658,7 @@ static int mdio_read(struct net_device *dev, int phy_id, int location) { - struct vortex_private *vp = (struct vortex_private *)dev->priv; + struct vortex_private *vp = dev->priv; int i; long ioaddr = dev->base_addr; int read_cmd = (0xf6 << 10) | (phy_id << 5) | location; @@ -2692,7 +2692,7 @@ static void mdio_write(struct net_device *dev, int phy_id, int location, int value) { - struct vortex_private *vp = (struct vortex_private *)dev->priv; + struct vortex_private *vp = dev->priv; long ioaddr = dev->base_addr; int write_cmd = 0x50020000 | (phy_id << 23) | (location << 18) | value; long mdio_addr = ioaddr + Wn4_PhysicalMgmt; @@ -2726,7 +2726,7 @@ /* Set Wake-On-LAN mode and put the board into D3 (power-down) state. */ static void acpi_set_WOL(struct net_device *dev) { - struct vortex_private *vp = (struct vortex_private *)dev->priv; + struct vortex_private *vp = dev->priv; long ioaddr = dev->base_addr; /* Power up on: 1==Downloaded Filter, 2==Magic Packets, 4==Link Status. */ diff -urN --exclude-from=/home/davej/.exclude linux/drivers/net/7990.c linux-dj/drivers/net/7990.c --- linux/drivers/net/7990.c Tue Feb 13 21:15:05 2001 +++ linux-dj/drivers/net/7990.c Mon Mar 19 09:29:20 2001 @@ -102,7 +102,7 @@ /* Set up the Lance Rx and Tx rings and the init block */ static void lance_init_ring (struct net_device *dev) { - struct lance_private *lp = (struct lance_private *) dev->priv; + struct lance_private *lp = dev->priv; volatile struct lance_init_block *ib = lp->init_block; volatile struct lance_init_block *aib; /* for LANCE_ADDR computations */ int leptr; @@ -219,7 +219,7 @@ static int lance_reset (struct net_device *dev) { - struct lance_private *lp = (struct lance_private *)dev->priv; + struct lance_private *lp = dev->priv; int status; DECLARE_LL; @@ -239,7 +239,7 @@ static int lance_rx (struct net_device *dev) { - struct lance_private *lp = (struct lance_private *) dev->priv; + struct lance_private *lp = dev->priv; volatile struct lance_init_block *ib = lp->init_block; volatile struct lance_rx_desc *rd; unsigned char bits; @@ -319,7 +319,7 @@ static int lance_tx (struct net_device *dev) { - struct lance_private *lp = (struct lance_private *) dev->priv; + struct lance_private *lp = dev->priv; volatile struct lance_init_block *ib = lp->init_block; volatile struct lance_tx_desc *td; int i, j; @@ -402,8 +402,8 @@ static void lance_interrupt (int irq, void *dev_id, struct pt_regs *regs) { - struct net_device *dev = (struct net_device *)dev_id; - struct lance_private *lp = (struct lance_private *)dev->priv; + struct net_device *dev = dev_id; + struct lance_private *lp = dev->priv; int csr0; DECLARE_LL; @@ -458,7 +458,7 @@ int lance_open (struct net_device *dev) { - struct lance_private *lp = (struct lance_private *)dev->priv; + struct lance_private *lp = dev->priv; int res; DECLARE_LL; @@ -475,7 +475,7 @@ int lance_close (struct net_device *dev) { - struct lance_private *lp = (struct lance_private *) dev->priv; + struct lance_private *lp = dev->priv; DECLARE_LL; netif_stop_queue (dev); @@ -500,7 +500,7 @@ int lance_start_xmit (struct sk_buff *skb, struct net_device *dev) { - struct lance_private *lp = (struct lance_private *)dev->priv; + struct lance_private *lp = dev->priv; volatile struct lance_init_block *ib = lp->init_block; int entry, skblen, len; static int outs; @@ -555,7 +555,7 @@ struct net_device_stats *lance_get_stats (struct net_device *dev) { - struct lance_private *lp = (struct lance_private *) dev->priv; + struct lance_private *lp = dev->priv; return &lp->stats; } @@ -563,7 +563,7 @@ /* taken from the depca driver via a2065.c */ static void lance_load_multicast (struct net_device *dev) { - struct lance_private *lp = (struct lance_private *) dev->priv; + struct lance_private *lp = dev->priv; volatile struct lance_init_block *ib = lp->init_block; volatile u16 *mcast_table = (u16 *)&ib->filter; struct dev_mc_list *dmi=dev->mc_list; @@ -614,7 +614,7 @@ void lance_set_multicast (struct net_device *dev) { - struct lance_private *lp = (struct lance_private *) dev->priv; + struct lance_private *lp = dev->priv; volatile struct lance_init_block *ib = lp->init_block; int stopped; DECLARE_LL; diff -urN --exclude-from=/home/davej/.exclude linux/drivers/net/8139too.c linux-dj/drivers/net/8139too.c --- linux/drivers/net/8139too.c Mon Mar 19 09:16:22 2001 +++ linux-dj/drivers/net/8139too.c Mon Mar 19 09:29:09 2001 @@ -966,7 +966,7 @@ assert (dev != NULL); - np = (struct rtl8139_private *) (dev->priv); + np = dev->priv; assert (np != NULL); unregister_netdev (dev); diff -urN --exclude-from=/home/davej/.exclude linux/drivers/net/82596.c linux-dj/drivers/net/82596.c --- linux/drivers/net/82596.c Mon Mar 19 09:16:22 2001 +++ linux-dj/drivers/net/82596.c Mon Mar 19 22:57:40 2001 @@ -443,7 +443,7 @@ static void i596_display_data(struct net_device *dev) { - struct i596_private *lp = (struct i596_private *) dev->priv; + struct i596_private *lp = dev->priv; struct i596_cmd *cmd; struct i596_rfd *rfd; struct i596_rbd *rbd; @@ -500,7 +500,7 @@ static inline void init_rx_bufs(struct net_device *dev) { - struct i596_private *lp = (struct i596_private *)dev->priv; + struct i596_private *lp = dev->priv; int i; struct i596_rfd *rfd; struct i596_rbd *rbd; @@ -551,7 +551,7 @@ static inline void remove_rx_bufs(struct net_device *dev) { - struct i596_private *lp = (struct i596_private *)dev->priv; + struct i596_private *lp = dev->priv; struct i596_rbd *rbd; int i; @@ -565,7 +565,7 @@ static void rebuild_rx_bufs(struct net_device *dev) { - struct i596_private *lp = (struct i596_private *) dev->priv; + struct i596_private *lp = dev->priv; int i; /* Ensure rx frame/buffer descriptors are tidy */ @@ -584,7 +584,7 @@ static int init_i596_mem(struct net_device *dev) { - struct i596_private *lp = (struct i596_private *) dev->priv; + struct i596_private *lp = dev->priv; #if !defined(ENABLE_MVME16x_NET) && !defined(ENABLE_BVME6000_NET) short ioaddr = dev->base_addr; #endif @@ -730,7 +730,7 @@ static inline int i596_rx(struct net_device *dev) { - struct i596_private *lp = (struct i596_private *)dev->priv; + struct i596_private *lp = dev->priv; struct i596_rfd *rfd; struct i596_rbd *rbd; int frames = 0; @@ -925,7 +925,7 @@ static void i596_add_cmd(struct net_device *dev, struct i596_cmd *cmd) { - struct i596_private *lp = (struct i596_private *) dev->priv; + struct i596_private *lp = dev->priv; int ioaddr = dev->base_addr; unsigned long flags; @@ -997,7 +997,7 @@ static void i596_tx_timeout (struct net_device *dev) { - struct i596_private *lp = (struct i596_private *) dev->priv; + struct i596_private *lp = dev->priv; int ioaddr = dev->base_addr; /* Transmitter timeout, serious problems. */ @@ -1026,7 +1026,7 @@ static int i596_start_xmit(struct sk_buff *skb, struct net_device *dev) { - struct i596_private *lp = (struct i596_private *) dev->priv; + struct i596_private *lp = dev->priv; struct tx_cmd *tx_cmd; struct i596_tbd *tbd; short length = ETH_ZLEN < skb->len ? skb->len : ETH_ZLEN; @@ -1186,9 +1186,9 @@ dev->tx_timeout = i596_tx_timeout; dev->watchdog_timeo = TX_TIMEOUT; - dev->priv = (void *)(dev->mem_start); + dev->priv = dev->mem_start; - lp = (struct i596_private *) dev->priv; + lp = dev->priv; DEB(DEB_INIT,printk ("%s: lp at 0x%08lx (%d bytes), lp->scb at 0x%08lx\n", dev->name, (unsigned long)lp, sizeof(struct i596_private), (unsigned long)&lp->scb)); @@ -1228,7 +1228,7 @@ } ioaddr = dev->base_addr; - lp = (struct i596_private *) dev->priv; + lp = dev->priv; spin_lock (&lp->lock); @@ -1369,7 +1369,7 @@ static int i596_close(struct net_device *dev) { - struct i596_private *lp = (struct i596_private *) dev->priv; + struct i596_private *lp = dev->priv; unsigned long flags; netif_stop_queue(dev); @@ -1417,7 +1417,7 @@ static struct net_device_stats * i596_get_stats(struct net_device *dev) { - struct i596_private *lp = (struct i596_private *) dev->priv; + struct i596_private *lp = dev->priv; return &lp->stats; } @@ -1428,7 +1428,7 @@ static void set_multicast_list(struct net_device *dev) { - struct i596_private *lp = (struct i596_private *) dev->priv; + struct i596_private *lp = dev->priv; int config = 0, cnt; DEB(DEB_MULTI,printk("%s: set multicast list, %d entries, promisc %s, allmulti %s\n", dev->name, dev->mc_count, dev->flags & IFF_PROMISC ? "ON" : "OFF", dev->flags & IFF_ALLMULTI ? "ON" : "OFF")); diff -urN --exclude-from=/home/davej/.exclude linux/drivers/net/8390.c linux-dj/drivers/net/8390.c --- linux/drivers/net/8390.c Sun Feb 4 18:05:30 2001 +++ linux-dj/drivers/net/8390.c Mon Mar 19 09:29:20 2001 @@ -155,7 +155,7 @@ int ei_open(struct net_device *dev) { unsigned long flags; - struct ei_device *ei_local = (struct ei_device *) dev->priv; + struct ei_device *ei_local = dev->priv; /* This can't happen unless somebody forgot to call ethdev_init(). */ if (ei_local == NULL) @@ -194,7 +194,7 @@ */ int ei_close(struct net_device *dev) { - struct ei_device *ei_local = (struct ei_device *) dev->priv; + struct ei_device *ei_local = dev->priv; unsigned long flags; /* @@ -219,7 +219,7 @@ void ei_tx_timeout(struct net_device *dev) { long e8390_base = dev->base_addr; - struct ei_device *ei_local = (struct ei_device *) dev->priv; + struct ei_device *ei_local = dev->priv; int txsr, isr, tickssofar = jiffies - dev->trans_start; unsigned long flags; @@ -265,7 +265,7 @@ static int ei_start_xmit(struct sk_buff *skb, struct net_device *dev) { long e8390_base = dev->base_addr; - struct ei_device *ei_local = (struct ei_device *) dev->priv; + struct ei_device *ei_local = dev->priv; int length, send_length, output_page; unsigned long flags; @@ -419,7 +419,7 @@ } e8390_base = dev->base_addr; - ei_local = (struct ei_device *) dev->priv; + ei_local = dev->priv; /* * Protect the irq test too. @@ -522,7 +522,7 @@ static void ei_tx_err(struct net_device *dev) { long e8390_base = dev->base_addr; - struct ei_device *ei_local = (struct ei_device *) dev->priv; + struct ei_device *ei_local = dev->priv; unsigned char txsr = inb_p(e8390_base+EN0_TSR); unsigned char tx_was_aborted = txsr & (ENTSR_ABT+ENTSR_FU); @@ -565,7 +565,7 @@ static void ei_tx_intr(struct net_device *dev) { long e8390_base = dev->base_addr; - struct ei_device *ei_local = (struct ei_device *) dev->priv; + struct ei_device *ei_local = dev->priv; int status = inb(e8390_base + EN0_TSR); outb_p(ENISR_TX, e8390_base + EN0_ISR); /* Ack intr. */ @@ -657,7 +657,7 @@ static void ei_receive(struct net_device *dev) { long e8390_base = dev->base_addr; - struct ei_device *ei_local = (struct ei_device *) dev->priv; + struct ei_device *ei_local = dev->priv; unsigned char rxing_page, this_frame, next_frame; unsigned short current_offset; int rx_pkt_count = 0; @@ -795,7 +795,7 @@ { long e8390_base = dev->base_addr; unsigned char was_txing, must_resend = 0; - struct ei_device *ei_local = (struct ei_device *) dev->priv; + struct ei_device *ei_local = dev->priv; /* * Record whether a Tx was in progress and then issue the @@ -863,7 +863,7 @@ static struct net_device_stats *get_stats(struct net_device *dev) { long ioaddr = dev->base_addr; - struct ei_device *ei_local = (struct ei_device *) dev->priv; + struct ei_device *ei_local = dev->priv; unsigned long flags; /* If the card is stopped, just return the present stats. */ @@ -942,7 +942,7 @@ { long e8390_base = dev->base_addr; int i; - struct ei_device *ei_local = (struct ei_device*)dev->priv; + struct ei_device *ei_local = dev->priv; if (!(dev->flags&(IFF_PROMISC|IFF_ALLMULTI))) { @@ -996,7 +996,7 @@ static void set_multicast_list(struct net_device *dev) { unsigned long flags; - struct ei_device *ei_local = (struct ei_device*)dev->priv; + struct ei_device *ei_local = dev->priv; spin_lock_irqsave(&ei_local->page_lock, flags); do_set_multicast_list(dev); @@ -1024,7 +1024,7 @@ if (dev->priv == NULL) return -ENOMEM; memset(dev->priv, 0, sizeof(struct ei_device)); - ei_local = (struct ei_device *)dev->priv; + ei_local = dev->priv; spin_lock_init(&ei_local->page_lock); } @@ -1053,7 +1053,7 @@ void NS8390_init(struct net_device *dev, int startp) { long e8390_base = dev->base_addr; - struct ei_device *ei_local = (struct ei_device *) dev->priv; + struct ei_device *ei_local = dev->priv; int i; int endcfg = ei_local->word16 ? (0x48 | ENDCFG_WTS | (ei_local->bigendian ? ENDCFG_BOS : 0)) @@ -1117,7 +1117,7 @@ int start_page) { long e8390_base = dev->base_addr; - struct ei_device *ei_local __attribute((unused)) = (struct ei_device *) dev->priv; + struct ei_device *ei_local __attribute((unused)) = dev->priv; outb_p(E8390_NODMA+E8390_PAGE0, e8390_base+E8390_CMD); diff -urN --exclude-from=/home/davej/.exclude linux/drivers/net/a2065.c linux-dj/drivers/net/a2065.c --- linux/drivers/net/a2065.c Tue Feb 13 21:15:05 2001 +++ linux-dj/drivers/net/a2065.c Mon Mar 19 09:29:21 2001 @@ -172,7 +172,7 @@ /* Setup the Lance Rx and Tx rings */ static void lance_init_ring (struct net_device *dev) { - struct lance_private *lp = (struct lance_private *) dev->priv; + struct lance_private *lp = dev->priv; volatile struct lance_init_block *ib = lp->init_block; volatile struct lance_init_block *aib; /* for LANCE_ADDR computations */ int leptr; @@ -273,7 +273,7 @@ static int lance_rx (struct net_device *dev) { - struct lance_private *lp = (struct lance_private *) dev->priv; + struct lance_private *lp = dev->priv; volatile struct lance_init_block *ib = lp->init_block; volatile struct lance_regs *ll = lp->ll; volatile struct lance_rx_desc *rd; @@ -350,7 +350,7 @@ static int lance_tx (struct net_device *dev) { - struct lance_private *lp = (struct lance_private *) dev->priv; + struct lance_private *lp = dev->priv; volatile struct lance_init_block *ib = lp->init_block; volatile struct lance_regs *ll = lp->ll; volatile struct lance_tx_desc *td; @@ -438,9 +438,9 @@ volatile struct lance_regs *ll; int csr0; - dev = (struct net_device *) dev_id; + dev = dev_id; - lp = (struct lance_private *) dev->priv; + lp = dev->priv; ll = lp->ll; ll->rap = LE_CSR0; /* LANCE Controller Status */ @@ -488,7 +488,7 @@ static int lance_open (struct net_device *dev) { - struct lance_private *lp = (struct lance_private *)dev->priv; + struct lance_private *lp = dev->priv; volatile struct lance_regs *ll = lp->ll; int ret; @@ -513,7 +513,7 @@ static int lance_close (struct net_device *dev) { - struct lance_private *lp = (struct lance_private *) dev->priv; + struct lance_private *lp = dev->priv; volatile struct lance_regs *ll = lp->ll; netif_stop_queue(dev); @@ -529,7 +529,7 @@ static inline int lance_reset (struct net_device *dev) { - struct lance_private *lp = (struct lance_private *)dev->priv; + struct lance_private *lp = dev->priv; volatile struct lance_regs *ll = lp->ll; int status; @@ -552,7 +552,7 @@ static void lance_tx_timeout(struct net_device *dev) { - struct lance_private *lp = (struct lance_private *) dev->priv; + struct lance_private *lp = dev->priv; volatile struct lance_regs *ll = lp->ll; printk(KERN_ERR "%s: transmit timed out, status %04x, reset\n", @@ -563,7 +563,7 @@ static int lance_start_xmit (struct sk_buff *skb, struct net_device *dev) { - struct lance_private *lp = (struct lance_private *)dev->priv; + struct lance_private *lp = dev->priv; volatile struct lance_regs *ll = lp->ll; volatile struct lance_init_block *ib = lp->init_block; int entry, skblen, len; @@ -625,7 +625,7 @@ static struct net_device_stats *lance_get_stats (struct net_device *dev) { - struct lance_private *lp = (struct lance_private *) dev->priv; + struct lance_private *lp = dev->priv; return &lp->stats; } @@ -633,7 +633,7 @@ /* taken from the depca driver */ static void lance_load_multicast (struct net_device *dev) { - struct lance_private *lp = (struct lance_private *) dev->priv; + struct lance_private *lp = dev->priv; volatile struct lance_init_block *ib = lp->init_block; volatile u16 *mcast_table = (u16 *)&ib->filter; struct dev_mc_list *dmi=dev->mc_list; @@ -683,7 +683,7 @@ static void lance_set_multicast (struct net_device *dev) { - struct lance_private *lp = (struct lance_private *) dev->priv; + struct lance_private *lp = dev->priv; volatile struct lance_init_block *ib = lp->init_block; volatile struct lance_regs *ll = lp->ll; diff -urN --exclude-from=/home/davej/.exclude linux/drivers/net/acenic.c linux-dj/drivers/net/acenic.c --- linux/drivers/net/acenic.c Mon Mar 19 09:16:22 2001 +++ linux-dj/drivers/net/acenic.c Mon Mar 19 09:29:16 2001 @@ -2233,7 +2233,7 @@ { struct ace_private *ap; struct ace_regs *regs; - struct net_device *dev = (struct net_device *)dev_id; + struct net_device *dev = dev_id; u32 idx; u32 txcsm, rxretcsm, rxretprd; u32 evtcsm, evtprd; diff -urN --exclude-from=/home/davej/.exclude linux/drivers/net/aironet4500_card.c linux-dj/drivers/net/aironet4500_card.c --- linux/drivers/net/aironet4500_card.c Mon Mar 19 09:16:23 2001 +++ linux-dj/drivers/net/aironet4500_card.c Mon Mar 19 09:29:11 2001 @@ -310,7 +310,7 @@ return -1; }; - logdev = ((struct isapnp_logdev *) ((struct awc_private *)dev->priv)->bus); + logdev = ((struct awc_private *) dev->priv)->bus; if (!logdev ) { printk("awc4500 no pnp logdev in hw_reset\n"); diff -urN --exclude-from=/home/davej/.exclude linux/drivers/net/aironet4500_core.c linux-dj/drivers/net/aironet4500_core.c --- linux/drivers/net/aironet4500_core.c Mon Mar 19 09:16:23 2001 +++ linux-dj/drivers/net/aironet4500_core.c Mon Mar 19 23:56:16 2001 @@ -325,7 +325,7 @@ awc_issue_command_no_ack(struct net_device * dev, u16 com, u16 par1, u16 par2, u16 par3){ - struct awc_private * priv = (struct awc_private *)dev->priv; + struct awc_private * priv = dev->priv; int cnt = 0; long long jiff; jiff = jiffies; @@ -549,7 +549,7 @@ int awc_bap_read(struct awc_command * cmd) { register u16 len; - register u16 * buff = (u16 *) cmd->buff; + register u16 * buff = cmd->buff; register u16 port= cmd->bap->data; @@ -584,7 +584,7 @@ int awc_bap_write(struct awc_command * cmd){ register u16 len; - register u16 * buff = (u16 *) cmd->buff; + register u16 * buff = cmd->buff; register u16 port= cmd->bap->data; @@ -853,7 +853,7 @@ awc_issue_blocking_command(struct net_device * dev,u16 comm){ struct awc_command cmd; -// struct awc_private * priv = (struct awc_private *)dev->priv; +// struct awc_private * priv = dev->priv; AWC_ENTRY_EXIT_DEBUG(" entry awc_issue_blocking_command "); @@ -930,7 +930,7 @@ int awc_enable_MAC(struct net_device * dev){ - struct awc_private * priv = (struct awc_private *)dev->priv; + struct awc_private * priv = dev->priv; AWC_ENTRY_EXIT_DEBUG(" entry awc_enable_MAC "); if (priv->mac_enabled){ @@ -955,7 +955,7 @@ int awc_disable_MAC(struct net_device * dev){ - struct awc_private * priv = (struct awc_private *)dev->priv; + struct awc_private * priv = dev->priv; AWC_ENTRY_EXIT_DEBUG(" entry awc_disable_MAC "); if (!priv->mac_enabled){ @@ -978,7 +978,7 @@ int awc_read_all_rids(struct net_device * dev){ - struct awc_private * priv = (struct awc_private *)dev->priv; + struct awc_private * priv = dev->priv; int status,i; AWC_ENTRY_EXIT_DEBUG(" entry awc_read_all_rids "); @@ -997,7 +997,7 @@ int awc_write_all_rids(struct net_device * dev){ - struct awc_private * priv = (struct awc_private *)dev->priv; + struct awc_private * priv = dev->priv; int i,status ; AWC_ENTRY_EXIT_DEBUG(" entry awc_write_all_rids "); @@ -1155,7 +1155,7 @@ int awc_tx_dealloc(struct net_device * dev){ - struct awc_private * priv = (struct awc_private *)dev->priv; + struct awc_private * priv = dev->priv; @@ -1182,7 +1182,7 @@ inline struct awc_fid * awc_tx_fid_lookup_and_remove(struct net_device * dev, u16 fid_handle){ - struct awc_private * priv = (struct awc_private *)dev->priv; + struct awc_private * priv = dev->priv; // int k = 0; unsigned long flags; struct awc_fid * fid = NULL; @@ -1276,7 +1276,7 @@ int awc_queues_init(struct net_device * dev){ - struct awc_private * priv = (struct awc_private *)dev->priv; + struct awc_private * priv = dev->priv; struct awc_fid * fid = NULL; int retv =0; int k = 0; @@ -1306,7 +1306,7 @@ int awc_queues_destroy(struct net_device * dev){ - struct awc_private * priv = (struct awc_private *)dev->priv; + struct awc_private * priv = dev->priv; struct awc_fid * fid = NULL; int retv =0; @@ -1330,7 +1330,7 @@ inline int awc_802_11_copy_path_skb(struct net_device * dev, struct awc_fid * rx_buff){ - struct awc_private * priv = (struct awc_private * )dev->priv; + struct awc_private * priv = dev->priv; AWC_ENTRY_EXIT_DEBUG("awc_802_11_copy_path_skb"); @@ -1365,7 +1365,7 @@ int awc_802_11_find_copy_path(struct net_device * dev, struct awc_fid * rx_buff){ -// struct awc_private * priv = (struct awc_private * )dev->priv; +// struct awc_private * priv = dev->priv; // u8 is_802_3 = 0; // int i = 0; @@ -1391,7 +1391,7 @@ void awc_802_11_router_rx(struct net_device * dev,struct awc_fid * rx_buff){ - struct awc_private * priv = (struct awc_private * )dev->priv; + struct awc_private * priv = dev->priv; struct sk_buff * skb = rx_buff->skb; u8 * payload = rx_buff->u.rx.payload; // u8 * p802_3_macs_place = payload -12; @@ -1548,7 +1548,7 @@ void awc_802_11_failed_rx_copy(struct net_device * dev,struct awc_fid * rx_buff){ - struct awc_private * priv = (struct awc_private * )dev->priv; + struct awc_private * priv = dev->priv; AWC_ENTRY_EXIT_DEBUG("awc_802_11_failed_rx_copy"); @@ -1576,7 +1576,7 @@ struct sk_buff * skb){ - struct awc_private * priv = (struct awc_private * )dev->priv; + struct awc_private * priv = dev->priv; int i; int len = ETH_ZLEN < skb->len ? skb->len : ETH_ZLEN; /* check min length*/ struct awc_fid * fid = NULL; @@ -1831,7 +1831,7 @@ void awc_802_11_after_failed_tx_packet_to_card_write(struct net_device * dev, struct awc_fid * tx_buff){ - struct awc_private * priv = (struct awc_private *)dev->priv; + struct awc_private * priv = dev->priv; AWC_ENTRY_EXIT_DEBUG("awc_802_11_after_failed_tx_packet_to_card_write"); @@ -1861,7 +1861,7 @@ inline void awc_802_11_after_tx_complete(struct net_device * dev, struct awc_fid * tx_buff){ - struct awc_private * priv = (struct awc_private *)dev->priv; + struct awc_private * priv = dev->priv; AWC_ENTRY_EXIT_DEBUG("awc_802_11_after_tx_complete"); @@ -1904,7 +1904,7 @@ struct awc_private * priv ; int i; - priv= (struct awc_private *)dev->priv; + priv= dev->priv; rx_buff = priv->rx_ready.head ; AWC_ENTRY_EXIT_DEBUG(" entry awc_receive_packet "); @@ -2029,7 +2029,7 @@ u16 size ; // unsigned long flags; int i; - struct awc_private * priv= (struct awc_private *)dev->priv; + struct awc_private * priv= dev->priv; AWC_ENTRY_EXIT_DEBUG(" entry awc_transmit_packet "); @@ -2212,7 +2212,7 @@ void awc_bh(struct net_device *dev){ - struct awc_private * priv = (struct awc_private *)dev->priv; + struct awc_private * priv = dev->priv; int active_interrupts; int enabled_interrupts; // u16 tx_status; @@ -2323,7 +2323,7 @@ goto bad_end; }; - priv = (struct awc_private *)dev->priv; + priv = dev->priv; if (!priv) { printk(KERN_ERR "No PRIV in interrupt \n"); @@ -2632,7 +2632,7 @@ int awc_config(struct net_device *dev) { -// struct awc_private *priv = (struct awc_private *)dev->priv; +// struct awc_private *priv = dev->priv; DEBUG(2, "%s: awc_config \n", dev->name); @@ -2652,7 +2652,7 @@ char name[] = "ElmerLinux"; int awc_init(struct net_device *dev){ - struct awc_private *priv = (struct awc_private *)dev->priv; + struct awc_private *priv = dev->priv; int i; const char * radioType; @@ -2834,7 +2834,7 @@ }; int awc_private_init(struct net_device * dev){ - struct awc_private * priv = (struct awc_private *) dev->priv; + struct awc_private * priv = dev->priv; int i = 0; DEBUG(2, "%s: awc_private_init \n", dev->name); @@ -2922,7 +2922,7 @@ int awc_open(struct net_device *dev) { - struct awc_private *priv = (struct awc_private *)dev->priv; + struct awc_private *priv = dev->priv; @@ -2958,7 +2958,7 @@ int awc_close(struct net_device *dev) { - struct awc_private * priv = (struct awc_private *) dev->priv; + struct awc_private * priv = dev->priv; DEBUG(2, "%s: closing device.\n", dev->name); @@ -2988,7 +2988,7 @@ void awc_tx_timeout (struct net_device *dev) { - struct awc_private *priv = (struct awc_private *) dev->priv; + struct awc_private *priv = dev->priv; struct awc_fid * fid; int cnt; unsigned long flags; @@ -3034,7 +3034,7 @@ int awc_start_xmit(struct sk_buff *skb, struct net_device *dev) { - struct awc_private *priv = (struct awc_private *)dev->priv; + struct awc_private *priv = dev->priv; int retval = 0; // unsigned long flags; @@ -3094,7 +3094,7 @@ struct net_device_stats *awc_get_stats(struct net_device *dev) { - struct awc_private *priv = (struct awc_private *)dev->priv; + struct awc_private *priv = dev->priv; // unsigned long flags; // int cnt = 0; // int unlocked_stats_in_interrupt=0; @@ -3138,7 +3138,7 @@ int awc_change_mtu(struct net_device *dev, int new_mtu){ -// struct awc_private *priv = (struct awc_private *)dev->priv; +// struct awc_private *priv = dev->priv; unsigned long flags; if ((new_mtu < 256 ) || (new_mtu > 2312) || (max_mtu && new_mtu > max_mtu) ) diff -urN --exclude-from=/home/davej/.exclude linux/drivers/net/aironet4500_rid.c linux-dj/drivers/net/aironet4500_rid.c --- linux/drivers/net/aironet4500_rid.c Fri Mar 10 17:43:04 2000 +++ linux-dj/drivers/net/aironet4500_rid.c Mon Mar 19 22:58:16 2001 @@ -2142,7 +2142,7 @@ int awc_rids_setup(struct net_device * dev){ - struct awc_private * priv = (struct awc_private *) dev->priv; + struct awc_private * priv = dev->priv; int i=0; while ( i < AWC_NOF_RIDS){ if (awc_rids[i].selector) diff -urN --exclude-from=/home/davej/.exclude linux/drivers/net/am79c961a.c linux-dj/drivers/net/am79c961a.c --- linux/drivers/net/am79c961a.c Tue Feb 13 21:15:04 2001 +++ linux-dj/drivers/net/am79c961a.c Mon Mar 19 09:29:15 2001 @@ -202,7 +202,7 @@ static void am79c961_init_for_open(struct net_device *dev) { - struct dev_priv *priv = (struct dev_priv *)dev->priv; + struct dev_priv *priv = dev->priv; unsigned long flags; unsigned char *p; u_int hdr_addr, first_free_addr; @@ -284,7 +284,7 @@ static int am79c961_open(struct net_device *dev) { - struct dev_priv *priv = (struct dev_priv *)dev->priv; + struct dev_priv *priv = dev->priv; int ret; memset (&priv->stats, 0, sizeof (priv->stats)); @@ -306,7 +306,7 @@ static int am79c961_close(struct net_device *dev) { - struct dev_priv *priv = (struct dev_priv *)dev->priv; + struct dev_priv *priv = dev->priv; unsigned long flags; netif_stop_queue(dev); @@ -327,7 +327,7 @@ */ static struct net_device_stats *am79c961_getstats (struct net_device *dev) { - struct dev_priv *priv = (struct dev_priv *)dev->priv; + struct dev_priv *priv = dev->priv; return &priv->stats; } @@ -371,7 +371,7 @@ */ static void am79c961_setmulticastlist (struct net_device *dev) { - struct dev_priv *priv = (struct dev_priv *)dev->priv; + struct dev_priv *priv = dev->priv; unsigned long flags; unsigned short multi_hash[4], mode; int i, stopped; @@ -450,7 +450,7 @@ static int am79c961_sendpacket(struct sk_buff *skb, struct net_device *dev) { - struct dev_priv *priv = (struct dev_priv *)dev->priv; + struct dev_priv *priv = dev->priv; unsigned int length = ETH_ZLEN < skb->len ? skb->len : ETH_ZLEN; unsigned int hdraddr, bufaddr; unsigned int head; @@ -600,8 +600,8 @@ static void am79c961_interrupt(int irq, void *dev_id, struct pt_regs *regs) { - struct net_device *dev = (struct net_device *)dev_id; - struct dev_priv *priv = (struct dev_priv *)dev->priv; + struct net_device *dev = dev_id; + struct dev_priv *priv = dev->priv; u_int status; status = read_rreg(dev->base_addr, CSR0); @@ -622,7 +622,7 @@ static int am79c961_hw_init(struct net_device *dev) { - struct dev_priv *priv = (struct dev_priv *)dev->priv; + struct dev_priv *priv = dev->priv; spin_lock_irq(priv->chip_lock); write_rreg (dev->base_addr, CSR0, CSR0_STOP); diff -urN --exclude-from=/home/davej/.exclude linux/drivers/net/appletalk/cops.c linux-dj/drivers/net/appletalk/cops.c --- linux/drivers/net/appletalk/cops.c Mon Mar 19 09:16:23 2001 +++ linux-dj/drivers/net/appletalk/cops.c Mon Mar 19 23:01:24 2001 @@ -250,7 +250,7 @@ */ static int __init cops_probe1(struct net_device *dev, int ioaddr) { - struct cops_local *lp; + struct cops_local *lp; static unsigned version_printed; int board = board_type; int retval; @@ -320,7 +320,7 @@ goto err_out; } - lp = (struct cops_local *)dev->priv; + lp = dev->priv; memset(lp, 0, sizeof(struct cops_local)); /* Copy local board variable to lp struct. */ @@ -411,7 +411,7 @@ */ static int cops_open(struct net_device *dev) { - struct cops_local *lp = (struct cops_local *)dev->priv; + struct cops_local *lp = dev->priv; if(dev->irq==0) { @@ -445,7 +445,7 @@ */ static int cops_jumpstart(struct net_device *dev) { - struct cops_local *lp = (struct cops_local *)dev->priv; + struct cops_local *lp = dev->priv; /* * Once the card has the firmware loaded and has acquired @@ -479,7 +479,7 @@ */ static void cops_reset(struct net_device *dev, int sleep) { - struct cops_local *lp = (struct cops_local *)dev->priv; + struct cops_local *lp = dev->priv; int ioaddr=dev->base_addr; if(lp->board==TANGENT) @@ -513,8 +513,8 @@ static void cops_load (struct net_device *dev) { struct ifreq ifr; - struct ltfirmware *ltf= (struct ltfirmware *)&ifr.ifr_data; - struct cops_local *lp=(struct cops_local *)dev->priv; + struct ltfirmware *ltf= &ifr.ifr_data; + struct cops_local *lp=dev->priv; int ioaddr=dev->base_addr; int length, i = 0; @@ -607,7 +607,7 @@ */ static int cops_nodeid (struct net_device *dev, int nodeid) { - struct cops_local *lp = (struct cops_local *) dev->priv; + struct cops_local *lp = dev->priv; int ioaddr = dev->base_addr; if(lp->board == DAYNA) @@ -718,7 +718,7 @@ int boguscount = 0; ioaddr = dev->base_addr; - lp = (struct cops_local *)dev->priv; + lp = dev->priv; if(lp->board==DAYNA) { @@ -753,7 +753,7 @@ int pkt_len = 0; int rsp_type = 0; struct sk_buff *skb; - struct cops_local *lp = (struct cops_local *)dev->priv; + struct cops_local *lp = dev->priv; int ioaddr = dev->base_addr; int boguscount = 0; unsigned long flags; @@ -856,7 +856,7 @@ static void cops_timeout(struct net_device *dev) { - struct cops_local *lp = (struct cops_local *)dev->priv; + struct cops_local *lp = dev->priv; int ioaddr = dev->base_addr; lp->stats.tx_errors++; @@ -878,7 +878,7 @@ static int cops_send_packet(struct sk_buff *skb, struct net_device *dev) { - struct cops_local *lp = (struct cops_local *)dev->priv; + struct cops_local *lp = dev->priv; int ioaddr = dev->base_addr; unsigned long flags; @@ -952,9 +952,9 @@ static int cops_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd) { - struct cops_local *lp = (struct cops_local *)dev->priv; - struct sockaddr_at *sa=(struct sockaddr_at *)&ifr->ifr_addr; - struct at_addr *aa=(struct at_addr *)&lp->node_addr; + struct cops_local *lp = dev->priv; + struct sockaddr_at *sa=&ifr->ifr_addr; + struct at_addr *aa=&lp->node_addr; switch(cmd) { @@ -988,7 +988,7 @@ static int cops_close(struct net_device *dev) { - struct cops_local *lp = (struct cops_local *)dev->priv; + struct cops_local *lp = dev->priv; /* If we were running polled, yank the timer. */ @@ -1005,7 +1005,7 @@ */ static struct net_device_stats *cops_get_stats(struct net_device *dev) { - struct cops_local *lp = (struct cops_local *)dev->priv; + struct cops_local *lp = dev->priv; return &lp->stats; } diff -urN --exclude-from=/home/davej/.exclude linux/drivers/net/ariadne.c linux-dj/drivers/net/ariadne.c --- linux/drivers/net/ariadne.c Mon Mar 19 09:16:23 2001 +++ linux-dj/drivers/net/ariadne.c Mon Mar 19 09:29:12 2001 @@ -220,7 +220,7 @@ static int ariadne_open(struct net_device *dev) { - volatile struct Am79C960 *lance = (struct Am79C960*)dev->base_addr; + volatile struct Am79C960 *lance = dev->base_addr; u_short in; u_long version; int i; @@ -326,8 +326,8 @@ static void ariadne_init_ring(struct net_device *dev) { - struct ariadne_private *priv = (struct ariadne_private *)dev->priv; - volatile struct lancedata *lancedata = (struct lancedata *)dev->mem_start; + struct ariadne_private *priv = dev->priv; + volatile struct lancedata *lancedata = dev->mem_start; int i; netif_stop_queue(dev); @@ -372,8 +372,8 @@ static int ariadne_close(struct net_device *dev) { - struct ariadne_private *priv = (struct ariadne_private *)dev->priv; - volatile struct Am79C960 *lance = (struct Am79C960*)dev->base_addr; + struct ariadne_private *priv = dev->priv; + volatile struct Am79C960 *lance = dev->base_addr; netif_stop_queue(dev); @@ -399,7 +399,7 @@ static inline void ariadne_reset(struct net_device *dev) { - volatile struct Am79C960 *lance = (struct Am79C960*)dev->base_addr; + volatile struct Am79C960 *lance = dev->base_addr; lance->RAP = CSR0; /* PCnet-ISA Controller Status */ lance->RDP = STOP; @@ -411,8 +411,8 @@ static void ariadne_interrupt(int irq, void *data, struct pt_regs *fp) { - struct net_device *dev = (struct net_device *)data; - volatile struct Am79C960 *lance = (struct Am79C960*)dev->base_addr; + struct net_device *dev = data; + volatile struct Am79C960 *lance = dev->base_addr; struct ariadne_private *priv; int csr0, boguscnt; @@ -426,7 +426,7 @@ if (!(lance->RDP & INTR)) /* Check if any interrupt has been */ return; /* generated by the board. */ - priv = (struct ariadne_private *)dev->priv; + priv = dev->priv; boguscnt = 10; while ((csr0 = lance->RDP) & (ERR|RINT|TINT) && --boguscnt >= 0) { @@ -562,7 +562,7 @@ static void ariadne_tx_timeout(struct net_device *dev) { - volatile struct Am79C960 *lance = (struct Am79C960*)dev->base_addr; + volatile struct Am79C960 *lance = dev->base_addr; printk(KERN_ERR "%s: transmit timed out, status %4.4x, resetting.\n", dev->name, lance->RDP); @@ -573,8 +573,8 @@ static int ariadne_start_xmit(struct sk_buff *skb, struct net_device *dev) { - struct ariadne_private *priv = (struct ariadne_private *)dev->priv; - volatile struct Am79C960 *lance = (struct Am79C960*)dev->base_addr; + struct ariadne_private *priv = dev->priv; + volatile struct Am79C960 *lance = dev->base_addr; int entry; unsigned long flags; @@ -673,7 +673,7 @@ static int ariadne_rx(struct net_device *dev) { - struct ariadne_private *priv = (struct ariadne_private *)dev->priv; + struct ariadne_private *priv = dev->priv; int entry = priv->cur_rx % RX_RING_SIZE; int i; @@ -763,8 +763,8 @@ static struct net_device_stats *ariadne_get_stats(struct net_device *dev) { - struct ariadne_private *priv = (struct ariadne_private *)dev->priv; - volatile struct Am79C960 *lance = (struct Am79C960*)dev->base_addr; + struct ariadne_private *priv = dev->priv; + volatile struct Am79C960 *lance = dev->base_addr; short saved_addr; unsigned long flags; @@ -788,7 +788,7 @@ */ static void set_multicast_list(struct net_device *dev) { - volatile struct Am79C960 *lance = (struct Am79C960*)dev->base_addr; + volatile struct Am79C960 *lance = dev->base_addr; if (!netif_running(dev)) return; diff -urN --exclude-from=/home/davej/.exclude linux/drivers/net/arlan-proc.c linux-dj/drivers/net/arlan-proc.c --- linux/drivers/net/arlan-proc.c Mon Mar 19 09:16:23 2001 +++ linux-dj/drivers/net/arlan-proc.c Mon Mar 19 09:29:14 2001 @@ -192,7 +192,7 @@ u_char diagnosticInfo; u_short diagnosticOffset; u_char hardwareType; - volatile struct arlan_shmem *arlan = ((struct arlan_private *) dev->priv)->card; + volatile struct arlan_shmem *arlan = (dev->priv)->card; // ARLAN_DEBUG_ENTRY("arlan_print_diagnostic_info"); @@ -257,7 +257,7 @@ int i; int memlen = sizeof(struct arlan_shmem) - 0xF; /* avoid control register */ volatile char *arlan_mem = (char *) (dev->mem_start); - volatile struct arlan_shmem *arlan = ((struct arlan_private *) dev->priv)->card; + volatile struct arlan_shmem *arlan = (dev->priv)->card; char pattern; ptr = NULL; @@ -322,7 +322,7 @@ static int arlan_setup_card_by_book(struct net_device *dev) { u_char irqLevel, configuredStatusFlag; - volatile struct arlan_shmem *arlan = ((struct arlan_private *) dev->priv)->card; + volatile struct arlan_shmem *arlan = (dev->priv)->card; // ARLAN_DEBUG_ENTRY("arlan_setup_card"); diff -urN --exclude-from=/home/davej/.exclude linux/drivers/net/arlan.c linux-dj/drivers/net/arlan.c --- linux/drivers/net/arlan.c Mon Mar 19 09:16:23 2001 +++ linux-dj/drivers/net/arlan.c Mon Mar 19 09:29:20 2001 @@ -148,26 +148,26 @@ #define ARLAN_COMMAND_INC(dev) \ - {((struct arlan_private *) dev->priv)->under_command++;} + {(dev->priv)->under_command++;} #define ARLAN_COMMAND_ZERO(dev) \ - {((struct arlan_private *) dev->priv)->under_command =0;} + {(dev->priv)->under_command =0;} #define ARLAN_UNDER_COMMAND(dev)\ - (((struct arlan_private *) dev->priv)->under_command) + ((dev->priv)->under_command) #define ARLAN_COMMAND_START(dev) ARLAN_COMMAND_INC(dev) #define ARLAN_COMMAND_END(dev) ARLAN_COMMAND_ZERO(dev) #define ARLAN_TOGGLE_START(dev)\ - {((struct arlan_private *) dev->priv)->under_toggle++;} + {(dev->priv)->under_toggle++;} #define ARLAN_TOGGLE_END(dev)\ - {((struct arlan_private *) dev->priv)->under_toggle=0;} + {(dev->priv)->under_toggle=0;} #define ARLAN_UNDER_TOGGLE(dev)\ - (((struct arlan_private *) dev->priv)->under_toggle) + ((dev->priv)->under_toggle) extern inline int arlan_drop_tx(struct net_device *dev) { - struct arlan_private *priv = ((struct arlan_private *) dev->priv); + struct arlan_private *priv = dev->priv; priv->stats.tx_errors++; if (priv->Conf->tx_delay_ms) @@ -194,7 +194,7 @@ volatile struct arlan_shmem *arlan = ((struct arlan_private *) dev->priv)->card; struct arlan_conf_stru *conf = ((struct arlan_private *) dev->priv)->Conf; - struct arlan_private *priv = (struct arlan_private *) dev->priv; + struct arlan_private *priv = dev->priv; int udelayed = 0; int i = 0; long long time_mks = arlan_time(); @@ -535,7 +535,7 @@ extern inline void arlan_command_process(struct net_device *dev) { - struct arlan_private *priv = ((struct arlan_private *) dev->priv); + struct arlan_private *priv = dev->priv; int times = 0; while (priv->waiting_command_mask && times < 8) @@ -556,7 +556,7 @@ extern inline void arlan_retransmit_now(struct net_device *dev) { - struct arlan_private *priv = ((struct arlan_private *) dev->priv); + struct arlan_private *priv = dev->priv; ARLAN_DEBUG_ENTRY("arlan_retransmit_now"); @@ -597,7 +597,7 @@ static void arlan_registration_timer(unsigned long data) { struct net_device *dev = (struct net_device *) data; - struct arlan_private *priv = (struct arlan_private *) dev->priv; + struct arlan_private *priv = dev->priv; int lostTime = ((int) (jiffies - priv->registrationLastSeen)) * 1000 / HZ; int bh_mark_needed = 0; @@ -698,7 +698,7 @@ static void arlan_print_registers(struct net_device *dev, int line) { - volatile struct arlan_shmem *arlan = ((struct arlan_private *) dev->priv)->card; + volatile struct arlan_shmem *arlan = (dev->priv)->card; u_char hostcpuLock, lancpuLock, controlRegister, cntrlRegImage, txStatus, rxStatus, interruptInProgress, commandByte; @@ -727,7 +727,7 @@ { int i; - struct arlan_private *priv = (struct arlan_private *) dev->priv; + struct arlan_private *priv = dev->priv; volatile struct arlan_shmem *arlan = priv->card; struct arlan_conf_stru *conf = priv->Conf; @@ -832,7 +832,7 @@ { volatile struct arlan_shmem *arlan = ((struct arlan_private *) dev->priv)->card; struct arlan_conf_stru *conf = ((struct arlan_private *) dev->priv)->Conf; - struct arlan_private *priv = (struct arlan_private *) dev->priv; + struct arlan_private *priv = dev->priv; ARLAN_DEBUG_ENTRY("arlan_hw_config"); @@ -1190,7 +1190,7 @@ kmalloc(sizeof(struct arlan_shmem), GFP_KERNEL); if (dev == NULL || dev->priv == NULL || - ((struct arlan_private *) dev->priv)->conf == NULL) + ((struct arlan_private *) dev->priv)->conf == NULL) { return 0; printk(KERN_CRIT " No memory at arlan_allocate_device \n"); @@ -1266,7 +1266,7 @@ static int arlan_open(struct net_device *dev) { - struct arlan_private *priv = (struct arlan_private *) dev->priv; + struct arlan_private *priv = dev->priv; volatile struct arlan_shmem *arlan = priv->card; int ret = 0; @@ -1349,7 +1349,7 @@ static int arlan_tx(struct sk_buff *skb, struct net_device *dev) { - struct arlan_private *priv = ((struct arlan_private *) dev->priv); + struct arlan_private *priv = dev->priv; short length; unsigned char *buf; @@ -1386,7 +1386,7 @@ extern inline int DoNotReTransmitCrap(struct net_device *dev) { - struct arlan_private *priv = ((struct arlan_private *) dev->priv); + struct arlan_private *priv = dev->priv; if (TXLAST(dev).length < priv->Conf->ReTransmitPacketMaxSize) return 1; @@ -1396,7 +1396,7 @@ extern inline int DoNotWaitReTransmitCrap(struct net_device *dev) { - struct arlan_private *priv = ((struct arlan_private *) dev->priv); + struct arlan_private *priv = dev->priv; if (TXLAST(dev).length < priv->Conf->waitReTransmitPacketMaxSize) return 1; @@ -1405,7 +1405,7 @@ extern inline void arlan_queue_retransmit(struct net_device *dev) { - struct arlan_private *priv = ((struct arlan_private *) dev->priv); + struct arlan_private *priv = dev->priv; ARLAN_DEBUG_ENTRY("arlan_queue_retransmit"); @@ -1420,7 +1420,7 @@ extern inline void RetryOrFail(struct net_device *dev) { - struct arlan_private *priv = ((struct arlan_private *) dev->priv); + struct arlan_private *priv = dev->priv; ARLAN_DEBUG_ENTRY("RetryOrFail"); @@ -1441,7 +1441,7 @@ static void arlan_tx_done_interrupt(struct net_device *dev, int status) { - struct arlan_private *priv = ((struct arlan_private *) dev->priv); + struct arlan_private *priv = dev->priv; ARLAN_DEBUG_ENTRY("arlan_tx_done_interrupt"); @@ -1585,7 +1585,7 @@ char *skbtmp; int i = 0; - struct arlan_private *priv = (struct arlan_private *) dev->priv; + struct arlan_private *priv = dev->priv; volatile struct arlan_shmem *arlan = priv->card; struct arlan_conf_stru *conf = priv->Conf; @@ -1737,7 +1737,7 @@ static void arlan_process_interrupt(struct net_device *dev) { - struct arlan_private *priv = (struct arlan_private *) dev->priv; + struct arlan_private *priv = dev->priv; volatile struct arlan_shmem *arlan = priv->card; u_char rxStatus = READSHMB(arlan->rxStatus); u_char txStatus = READSHMB(arlan->txStatus); @@ -1843,7 +1843,7 @@ static void arlan_interrupt(int irq, void *dev_id, struct pt_regs *regs) { struct net_device *dev = dev_id; - struct arlan_private *priv = (struct arlan_private *) dev->priv; + struct arlan_private *priv = dev->priv; volatile struct arlan_shmem *arlan = priv->card; u_char rxStatus = READSHMB(arlan->rxStatus); u_char txStatus = READSHMB(arlan->txStatus); @@ -1866,14 +1866,14 @@ static int arlan_close(struct net_device *dev) { - struct arlan_private *priv = (struct arlan_private *) dev->priv; + struct arlan_private *priv = NULL; if (!dev) { printk(KERN_CRIT "arlan: No Device\n"); return 0; } - priv = (struct arlan_private *) dev->priv; + priv = dev->priv; if (!priv) { printk(KERN_CRIT "arlan: No Device priv \n"); @@ -1912,7 +1912,7 @@ static struct net_device_stats *arlan_statistics(struct net_device *dev) { - struct arlan_private *priv = (struct arlan_private *) dev->priv; + struct arlan_private *priv = dev->priv; volatile struct arlan_shmem *arlan = ((struct arlan_private *) dev->priv)->card; diff -urN --exclude-from=/home/davej/.exclude linux/drivers/net/at1700.c linux-dj/drivers/net/at1700.c --- linux/drivers/net/at1700.c Tue Feb 13 21:15:05 2001 +++ linux-dj/drivers/net/at1700.c Mon Mar 19 09:29:11 2001 @@ -429,7 +429,7 @@ dev->tx_timeout = net_tx_timeout; dev->watchdog_timeo = TX_TIMEOUT; - lp = (struct net_local *)dev->priv; + lp = dev->priv; lp->lock = SPIN_LOCK_UNLOCKED; /* Fill in the fields of 'dev' with ethernet-generic values. */ @@ -508,7 +508,7 @@ static int net_open(struct net_device *dev) { - struct net_local *lp = (struct net_local *)dev->priv; + struct net_local *lp = dev->priv; int ioaddr = dev->base_addr; /* Set the configuration register 0 to 32K 100ns. byte-wide memory, 16 bit @@ -539,7 +539,7 @@ static void net_tx_timeout (struct net_device *dev) { - struct net_local *lp = (struct net_local *)dev->priv; + struct net_local *lp = dev->priv; int ioaddr = dev->base_addr; printk ("%s: transmit timed out with status %04x, %s?\n", dev->name, @@ -573,7 +573,7 @@ static int net_send_packet (struct sk_buff *skb, struct net_device *dev) { - struct net_local *lp = (struct net_local *) dev->priv; + struct net_local *lp = dev->priv; int ioaddr = dev->base_addr; short length = ETH_ZLEN < skb->len ? skb->len : ETH_ZLEN; unsigned char *buf = skb->data; @@ -626,7 +626,7 @@ } ioaddr = dev->base_addr; - lp = (struct net_local *)dev->priv; + lp = dev->priv; spin_lock (&lp->lock); @@ -684,7 +684,7 @@ static void net_rx(struct net_device *dev) { - struct net_local *lp = (struct net_local *)dev->priv; + struct net_local *lp = dev->priv; int ioaddr = dev->base_addr; int boguscount = 5; @@ -767,7 +767,7 @@ /* The inverse routine to net_open(). */ static int net_close(struct net_device *dev) { - struct net_local *lp = (struct net_local *)dev->priv; + struct net_local *lp = dev->priv; int ioaddr = dev->base_addr; netif_stop_queue(dev); @@ -795,7 +795,7 @@ static struct net_device_stats * net_get_stats(struct net_device *dev) { - struct net_local *lp = (struct net_local *)dev->priv; + struct net_local *lp = dev->priv; return &lp->stats; } @@ -828,7 +828,7 @@ set_rx_mode(struct net_device *dev) { int ioaddr = dev->base_addr; - struct net_local *lp = (struct net_local *)dev->priv; + struct net_local *lp = dev->priv; unsigned char mc_filter[8]; /* Multicast hash filter */ long flags; int i; diff -urN --exclude-from=/home/davej/.exclude linux/drivers/net/atari_bionet.c linux-dj/drivers/net/atari_bionet.c --- linux/drivers/net/atari_bionet.c Tue Feb 13 21:15:05 2001 +++ linux-dj/drivers/net/atari_bionet.c Mon Mar 19 09:29:19 2001 @@ -406,7 +406,7 @@ */ static int bionet_open(struct net_device *dev) { - struct net_local *lp = (struct net_local *)dev->priv; + struct net_local *lp = dev->priv; if (bionet_debug > 0) printk("bionet_open\n"); @@ -431,7 +431,7 @@ static int bionet_send_packet(struct sk_buff *skb, struct net_device *dev) { - struct net_local *lp = (struct net_local *)dev->priv; + struct net_local *lp = dev->priv; unsigned long flags; /* Block a timer-based transmit from overlapping. This could better be @@ -498,7 +498,7 @@ */ static void bionet_poll_rx(struct net_device *dev) { - struct net_local *lp = (struct net_local *)dev->priv; + struct net_local *lp = dev->priv; int boguscount = 10; int pkt_len, status; unsigned long flags; @@ -600,8 +600,8 @@ */ static void bionet_tick(unsigned long data) { - struct net_device *dev = (struct net_device *)data; - struct net_local *lp = (struct net_local *)dev->priv; + struct net_device *dev = data; + struct net_local *lp = dev->priv; if( bionet_debug > 0 && (lp->open_time++ & 7) == 8 ) printk("bionet_tick: %ld\n", lp->open_time); @@ -616,7 +616,7 @@ */ static int bionet_close(struct net_device *dev) { - struct net_local *lp = (struct net_local *)dev->priv; + struct net_local *lp = dev->priv; if (bionet_debug > 0) printk("bionet_close, open_time=%ld\n", lp->open_time); @@ -638,7 +638,7 @@ */ static struct net_device_stats *net_get_stats(struct net_device *dev) { - struct net_local *lp = (struct net_local *)dev->priv; + struct net_local *lp = dev->priv; return &lp->stats; } diff -urN --exclude-from=/home/davej/.exclude linux/drivers/net/atari_pamsnet.c linux-dj/drivers/net/atari_pamsnet.c --- linux/drivers/net/atari_pamsnet.c Tue Feb 13 21:15:05 2001 +++ linux-dj/drivers/net/atari_pamsnet.c Mon Mar 19 09:29:12 2001 @@ -666,7 +666,7 @@ */ static int pamsnet_open(struct net_device *dev) { - struct net_local *lp = (struct net_local *)dev->priv; + struct net_local *lp = dev->priv; if (pamsnet_debug > 0) printk("pamsnet_open\n"); @@ -695,7 +695,7 @@ static int pamsnet_send_packet(struct sk_buff *skb, struct net_device *dev) { - struct net_local *lp = (struct net_local *)dev->priv; + struct net_local *lp = dev->priv; unsigned long flags; /* Block a timer-based transmit from overlapping. This could better be @@ -742,7 +742,7 @@ */ static void pamsnet_poll_rx(struct net_device *dev) { - struct net_local *lp = (struct net_local *)dev->priv; + struct net_local *lp = dev->priv; int boguscount; int pkt_len; struct sk_buff *skb; @@ -817,8 +817,8 @@ */ static void pamsnet_tick(unsigned long data) { - struct net_device *dev = (struct net_device *)data; - struct net_local *lp = (struct net_local *)dev->priv; + struct net_device *dev = data; + struct net_local *lp = dev->priv; if( pamsnet_debug > 0 && (lp->open_time++ & 7) == 8 ) printk("pamsnet_tick: %ld\n", lp->open_time); @@ -833,7 +833,7 @@ */ static int pamsnet_close(struct net_device *dev) { - struct net_local *lp = (struct net_local *)dev->priv; + struct net_local *lp = dev->priv; if (pamsnet_debug > 0) printk("pamsnet_close, open_time=%ld\n", lp->open_time); @@ -860,7 +860,7 @@ */ static struct net_device_stats *net_get_stats(struct net_device *dev) { - struct net_local *lp = (struct net_local *)dev->priv; + struct net_local *lp = dev->priv; return &lp->stats; } diff -urN --exclude-from=/home/davej/.exclude linux/drivers/net/atarilance.c linux-dj/drivers/net/atarilance.c --- linux/drivers/net/atarilance.c Tue Feb 13 21:15:05 2001 +++ linux-dj/drivers/net/atarilance.c Mon Mar 19 09:29:20 2001 @@ -520,7 +520,7 @@ if (!dev->priv) return 0; } - lp = (struct lance_private *)dev->priv; + lp = dev->priv; MEM = (struct lance_memory *)memaddr; IO = lp->iobase = (struct lance_ioreg *)ioaddr; dev->base_addr = (unsigned long)ioaddr; /* informational only */ @@ -643,7 +643,7 @@ static int lance_open( struct net_device *dev ) -{ struct lance_private *lp = (struct lance_private *)dev->priv; +{ struct lance_private *lp = dev->priv; struct lance_ioreg *IO = lp->iobase; int i; @@ -684,7 +684,7 @@ static void lance_init_ring( struct net_device *dev ) -{ struct lance_private *lp = (struct lance_private *)dev->priv; +{ struct lance_private *lp = dev->priv; int i; unsigned offset; @@ -732,7 +732,7 @@ static void lance_tx_timeout (struct net_device *dev) { - struct lance_private *lp = (struct lance_private *) dev->priv; + struct lance_private *lp = dev->priv; struct lance_ioreg *IO = lp->iobase; AREG = CSR0; @@ -775,7 +775,7 @@ static int lance_start_xmit( struct sk_buff *skb, struct net_device *dev ) -{ struct lance_private *lp = (struct lance_private *)dev->priv; +{ struct lance_private *lp = dev->priv; struct lance_ioreg *IO = lp->iobase; int entry, len; struct lance_tx_head *head; @@ -859,7 +859,7 @@ return; } - lp = (struct lance_private *)dev->priv; + lp = dev->priv; IO = lp->iobase; spin_lock (&lp->devlock); @@ -958,7 +958,7 @@ static int lance_rx( struct net_device *dev ) -{ struct lance_private *lp = (struct lance_private *)dev->priv; +{ struct lance_private *lp = dev->priv; int entry = lp->cur_rx & RX_RING_MOD_MASK; int i; @@ -1052,7 +1052,7 @@ static int lance_close( struct net_device *dev ) -{ struct lance_private *lp = (struct lance_private *)dev->priv; +{ struct lance_private *lp = dev->priv; struct lance_ioreg *IO = lp->iobase; netif_stop_queue (dev); @@ -1072,7 +1072,7 @@ static struct net_device_stats *lance_get_stats( struct net_device *dev ) -{ struct lance_private *lp = (struct lance_private *)dev->priv; +{ struct lance_private *lp = dev->priv; return &lp->stats; } @@ -1087,7 +1087,7 @@ static void set_multicast_list( struct net_device *dev ) -{ struct lance_private *lp = (struct lance_private *)dev->priv; +{ struct lance_private *lp = dev->priv; struct lance_ioreg *IO = lp->iobase; if (netif_running(dev)) @@ -1129,7 +1129,7 @@ static int lance_set_mac_address( struct net_device *dev, void *addr ) -{ struct lance_private *lp = (struct lance_private *)dev->priv; +{ struct lance_private *lp = dev->priv; struct sockaddr *saddr = addr; int i; diff -urN --exclude-from=/home/davej/.exclude linux/drivers/net/atp.c linux-dj/drivers/net/atp.c --- linux/drivers/net/atp.c Mon Mar 19 09:16:23 2001 +++ linux-dj/drivers/net/atp.c Mon Mar 19 09:29:11 2001 @@ -334,7 +334,7 @@ return -ENOMEM; memset(dev->priv, 0, sizeof(struct net_local)); - lp = (struct net_local *)dev->priv; + lp = dev->priv; lp->chip_type = RTL8002; lp->addr_mode = CMR2h_Normal; spin_lock_init(&lp->lock); @@ -425,7 +425,7 @@ */ static int net_open(struct net_device *dev) { - struct net_local *lp = (struct net_local *)dev->priv; + struct net_local *lp = dev->priv; int ret; /* The interrupt line is turned off (tri-stated) when the device isn't in @@ -451,7 +451,7 @@ the hardware may have been temporarily detached. */ static void hardware_init(struct net_device *dev) { - struct net_local *lp = (struct net_local *)dev->priv; + struct net_local *lp = dev->priv; long ioaddr = dev->base_addr; int i; @@ -524,7 +524,7 @@ static void tx_timeout(struct net_device *dev) { - struct net_local *np = (struct net_local *)dev->priv; + struct net_local *np = dev->priv; long ioaddr = dev->base_addr; printk(KERN_WARNING "%s: Transmit timed out, %s?\n", dev->name, @@ -540,7 +540,7 @@ static int atp_send_packet(struct sk_buff *skb, struct net_device *dev) { - struct net_local *lp = (struct net_local *)dev->priv; + struct net_local *lp = dev->priv; long ioaddr = dev->base_addr; int length; long flags; @@ -581,7 +581,7 @@ Handle the network interface interrupts. */ static void atp_interrupt(int irq, void *dev_instance, struct pt_regs * regs) { - struct net_device *dev = (struct net_device *)dev_instance; + struct net_device *dev = dev_instance; struct net_local *lp; long ioaddr; static int num_tx_since_rx = 0; @@ -592,7 +592,7 @@ return; } ioaddr = dev->base_addr; - lp = (struct net_local *)dev->priv; + lp = dev->priv; spin_lock(&lp->lock); @@ -705,7 +705,7 @@ { struct net_device *dev = (struct net_device *)data; long ioaddr = dev->base_addr; - struct net_local *lp = (struct net_local *)dev->priv; + struct net_local *lp = dev->priv; int tickssofar = jiffies - lp->last_rx_time; int i; @@ -719,7 +719,7 @@ for (i = 0; i < 6; i++) if (read_cmd_byte(ioaddr, PAR0 + i) != atp_timed_dev->dev_addr[i]) { - struct net_local *lp = (struct net_local *)atp_timed_dev->priv; + struct net_local *lp = atp_timed_dev->priv; write_reg_byte(ioaddr, PAR0 + i, atp_timed_dev->dev_addr[i]); if (i == 2) lp->stats.tx_errors++; @@ -741,7 +741,7 @@ /* We have a good packet(s), get it/them out of the buffers. */ static void net_rx(struct net_device *dev) { - struct net_local *lp = (struct net_local *)dev->priv; + struct net_local *lp = dev->priv; long ioaddr = dev->base_addr; struct rx_header rx_head; @@ -817,7 +817,7 @@ static int net_close(struct net_device *dev) { - struct net_local *lp = (struct net_local *)dev->priv; + struct net_local *lp = dev->priv; long ioaddr = dev->base_addr; netif_stop_queue(dev); @@ -842,7 +842,7 @@ static struct net_device_stats * net_get_stats(struct net_device *dev) { - struct net_local *lp = (struct net_local *)dev->priv; + struct net_local *lp = dev->priv; return &lp->stats; } @@ -872,7 +872,7 @@ static void set_rx_mode_8002(struct net_device *dev) { - struct net_local *lp = (struct net_local *)dev->priv; + struct net_local *lp = dev->priv; long ioaddr = dev->base_addr; if ( dev->mc_count > 0 || (dev->flags & (IFF_ALLMULTI|IFF_PROMISC))) { @@ -889,7 +889,7 @@ static void set_rx_mode_8012(struct net_device *dev) { - struct net_local *lp = (struct net_local *)dev->priv; + struct net_local *lp = dev->priv; long ioaddr = dev->base_addr; unsigned char new_mode, mc_filter[8]; /* Multicast hash filter */ int i; diff -urN --exclude-from=/home/davej/.exclude linux/drivers/net/bagetlance.c linux-dj/drivers/net/bagetlance.c --- linux/drivers/net/bagetlance.c Tue Feb 13 21:15:05 2001 +++ linux-dj/drivers/net/bagetlance.c Mon Mar 19 09:29:19 2001 @@ -589,7 +589,7 @@ if (!dev->priv) return 0; } - lp = (struct lance_private *)dev->priv; + lp = dev->priv; MEM = (struct lance_memory *)memaddr; IO = lp->iobase = (struct lance_ioreg *)ioaddr; dev->base_addr = (unsigned long)ioaddr; /* informational only */ @@ -729,7 +729,7 @@ static int lance_open( struct net_device *dev ) -{ struct lance_private *lp = (struct lance_private *)dev->priv; +{ struct lance_private *lp = dev->priv; struct lance_ioreg *IO = lp->iobase; int i; @@ -771,7 +771,7 @@ static void lance_init_ring( struct net_device *dev ) -{ struct lance_private *lp = (struct lance_private *)dev->priv; +{ struct lance_private *lp = dev->priv; int i; unsigned offset; @@ -827,7 +827,7 @@ static int lance_start_xmit( struct sk_buff *skb, struct net_device *dev ) -{ struct lance_private *lp = (struct lance_private *)dev->priv; +{ struct lance_private *lp = dev->priv; struct lance_ioreg *IO = lp->iobase; int entry, len; struct lance_tx_head *head; @@ -974,7 +974,7 @@ return; } - lp = (struct lance_private *)dev->priv; + lp = dev->priv; IO = lp->iobase; AREG = CSR0; @@ -1086,7 +1086,7 @@ static int lance_rx( struct net_device *dev ) -{ struct lance_private *lp = (struct lance_private *)dev->priv; +{ struct lance_private *lp = dev->priv; int entry = lp->cur_rx & RX_RING_MOD_MASK; int i; @@ -1210,7 +1210,7 @@ static int lance_close( struct net_device *dev ) -{ struct lance_private *lp = (struct lance_private *)dev->priv; +{ struct lance_private *lp = dev->priv; struct lance_ioreg *IO = lp->iobase; dev->start = 0; @@ -1232,7 +1232,7 @@ static struct net_device_stats *lance_get_stats( struct net_device *dev ) { - struct lance_private *lp = (struct lance_private *)dev->priv; + struct lance_private *lp = dev->priv; return &lp->stats; } @@ -1246,7 +1246,7 @@ static void set_multicast_list( struct net_device *dev ) -{ struct lance_private *lp = (struct lance_private *)dev->priv; +{ struct lance_private *lp = dev->priv; struct lance_ioreg *IO = lp->iobase; if (!dev->start) @@ -1288,7 +1288,7 @@ static int lance_set_mac_address( struct net_device *dev, void *addr ) -{ struct lance_private *lp = (struct lance_private *)dev->priv; +{ struct lance_private *lp = dev->priv; struct sockaddr *saddr = addr; int i; diff -urN --exclude-from=/home/davej/.exclude linux/drivers/net/bmac.c linux-dj/drivers/net/bmac.c --- linux/drivers/net/bmac.c Mon Mar 19 09:16:23 2001 +++ linux-dj/drivers/net/bmac.c Mon Mar 19 09:29:16 2001 @@ -244,7 +244,7 @@ static void bmac_reset_chip(struct net_device *dev) { - struct bmac_data *bp = (struct bmac_data *) dev->priv; + struct bmac_data *bp = dev->priv; volatile struct dbdma_regs *rd = bp->rx_dma; volatile struct dbdma_regs *td = bp->tx_dma; @@ -331,7 +331,7 @@ static void bmac_init_registers(struct net_device *dev) { - struct bmac_data *bp = (struct bmac_data *) dev->priv; + struct bmac_data *bp = dev->priv; volatile unsigned short regValue; unsigned short *pWord16; int i; @@ -426,7 +426,7 @@ static void bmac_start_chip(struct net_device *dev) { - struct bmac_data *bp = (struct bmac_data *) dev->priv; + struct bmac_data *bp = dev->priv; volatile struct dbdma_regs *rd = bp->rx_dma; unsigned short oldConfig; @@ -446,7 +446,7 @@ bmac_init_phy(struct net_device *dev) { unsigned int addr; - struct bmac_data *bp = (struct bmac_data *) dev->priv; + struct bmac_data *bp = dev->priv; printk(KERN_DEBUG "phy registers:"); for (addr = 0; addr < 32; ++addr) { @@ -486,7 +486,7 @@ if (bmac_devs == 0) return PBOOK_SLEEP_OK; - bp = (struct bmac_data *) bmac_devs->priv; + bp = bmac_devs->priv; switch (when) { case PBOOK_SLEEP_REQUEST: @@ -541,7 +541,7 @@ static inline void bmac_set_timeout(struct net_device *dev) { - struct bmac_data *bp = (struct bmac_data *) dev->priv; + struct bmac_data *bp = dev->priv; unsigned long flags; save_flags(flags); @@ -650,7 +650,7 @@ static int bmac_transmit_packet(struct sk_buff *skb, struct net_device *dev) { - struct bmac_data *bp = (struct bmac_data *) dev->priv; + struct bmac_data *bp = dev->priv; volatile struct dbdma_regs *td = bp->tx_dma; int i; @@ -685,8 +685,8 @@ static void bmac_rxdma_intr(int irq, void *dev_id, struct pt_regs *regs) { - struct net_device *dev = (struct net_device *) dev_id; - struct bmac_data *bp = (struct bmac_data *) dev->priv; + struct net_device *dev = dev_id; + struct bmac_data *bp = dev->priv; volatile struct dbdma_regs *rd = bp->rx_dma; volatile struct dbdma_cmd *cp; int i, nb, stat; @@ -754,8 +754,8 @@ static void bmac_txdma_intr(int irq, void *dev_id, struct pt_regs *regs) { - struct net_device *dev = (struct net_device *) dev_id; - struct bmac_data *bp = (struct bmac_data *) dev->priv; + struct net_device *dev = dev_id; + struct bmac_data *bp = dev->priv; volatile struct dbdma_cmd *cp; int stat; unsigned long flags; @@ -801,7 +801,7 @@ static struct net_device_stats *bmac_stats(struct net_device *dev) { - struct bmac_data *p = (struct bmac_data *) dev->priv; + struct bmac_data *p = dev->priv; return &p->stats; } @@ -974,7 +974,7 @@ static void bmac_set_multicast(struct net_device *dev) { struct dev_mc_list *dmi; - struct bmac_data *bp = (struct bmac_data *) dev->priv; + struct bmac_data *bp = dev->priv; int num_addrs = dev->mc_count; unsigned short rx_cfg; int i; @@ -1074,8 +1074,8 @@ static void bmac_misc_intr(int irq, void *dev_id, struct pt_regs *regs) { - struct net_device *dev = (struct net_device *) dev_id; - struct bmac_data *bp = (struct bmac_data *)dev->priv; + struct net_device *dev = dev_id; + struct bmac_data *bp = dev->priv; unsigned int status = bmread(dev, STATUS); if (miscintcount++ < 10) { XXDEBUG(("bmac_misc_intr\n")); @@ -1336,7 +1336,7 @@ if (bmac_verify_checksum(dev) != 0) goto err_out_iounmap; - bp = (struct bmac_data *) dev->priv; + bp = dev->priv; bp->is_bmac_plus = is_bmac_plus; bp->tx_dma = (volatile struct dbdma_regs *) ioremap(bmac->addrs[1].address, bmac->addrs[1].size); @@ -1409,7 +1409,7 @@ static int bmac_close(struct net_device *dev) { - struct bmac_data *bp = (struct bmac_data *) dev->priv; + struct bmac_data *bp = dev->priv; volatile struct dbdma_regs *rd = bp->rx_dma; volatile struct dbdma_regs *td = bp->tx_dma; unsigned short config; @@ -1487,7 +1487,7 @@ static void bmac_tx_timeout(unsigned long data) { struct net_device *dev = (struct net_device *) data; - struct bmac_data *bp = (struct bmac_data *) dev->priv; + struct bmac_data *bp = dev->priv; volatile struct dbdma_regs *td = bp->tx_dma; volatile struct dbdma_regs *rd = bp->rx_dma; volatile struct dbdma_cmd *cp; @@ -1627,7 +1627,7 @@ do { dev = bmac_devs; - bp = (struct bmac_data *) dev->priv; + bp = dev->priv; bmac_devs = bp->next_bmac; free_irq(dev->irq, dev); diff -urN --exclude-from=/home/davej/.exclude linux/drivers/net/cs89x0.c linux-dj/drivers/net/cs89x0.c --- linux/drivers/net/cs89x0.c Mon Mar 19 09:16:23 2001 +++ linux-dj/drivers/net/cs89x0.c Mon Mar 19 09:29:14 2001 @@ -373,7 +373,7 @@ retval = -ENOMEM; goto out; } - lp = (struct net_local *)dev->priv; + lp = dev->priv; memset(lp, 0, sizeof(*lp)); spin_lock_init(&lp->lock); #if !defined(MODULE) && (ALLOW_DMA != 0) @@ -384,7 +384,7 @@ } #endif } - lp = (struct net_local *)dev->priv; + lp = dev->priv; /* Grab the region so we can find another board if autoIRQ fails. */ if (!request_region(ioaddr & ~3, NETCARD_IO_EXTENT, dev->name)) { @@ -659,7 +659,7 @@ static void get_dma_channel(struct net_device *dev) { - struct net_local *lp = (struct net_local *)dev->priv; + struct net_local *lp = dev->priv; if (lp->dma) { dev->dma = lp->dma; @@ -681,7 +681,7 @@ static void write_dma(struct net_device *dev, int chip_type, int dma) { - struct net_local *lp = (struct net_local *)dev->priv; + struct net_local *lp = dev->priv; if ((lp->isa_config & ANY_ISA_DMA) == 0) return; if (chip_type == CS8900) { @@ -694,7 +694,7 @@ static void set_dma_cfg(struct net_device *dev) { - struct net_local *lp = (struct net_local *)dev->priv; + struct net_local *lp = dev->priv; if (lp->use_dma) { if ((lp->isa_config & ANY_ISA_DMA) == 0) { @@ -717,7 +717,7 @@ static int dma_bufcfg(struct net_device *dev) { - struct net_local *lp = (struct net_local *)dev->priv; + struct net_local *lp = dev->priv; if (lp->use_dma) return (lp->isa_config & ANY_ISA_DMA)? RX_DMA_ENBL : 0; else @@ -728,7 +728,7 @@ dma_busctl(struct net_device *dev) { int retval = 0; - struct net_local *lp = (struct net_local *)dev->priv; + struct net_local *lp = dev->priv; if (lp->use_dma) { if (lp->isa_config & ANY_ISA_DMA) retval |= RESET_RX_DMA; /* Reset the DMA pointer */ @@ -744,7 +744,7 @@ static void dma_rx(struct net_device *dev) { - struct net_local *lp = (struct net_local *)dev->priv; + struct net_local *lp = dev->priv; struct sk_buff *skb; int status, length; unsigned char *bp = lp->rx_dma_ptr; @@ -806,7 +806,7 @@ void __init reset_chip(struct net_device *dev) { - struct net_local *lp = (struct net_local *)dev->priv; + struct net_local *lp = dev->priv; int ioaddr = dev->base_addr; int reset_start_time; @@ -836,7 +836,7 @@ static void control_dc_dc(struct net_device *dev, int on_not_off) { - struct net_local *lp = (struct net_local *)dev->priv; + struct net_local *lp = dev->priv; unsigned int selfcontrol; int timenow = jiffies; /* control the DC to DC convertor in the SelfControl register. @@ -864,7 +864,7 @@ static int detect_tp(struct net_device *dev) { - struct net_local *lp = (struct net_local *)dev->priv; + struct net_local *lp = dev->priv; int timenow = jiffies; int fdx; @@ -979,7 +979,7 @@ static int detect_aui(struct net_device *dev) { - struct net_local *lp = (struct net_local *)dev->priv; + struct net_local *lp = dev->priv; if (net_debug > 1) printk("%s: Attempting AUI\n", dev->name); control_dc_dc(dev, 0); @@ -995,7 +995,7 @@ static int detect_bnc(struct net_device *dev) { - struct net_local *lp = (struct net_local *)dev->priv; + struct net_local *lp = dev->priv; if (net_debug > 1) printk("%s: Attempting BNC\n", dev->name); control_dc_dc(dev, 1); @@ -1041,7 +1041,7 @@ static int net_open(struct net_device *dev) { - struct net_local *lp = (struct net_local *)dev->priv; + struct net_local *lp = dev->priv; int result = 0; int i; int ret; @@ -1278,7 +1278,7 @@ static int net_send_packet(struct sk_buff *skb, struct net_device *dev) { - struct net_local *lp = (struct net_local *)dev->priv; + struct net_local *lp = dev->priv; if (net_debug > 3) { printk("%s: sent %d byte packet of type %x\n", @@ -1338,7 +1338,7 @@ int ioaddr, status; ioaddr = dev->base_addr; - lp = (struct net_local *)dev->priv; + lp = dev->priv; /* we MUST read all the events out of the ISQ, otherwise we'll never get interrupted again. As a consequence, we can't have any limit @@ -1434,7 +1434,7 @@ static void net_rx(struct net_device *dev) { - struct net_local *lp = (struct net_local *)dev->priv; + struct net_local *lp = dev->priv; struct sk_buff *skb; int status, length; @@ -1490,7 +1490,7 @@ static int net_close(struct net_device *dev) { - struct net_local *lp = (struct net_local *)dev->priv; + struct net_local *lp = dev->priv; netif_stop_queue(dev); @@ -1517,7 +1517,7 @@ static struct net_device_stats * net_get_stats(struct net_device *dev) { - struct net_local *lp = (struct net_local *)dev->priv; + struct net_local *lp = dev->priv; unsigned long flags; spin_lock_irqsave(&lp->lock, flags); @@ -1531,7 +1531,7 @@ static void set_multicast_list(struct net_device *dev) { - struct net_local *lp = (struct net_local *)dev->priv; + struct net_local *lp = dev->priv; unsigned long flags; spin_lock_irqsave(&lp->lock, flags); @@ -1660,7 +1660,7 @@ return -ENOMEM; } memset(dev_cs89x0.priv, 0, sizeof(struct net_local)); - lp = (struct net_local *)dev_cs89x0.priv; + lp = dev_cs89x0.priv; #if ALLOW_DMA if (use_dma) { diff -urN --exclude-from=/home/davej/.exclude linux/drivers/net/de4x5.c linux-dj/drivers/net/de4x5.c --- linux/drivers/net/de4x5.c Mon Mar 19 09:16:23 2001 +++ linux-dj/drivers/net/de4x5.c Mon Mar 19 09:29:21 2001 @@ -1192,8 +1192,7 @@ ** Reserve a section of kernel memory for the adapter ** private area and the TX/RX descriptor rings. */ - dev->priv = (void *) kmalloc(sizeof(struct de4x5_private) + ALIGN, - GFP_KERNEL); + dev->priv = kmalloc(sizeof(struct de4x5_private) + ALIGN, GFP_KERNEL); if (dev->priv == NULL) { return -ENOMEM; } @@ -1203,7 +1202,7 @@ */ tmp = dev->priv; dev->priv = (void *)(((u_long)dev->priv + ALIGN) & ~ALIGN); - lp = (struct de4x5_private *)dev->priv; + lp = dev->priv; memset(dev->priv, 0, sizeof(struct de4x5_private)); lp->bus = bus.bus; lp->bus_num = bus.bus_num; @@ -1367,7 +1366,7 @@ static int de4x5_open(struct net_device *dev) { - struct de4x5_private *lp = (struct de4x5_private *)dev->priv; + struct de4x5_private *lp = dev->priv; u_long iobase = dev->base_addr; int i, status = 0; s32 omr; @@ -1459,7 +1458,7 @@ static int de4x5_sw_reset(struct net_device *dev) { - struct de4x5_private *lp = (struct de4x5_private *)dev->priv; + struct de4x5_private *lp = dev->priv; u_long iobase = dev->base_addr; int i, j, status = 0; s32 bmr, omr; @@ -1537,7 +1536,7 @@ static int de4x5_queue_pkt(struct sk_buff *skb, struct net_device *dev) { - struct de4x5_private *lp = (struct de4x5_private *)dev->priv; + struct de4x5_private *lp = dev->priv; u_long iobase = dev->base_addr; int status = 0; u_long flags = 0; @@ -1616,7 +1615,7 @@ static void de4x5_interrupt(int irq, void *dev_id, struct pt_regs *regs) { - struct net_device *dev = (struct net_device *)dev_id; + struct net_device *dev = dev_id; struct de4x5_private *lp; s32 imr, omr, sts, limit; u_long iobase; @@ -1625,7 +1624,7 @@ printk ("de4x5_interrupt(): irq %d for unknown device.\n", irq); return; } - lp = (struct de4x5_private *)dev->priv; + lp = dev->priv; spin_lock(&lp->lock); iobase = dev->base_addr; @@ -1683,7 +1682,7 @@ static int de4x5_rx(struct net_device *dev) { - struct de4x5_private *lp = (struct de4x5_private *)dev->priv; + struct de4x5_private *lp = dev->priv; u_long iobase = dev->base_addr; int entry; s32 status; @@ -1774,7 +1773,7 @@ static int de4x5_tx(struct net_device *dev) { - struct de4x5_private *lp = (struct de4x5_private *)dev->priv; + struct de4x5_private *lp = dev->priv; u_long iobase = dev->base_addr; int entry; s32 status; @@ -1826,7 +1825,7 @@ static int de4x5_ast(struct net_device *dev) { - struct de4x5_private *lp = (struct de4x5_private *)dev->priv; + struct de4x5_private *lp = dev->priv; int next_tick = DE4X5_AUTOSENSE_MS; disable_ast(dev); @@ -1849,7 +1848,7 @@ static int de4x5_txur(struct net_device *dev) { - struct de4x5_private *lp = (struct de4x5_private *)dev->priv; + struct de4x5_private *lp = dev->priv; u_long iobase = dev->base_addr; int omr; @@ -1872,7 +1871,7 @@ static int de4x5_rx_ovfc(struct net_device *dev) { - struct de4x5_private *lp = (struct de4x5_private *)dev->priv; + struct de4x5_private *lp = dev->priv; u_long iobase = dev->base_addr; int omr; @@ -1893,7 +1892,7 @@ static int de4x5_close(struct net_device *dev) { - struct de4x5_private *lp = (struct de4x5_private *)dev->priv; + struct de4x5_private *lp = dev->priv; u_long iobase = dev->base_addr; s32 imr, omr; @@ -1931,7 +1930,7 @@ static struct net_device_stats * de4x5_get_stats(struct net_device *dev) { - struct de4x5_private *lp = (struct de4x5_private *)dev->priv; + struct de4x5_private *lp = dev->priv; u_long iobase = dev->base_addr; lp->stats.rx_missed_errors = (int)(inl(DE4X5_MFC) & (MFC_OVFL | MFC_CNTR)); @@ -1942,7 +1941,7 @@ static void de4x5_local_stats(struct net_device *dev, char *buf, int pkt_len) { - struct de4x5_private *lp = (struct de4x5_private *)dev->priv; + struct de4x5_private *lp = dev->priv; int i; for (i=1; ipriv; + struct de4x5_private *lp = dev->priv; int entry = (lp->tx_new ? lp->tx_new-1 : lp->txRingSize-1); dma_addr_t buf_dma = pci_map_single(lp->pdev, buf, flags & TD_TBS1, PCI_DMA_TODEVICE); @@ -2002,7 +2001,7 @@ static void set_multicast_list(struct net_device *dev) { - struct de4x5_private *lp = (struct de4x5_private *)dev->priv; + struct de4x5_private *lp = dev->priv; u_long iobase = dev->base_addr; /* First, double check that the adapter is open */ @@ -2034,7 +2033,7 @@ static void SetMulticastFilter(struct net_device *dev) { - struct de4x5_private *lp = (struct de4x5_private *)dev->priv; + struct de4x5_private *lp = dev->priv; struct dev_mc_list *dmi=dev->mc_list; u_long iobase = dev->base_addr; int i, j, bit, byte; @@ -2382,7 +2381,7 @@ static int autoconf_media(struct net_device *dev) { - struct de4x5_private *lp = (struct de4x5_private *)dev->priv; + struct de4x5_private *lp = dev->priv; u_long iobase = dev->base_addr; int next_tick = DE4X5_AUTOSENSE_MS; @@ -2423,7 +2422,7 @@ static int dc21040_autoconf(struct net_device *dev) { - struct de4x5_private *lp = (struct de4x5_private *)dev->priv; + struct de4x5_private *lp = dev->priv; u_long iobase = dev->base_addr; int next_tick = DE4X5_AUTOSENSE_MS; s32 imr; @@ -2496,7 +2495,7 @@ int next_state, int suspect_state, int (*fn)(struct net_device *, int)) { - struct de4x5_private *lp = (struct de4x5_private *)dev->priv; + struct de4x5_private *lp = dev->priv; int next_tick = DE4X5_AUTOSENSE_MS; int linkBad; @@ -2535,7 +2534,7 @@ int (*fn)(struct net_device *, int), int (*asfn)(struct net_device *)) { - struct de4x5_private *lp = (struct de4x5_private *)dev->priv; + struct de4x5_private *lp = dev->priv; int next_tick = DE4X5_AUTOSENSE_MS; int linkBad; @@ -2577,7 +2576,7 @@ static int dc21041_autoconf(struct net_device *dev) { - struct de4x5_private *lp = (struct de4x5_private *)dev->priv; + struct de4x5_private *lp = dev->priv; u_long iobase = dev->base_addr; s32 sts, irqs, irq_mask, imr, omr; int next_tick = DE4X5_AUTOSENSE_MS; @@ -2779,7 +2778,7 @@ static int dc21140m_autoconf(struct net_device *dev) { - struct de4x5_private *lp = (struct de4x5_private *)dev->priv; + struct de4x5_private *lp = dev->priv; int ana, anlpa, cap, cr, slnk, sr; int next_tick = DE4X5_AUTOSENSE_MS; u_long imr, omr, iobase = dev->base_addr; @@ -2963,7 +2962,7 @@ static int dc2114x_autoconf(struct net_device *dev) { - struct de4x5_private *lp = (struct de4x5_private *)dev->priv; + struct de4x5_private *lp = dev->priv; u_long iobase = dev->base_addr; s32 cr, anlpa, ana, cap, irqs, irq_mask, imr, omr, slnk, sr, sts; int next_tick = DE4X5_AUTOSENSE_MS; @@ -3214,7 +3213,7 @@ static int srom_autoconf(struct net_device *dev) { - struct de4x5_private *lp = (struct de4x5_private *)dev->priv; + struct de4x5_private *lp = dev->priv; return lp->infoleaf_fn(dev); } @@ -3227,7 +3226,7 @@ static int srom_map_media(struct net_device *dev) { - struct de4x5_private *lp = (struct de4x5_private *)dev->priv; + struct de4x5_private *lp = dev->priv; lp->fdx = 0; if (lp->infoblock_media == lp->media) @@ -3292,7 +3291,7 @@ static void de4x5_init_connection(struct net_device *dev) { - struct de4x5_private *lp = (struct de4x5_private *)dev->priv; + struct de4x5_private *lp = dev->priv; u_long iobase = dev->base_addr; u_long flags = 0; @@ -3321,7 +3320,7 @@ static int de4x5_reset_phy(struct net_device *dev) { - struct de4x5_private *lp = (struct de4x5_private *)dev->priv; + struct de4x5_private *lp = dev->priv; u_long iobase = dev->base_addr; int next_tick = 0; @@ -3355,7 +3354,7 @@ static int test_media(struct net_device *dev, s32 irqs, s32 irq_mask, s32 csr13, s32 csr14, s32 csr15, s32 msec) { - struct de4x5_private *lp = (struct de4x5_private *)dev->priv; + struct de4x5_private *lp = dev->priv; u_long iobase = dev->base_addr; s32 sts, csr12; @@ -3393,7 +3392,7 @@ static int test_tp(struct net_device *dev, s32 msec) { - struct de4x5_private *lp = (struct de4x5_private *)dev->priv; + struct de4x5_private *lp = dev->priv; u_long iobase = dev->base_addr; int sisr; @@ -3422,7 +3421,7 @@ static int test_for_100Mb(struct net_device *dev, int msec) { - struct de4x5_private *lp = (struct de4x5_private *)dev->priv; + struct de4x5_private *lp = dev->priv; int gep = 0, ret = ((lp->chipset & ~0x00ff)==DC2114x? -1 :GEP_SLNK); if (lp->timeout < 0) { @@ -3453,7 +3452,7 @@ static int wait_for_link(struct net_device *dev) { - struct de4x5_private *lp = (struct de4x5_private *)dev->priv; + struct de4x5_private *lp = dev->priv; if (lp->timeout < 0) { lp->timeout = 1; @@ -3475,7 +3474,7 @@ static int test_mii_reg(struct net_device *dev, int reg, int mask, int pol, long msec) { - struct de4x5_private *lp = (struct de4x5_private *)dev->priv; + struct de4x5_private *lp = dev->priv; int test; u_long iobase = dev->base_addr; @@ -3499,7 +3498,7 @@ static int is_spd_100(struct net_device *dev) { - struct de4x5_private *lp = (struct de4x5_private *)dev->priv; + struct de4x5_private *lp = dev->priv; u_long iobase = dev->base_addr; int spd; @@ -3523,7 +3522,7 @@ static int is_100_up(struct net_device *dev) { - struct de4x5_private *lp = (struct de4x5_private *)dev->priv; + struct de4x5_private *lp = dev->priv; u_long iobase = dev->base_addr; if (lp->useMII) { @@ -3544,7 +3543,7 @@ static int is_10_up(struct net_device *dev) { - struct de4x5_private *lp = (struct de4x5_private *)dev->priv; + struct de4x5_private *lp = dev->priv; u_long iobase = dev->base_addr; if (lp->useMII) { @@ -3567,7 +3566,7 @@ static int is_anc_capable(struct net_device *dev) { - struct de4x5_private *lp = (struct de4x5_private *)dev->priv; + struct de4x5_private *lp = dev->priv; u_long iobase = dev->base_addr; if (lp->phy[lp->active].id && (!lp->useSROM || lp->useMII)) { @@ -3586,7 +3585,7 @@ static int ping_media(struct net_device *dev, int msec) { - struct de4x5_private *lp = (struct de4x5_private *)dev->priv; + struct de4x5_private *lp = dev->priv; u_long iobase = dev->base_addr; int sisr; @@ -3627,7 +3626,7 @@ static struct sk_buff * de4x5_alloc_rx_buff(struct net_device *dev, int index, int len) { - struct de4x5_private *lp = (struct de4x5_private *)dev->priv; + struct de4x5_private *lp = dev->priv; struct sk_buff *p; #if !defined(__alpha__) && !defined(__powerpc__) && !defined(__sparc_v9__) && !defined(DE4X5_DO_MEMCPY) @@ -3675,7 +3674,7 @@ static void de4x5_free_rx_buffs(struct net_device *dev) { - struct de4x5_private *lp = (struct de4x5_private *)dev->priv; + struct de4x5_private *lp = dev->priv; int i; for (i=0; irxRingSize; i++) { @@ -3692,7 +3691,7 @@ static void de4x5_free_tx_buffs(struct net_device *dev) { - struct de4x5_private *lp = (struct de4x5_private *)dev->priv; + struct de4x5_private *lp = dev->priv; int i; for (i=0; itxRingSize; i++) { @@ -3719,7 +3718,7 @@ static void de4x5_save_skbs(struct net_device *dev) { - struct de4x5_private *lp = (struct de4x5_private *)dev->priv; + struct de4x5_private *lp = dev->priv; u_long iobase = dev->base_addr; s32 omr; @@ -3740,7 +3739,7 @@ static void de4x5_rst_desc_ring(struct net_device *dev) { - struct de4x5_private *lp = (struct de4x5_private *)dev->priv; + struct de4x5_private *lp = dev->priv; u_long iobase = dev->base_addr; int i; s32 omr; @@ -3773,7 +3772,7 @@ static void de4x5_cache_state(struct net_device *dev, int flag) { - struct de4x5_private *lp = (struct de4x5_private *)dev->priv; + struct de4x5_private *lp = dev->priv; u_long iobase = dev->base_addr; switch(flag) { @@ -3803,7 +3802,7 @@ static void de4x5_put_cache(struct net_device *dev, struct sk_buff *skb) { - struct de4x5_private *lp = (struct de4x5_private *)dev->priv; + struct de4x5_private *lp = dev->priv; struct sk_buff *p; if (lp->cache.skb) { @@ -3820,7 +3819,7 @@ static void de4x5_putb_cache(struct net_device *dev, struct sk_buff *skb) { - struct de4x5_private *lp = (struct de4x5_private *)dev->priv; + struct de4x5_private *lp = dev->priv; struct sk_buff *p = lp->cache.skb; lp->cache.skb = skb; @@ -3832,7 +3831,7 @@ static struct sk_buff * de4x5_get_cache(struct net_device *dev) { - struct de4x5_private *lp = (struct de4x5_private *)dev->priv; + struct de4x5_private *lp = dev->priv; struct sk_buff *p = lp->cache.skb; if (p) { @@ -3850,7 +3849,7 @@ static int test_ans(struct net_device *dev, s32 irqs, s32 irq_mask, s32 msec) { - struct de4x5_private *lp = (struct de4x5_private *)dev->priv; + struct de4x5_private *lp = dev->priv; u_long iobase = dev->base_addr; s32 sts, ans; @@ -3878,7 +3877,7 @@ static void de4x5_setup_intr(struct net_device *dev) { - struct de4x5_private *lp = (struct de4x5_private *)dev->priv; + struct de4x5_private *lp = dev->priv; u_long iobase = dev->base_addr; s32 imr, sts; @@ -3899,7 +3898,7 @@ static void reset_init_sia(struct net_device *dev, s32 csr13, s32 csr14, s32 csr15) { - struct de4x5_private *lp = (struct de4x5_private *)dev->priv; + struct de4x5_private *lp = dev->priv; u_long iobase = dev->base_addr; RESET_SIA; @@ -4407,7 +4406,7 @@ static int srom_infoleaf_info(struct net_device *dev) { - struct de4x5_private *lp = (struct de4x5_private *)dev->priv; + struct de4x5_private *lp = dev->priv; int i, count; u_char *p; @@ -4455,7 +4454,7 @@ static void srom_init(struct net_device *dev) { - struct de4x5_private *lp = (struct de4x5_private *)dev->priv; + struct de4x5_private *lp = dev->priv; u_char *p = (u_char *)&lp->srom + lp->infoleaf_offset; u_char count; @@ -4500,7 +4499,7 @@ static void srom_exec(struct net_device *dev, u_char *p) { - struct de4x5_private *lp = (struct de4x5_private *)dev->priv; + struct de4x5_private *lp = dev->priv; u_long iobase = dev->base_addr; u_char count = (p ? *p++ : 0); u_short *w = (u_short *)p; @@ -4537,7 +4536,7 @@ static int dc21140_infoleaf(struct net_device *dev) { - struct de4x5_private *lp = (struct de4x5_private *)dev->priv; + struct de4x5_private *lp = dev->priv; u_char count = 0; u_char *p = (u_char *)&lp->srom + lp->infoleaf_offset; int next_tick = DE4X5_AUTOSENSE_MS; @@ -4575,7 +4574,7 @@ static int dc21142_infoleaf(struct net_device *dev) { - struct de4x5_private *lp = (struct de4x5_private *)dev->priv; + struct de4x5_private *lp = dev->priv; u_char count = 0; u_char *p = (u_char *)&lp->srom + lp->infoleaf_offset; int next_tick = DE4X5_AUTOSENSE_MS; @@ -4610,7 +4609,7 @@ static int dc21143_infoleaf(struct net_device *dev) { - struct de4x5_private *lp = (struct de4x5_private *)dev->priv; + struct de4x5_private *lp = dev->priv; u_char count = 0; u_char *p = (u_char *)&lp->srom + lp->infoleaf_offset; int next_tick = DE4X5_AUTOSENSE_MS; @@ -4648,7 +4647,7 @@ static int compact_infoblock(struct net_device *dev, u_char count, u_char *p) { - struct de4x5_private *lp = (struct de4x5_private *)dev->priv; + struct de4x5_private *lp = dev->priv; u_char flags, csr6; /* Recursively figure out the info blocks */ @@ -4688,7 +4687,7 @@ static int type0_infoblock(struct net_device *dev, u_char count, u_char *p) { - struct de4x5_private *lp = (struct de4x5_private *)dev->priv; + struct de4x5_private *lp = dev->priv; u_char flags, csr6, len = (*p & BLOCK_LEN)+1; /* Recursively figure out the info blocks */ @@ -4728,7 +4727,7 @@ static int type1_infoblock(struct net_device *dev, u_char count, u_char *p) { - struct de4x5_private *lp = (struct de4x5_private *)dev->priv; + struct de4x5_private *lp = dev->priv; u_char len = (*p & BLOCK_LEN)+1; /* Recursively figure out the info blocks */ @@ -4767,7 +4766,7 @@ static int type2_infoblock(struct net_device *dev, u_char count, u_char *p) { - struct de4x5_private *lp = (struct de4x5_private *)dev->priv; + struct de4x5_private *lp = dev->priv; u_char len = (*p & BLOCK_LEN)+1; /* Recursively figure out the info blocks */ @@ -4808,7 +4807,7 @@ static int type3_infoblock(struct net_device *dev, u_char count, u_char *p) { - struct de4x5_private *lp = (struct de4x5_private *)dev->priv; + struct de4x5_private *lp = dev->priv; u_char len = (*p & BLOCK_LEN)+1; /* Recursively figure out the info blocks */ @@ -4850,7 +4849,7 @@ static int type4_infoblock(struct net_device *dev, u_char count, u_char *p) { - struct de4x5_private *lp = (struct de4x5_private *)dev->priv; + struct de4x5_private *lp = dev->priv; u_char flags, csr6, len = (*p & BLOCK_LEN)+1; /* Recursively figure out the info blocks */ @@ -4895,7 +4894,7 @@ static int type5_infoblock(struct net_device *dev, u_char count, u_char *p) { - struct de4x5_private *lp = (struct de4x5_private *)dev->priv; + struct de4x5_private *lp = dev->priv; u_char len = (*p & BLOCK_LEN)+1; /* Recursively figure out the info blocks */ @@ -5095,7 +5094,7 @@ static int mii_get_phy(struct net_device *dev) { - struct de4x5_private *lp = (struct de4x5_private *)dev->priv; + struct de4x5_private *lp = dev->priv; u_long iobase = dev->base_addr; int i, j, k, n, limit=sizeof(phy_info)/sizeof(struct phy_table); int id; @@ -5159,7 +5158,7 @@ static char * build_setup_frame(struct net_device *dev, int mode) { - struct de4x5_private *lp = (struct de4x5_private *)dev->priv; + struct de4x5_private *lp = dev->priv; int i; char *pa = lp->setup_frame; @@ -5199,7 +5198,7 @@ static void disable_ast(struct net_device *dev) { - struct de4x5_private *lp = (struct de4x5_private *)dev->priv; + struct de4x5_private *lp = dev->priv; del_timer(&lp->timer); @@ -5209,7 +5208,7 @@ static long de4x5_switch_mac_port(struct net_device *dev) { - struct de4x5_private *lp = (struct de4x5_private *)dev->priv; + struct de4x5_private *lp = dev->priv; u_long iobase = dev->base_addr; s32 omr; @@ -5245,7 +5244,7 @@ static void gep_wr(s32 data, struct net_device *dev) { - struct de4x5_private *lp = (struct de4x5_private *)dev->priv; + struct de4x5_private *lp = dev->priv; u_long iobase = dev->base_addr; if (lp->chipset == DC21140) { @@ -5260,7 +5259,7 @@ static int gep_rd(struct net_device *dev) { - struct de4x5_private *lp = (struct de4x5_private *)dev->priv; + struct de4x5_private *lp = dev->priv; u_long iobase = dev->base_addr; if (lp->chipset == DC21140) { @@ -5275,7 +5274,7 @@ static void timeout(struct net_device *dev, void (*fn)(u_long data), u_long data, u_long msec) { - struct de4x5_private *lp = (struct de4x5_private *)dev->priv; + struct de4x5_private *lp = dev->priv; int dt; /* First, cancel any pending timer events */ @@ -5297,7 +5296,7 @@ static void yawn(struct net_device *dev, int state) { - struct de4x5_private *lp = (struct de4x5_private *)dev->priv; + struct de4x5_private *lp = dev->priv; u_long iobase = dev->base_addr; if ((lp->chipset == DC21040) || (lp->chipset == DC21140)) return; @@ -5345,7 +5344,7 @@ static void de4x5_parse_params(struct net_device *dev) { - struct de4x5_private *lp = (struct de4x5_private *)dev->priv; + struct de4x5_private *lp = dev->priv; char *p, *q, t; lp->params.fdx = 0; @@ -5391,7 +5390,7 @@ static void de4x5_dbg_open(struct net_device *dev) { - struct de4x5_private *lp = (struct de4x5_private *)dev->priv; + struct de4x5_private *lp = dev->priv; int i; if (de4x5_debug & DEBUG_OPEN) { @@ -5442,7 +5441,7 @@ static void de4x5_dbg_mii(struct net_device *dev, int k) { - struct de4x5_private *lp = (struct de4x5_private *)dev->priv; + struct de4x5_private *lp = dev->priv; u_long iobase = dev->base_addr; if (de4x5_debug & DEBUG_MII) { @@ -5470,7 +5469,7 @@ static void de4x5_dbg_media(struct net_device *dev) { - struct de4x5_private *lp = (struct de4x5_private *)dev->priv; + struct de4x5_private *lp = dev->priv; if (lp->media != lp->c_media) { if (de4x5_debug & DEBUG_MEDIA) { @@ -5561,7 +5560,7 @@ static int de4x5_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) { - struct de4x5_private *lp = (struct de4x5_private *)dev->priv; + struct de4x5_private *lp = dev->priv; struct de4x5_ioctl *ioc = (struct de4x5_ioctl *) &rq->ifr_data; u_long iobase = dev->base_addr; int i, j, status = 0; @@ -5794,7 +5793,7 @@ if (!mdev) mdev = p; if (register_netdev(p) != 0) { - struct de4x5_private *lp = (struct de4x5_private *)p->priv; + struct de4x5_private *lp = p->priv; if (lp) { release_region(p->base_addr, (lp->bus == PCI ? DE4X5_PCI_TOTAL_SIZE : @@ -5833,7 +5832,7 @@ struct net_device *next = NULL; if (p->priv) { /* Private areas allocated? */ - struct de4x5_private *lp = (struct de4x5_private *)p->priv; + struct de4x5_private *lp = p->priv; next = lp->next_module; if (lp->rx_ring) { @@ -5887,7 +5886,7 @@ { struct net_device *new; - new = (struct net_device *)kmalloc(sizeof(struct net_device), GFP_KERNEL); + new = kmalloc(sizeof(struct net_device), GFP_KERNEL); if (new == NULL) { printk("de4x5.c: Device not initialised, insufficient memory\n"); return NULL; diff -urN --exclude-from=/home/davej/.exclude linux/drivers/net/de600.c linux-dj/drivers/net/de600.c --- linux/drivers/net/de600.c Mon Mar 19 09:16:23 2001 +++ linux-dj/drivers/net/de600.c Mon Mar 19 09:29:21 2001 @@ -376,7 +376,7 @@ static struct net_device_stats * get_stats(struct net_device *dev) { - return (struct net_device_stats *)(dev->priv); + return dev->priv; } static inline void diff -urN --exclude-from=/home/davej/.exclude linux/drivers/net/de620.c linux-dj/drivers/net/de620.c --- linux/drivers/net/de620.c Mon Mar 19 09:16:23 2001 +++ linux-dj/drivers/net/de620.c Mon Mar 19 09:29:21 2001 @@ -472,7 +472,7 @@ */ static struct net_device_stats *get_stats(struct net_device *dev) { - return (struct net_device_stats *)(dev->priv); + return dev->priv; } /********************************************* diff -urN --exclude-from=/home/davej/.exclude linux/drivers/net/declance.c linux-dj/drivers/net/declance.c --- linux/drivers/net/declance.c Mon Mar 19 09:16:23 2001 +++ linux-dj/drivers/net/declance.c Mon Mar 19 09:29:12 2001 @@ -448,7 +448,7 @@ /* Setup the Lance Rx and Tx rings */ static void lance_init_ring(struct net_device *dev) { - struct lance_private *lp = (struct lance_private *) dev->priv; + struct lance_private *lp = dev->priv; volatile struct lance_init_block *ib; int leptr; int i; @@ -545,13 +545,13 @@ static int lance_rx(struct net_device *dev) { - struct lance_private *lp = (struct lance_private *) dev->priv; + struct lance_private *lp = dev->priv; volatile struct lance_init_block *ib; volatile struct lance_rx_desc *rd = 0; unsigned char bits; int len = 0; struct sk_buff *skb = 0; - ib = (struct lance_init_block *) (dev->mem_start); + ib = dev->mem_start; #ifdef TEST_HITS { @@ -633,13 +633,13 @@ static void lance_tx(struct net_device *dev) { - struct lance_private *lp = (struct lance_private *) dev->priv; + struct lance_private *lp = dev->priv; volatile struct lance_init_block *ib; volatile struct lance_regs *ll = lp->ll; volatile struct lance_tx_desc *td; int i, j; int status; - ib = (struct lance_init_block *) (dev->mem_start); + ib = dev->mem_start; j = lp->tx_old; spin_lock(&lp->lock); @@ -715,8 +715,8 @@ static void lance_interrupt(const int irq, void *dev_id, struct pt_regs *regs) { - struct net_device *dev = (struct net_device *) dev_id; - struct lance_private *lp = (struct lance_private *) dev->priv; + struct net_device *dev = dev_id; + struct lance_private *lp = dev->priv; volatile struct lance_regs *ll = lp->ll; int csr0; @@ -773,8 +773,8 @@ static int lance_open(struct net_device *dev) { - volatile struct lance_init_block *ib = (struct lance_init_block *) (dev->mem_start); - struct lance_private *lp = (struct lance_private *) dev->priv; + volatile struct lance_init_block *ib = dev->mem_start; + struct lance_private *lp = dev->priv; volatile struct lance_regs *ll = lp->ll; int status = 0; @@ -817,7 +817,7 @@ static int lance_close(struct net_device *dev) { - struct lance_private *lp = (struct lance_private *) dev->priv; + struct lance_private *lp = dev->priv; volatile struct lance_regs *ll = lp->ll; netif_stop_queue(dev); @@ -836,7 +836,7 @@ static inline int lance_reset(struct net_device *dev) { - struct lance_private *lp = (struct lance_private *) dev->priv; + struct lance_private *lp = dev->priv; volatile struct lance_regs *ll = lp->ll; int status; @@ -853,7 +853,7 @@ static void lance_tx_timeout(struct net_device *dev) { - struct lance_private *lp = (struct lance_private *) dev->priv; + struct lance_private *lp = dev->priv; volatile struct lance_regs *ll = lp->ll; printk(KERN_ERR "%s: transmit timed out, status %04x, reset\n", @@ -864,9 +864,9 @@ static int lance_start_xmit(struct sk_buff *skb, struct net_device *dev) { - struct lance_private *lp = (struct lance_private *) dev->priv; + struct lance_private *lp = dev->priv; volatile struct lance_regs *ll = lp->ll; - volatile struct lance_init_block *ib = (struct lance_init_block *) (dev->mem_start); + volatile struct lance_init_block *ib = dev->mem_start; int entry, skblen, len; skblen = skb->len; @@ -908,14 +908,14 @@ static struct net_device_stats *lance_get_stats(struct net_device *dev) { - struct lance_private *lp = (struct lance_private *) dev->priv; + struct lance_private *lp = dev->priv; return &lp->stats; } static void lance_load_multicast(struct net_device *dev) { - volatile struct lance_init_block *ib = (struct lance_init_block *) (dev->mem_start); + volatile struct lance_init_block *ib = dev->mem_start; volatile u16 *mcast_table = (u16 *) & ib->filter; struct dev_mc_list *dmi = dev->mc_list; char *addrs; @@ -966,11 +966,11 @@ static void lance_set_multicast(struct net_device *dev) { - struct lance_private *lp = (struct lance_private *) dev->priv; + struct lance_private *lp = dev->priv; volatile struct lance_init_block *ib; volatile struct lance_regs *ll = lp->ll; - ib = (struct lance_init_block *) (dev->mem_start); + ib = dev->mem_start; if (!netif_running(dev)) return; diff -urN --exclude-from=/home/davej/.exclude linux/drivers/net/defxx.c linux-dj/drivers/net/defxx.c --- linux/drivers/net/defxx.c Mon Mar 19 09:16:23 2001 +++ linux-dj/drivers/net/defxx.c Mon Mar 19 09:29:11 2001 @@ -553,7 +553,7 @@ static void __devinit dfx_bus_init(struct net_device *dev) { - DFX_board_t *bp = (DFX_board_t *)dev->priv; + DFX_board_t *bp = dev->priv; u8 val; /* used for I/O read/writes */ DBG_printk("In dfx_bus_init...\n"); @@ -787,7 +787,7 @@ static int __devinit dfx_driver_init(struct net_device *dev) { - DFX_board_t *bp = (DFX_board_t *)dev->priv; + DFX_board_t *bp = dev->priv; int alloc_size; /* total buffer size needed */ char *top_v, *curr_v; /* virtual addrs into memory block */ u32 top_p, curr_p; /* physical addrs into memory block */ @@ -1209,7 +1209,7 @@ static int dfx_open(struct net_device *dev) { int ret; - DFX_board_t *bp = (DFX_board_t *)dev->priv; + DFX_board_t *bp = dev->priv; DBG_printk("In dfx_open...\n"); @@ -1298,7 +1298,7 @@ static int dfx_close(struct net_device *dev) { - DFX_board_t *bp = (DFX_board_t *)dev->priv; + DFX_board_t *bp = dev->priv; DBG_printk("In dfx_close...\n"); @@ -1634,7 +1634,7 @@ static void dfx_int_common(struct net_device *dev) { - DFX_board_t *bp = (DFX_board_t *) dev->priv; + DFX_board_t *bp = dev->priv; PI_UINT32 port_status; /* Port Status register */ /* Process xmt interrupts - frequent case, so always call this routine */ @@ -1704,13 +1704,13 @@ static void dfx_interrupt(int irq, void *dev_id, struct pt_regs *regs) { - struct net_device *dev = (struct net_device *) dev_id; + struct net_device *dev = dev_id; DFX_board_t *bp; /* private board structure pointer */ u8 tmp; /* used for disabling/enabling ints */ /* Get board pointer only if device structure is valid */ - bp = (DFX_board_t *) dev->priv; + bp = dev->priv; spin_lock(&bp->lock); @@ -1802,7 +1802,7 @@ static struct net_device_stats *dfx_ctl_get_stats(struct net_device *dev) { - DFX_board_t *bp = (DFX_board_t *)dev->priv; + DFX_board_t *bp = dev->priv; /* Fill the bp->stats structure with driver-maintained counters */ @@ -1987,7 +1987,7 @@ static void dfx_ctl_set_multicast_list(struct net_device *dev) { - DFX_board_t *bp = (DFX_board_t *)dev->priv; + DFX_board_t *bp = dev->priv; int i; /* used as index in for loop */ struct dev_mc_list *dmi; /* ptr to multicast addr entry */ @@ -2101,7 +2101,7 @@ static int dfx_ctl_set_mac_address(struct net_device *dev, void *addr) { - DFX_board_t *bp = (DFX_board_t *)dev->priv; + DFX_board_t *bp = dev->priv; struct sockaddr *p_sockaddr = (struct sockaddr *)addr; /* Copy unicast address to driver-maintained structs and update count */ @@ -2998,7 +2998,7 @@ ) { - DFX_board_t *bp = (DFX_board_t *) dev->priv; + DFX_board_t *bp = dev->priv; u8 prod; /* local transmit producer index */ PI_XMT_DESCR *p_xmt_descr; /* ptr to transmit descriptor block entry */ XMT_DRIVER_DESCR *p_xmt_drv_descr; /* ptr to transmit driver descriptor */ @@ -3354,7 +3354,7 @@ static void __devexit dfx_remove_one_pci_or_eisa(struct pci_dev *pdev, struct net_device *dev) { - DFX_board_t *bp = (DFX_board_t*)dev->priv; + DFX_board_t *bp = dev->priv; unregister_netdev(dev); release_region(dev->base_addr, pdev ? PFI_K_CSR_IO_LEN : PI_ESIC_K_CSR_IO_LEN ); diff -urN --exclude-from=/home/davej/.exclude linux/drivers/net/depca.c linux-dj/drivers/net/depca.c --- linux/drivers/net/depca.c Mon Mar 19 09:16:23 2001 +++ linux-dj/drivers/net/depca.c Mon Mar 19 09:29:11 2001 @@ -612,10 +612,10 @@ } /* Define the device private memory */ - dev->priv = (void *) kmalloc(sizeof(struct depca_private), GFP_KERNEL); + dev->priv = kmalloc(sizeof(struct depca_private), GFP_KERNEL); if (dev->priv == NULL) return -ENOMEM; - lp = (struct depca_private *)dev->priv; + lp = dev->priv; memset((char *)dev->priv, 0, sizeof(struct depca_private)); lp->adapter = adapter; lp->mca_slot = mca_slot; @@ -760,7 +760,7 @@ static int depca_open(struct net_device *dev) { - struct depca_private *lp = (struct depca_private *)dev->priv; + struct depca_private *lp = dev->priv; u_long ioaddr = dev->base_addr; s16 nicsr; int status = 0; @@ -806,7 +806,7 @@ static void depca_init_ring(struct net_device *dev) { - struct depca_private *lp = (struct depca_private *)dev->priv; + struct depca_private *lp = dev->priv; u_int i; u_long offset; @@ -867,7 +867,7 @@ */ static int depca_start_xmit (struct sk_buff *skb, struct net_device *dev) { - struct depca_private *lp = (struct depca_private *) dev->priv; + struct depca_private *lp = dev->priv; u_long ioaddr = dev->base_addr; int status = 0; @@ -912,7 +912,7 @@ return; } - lp = (struct depca_private *) dev->priv; + lp = dev->priv; ioaddr = dev->base_addr; spin_lock (&lp->lock); @@ -950,7 +950,7 @@ static int depca_rx(struct net_device *dev) { - struct depca_private *lp = (struct depca_private *)dev->priv; + struct depca_private *lp = dev->priv; int i, entry; s32 status; @@ -1052,7 +1052,7 @@ static int depca_tx(struct net_device *dev) { - struct depca_private *lp = (struct depca_private *)dev->priv; + struct depca_private *lp = dev->priv; int entry; s32 status; u_long ioaddr = dev->base_addr; @@ -1090,7 +1090,7 @@ static int depca_close(struct net_device *dev) { - struct depca_private *lp = (struct depca_private *)dev->priv; + struct depca_private *lp = dev->priv; s16 nicsr; u_long ioaddr = dev->base_addr; @@ -1127,7 +1127,7 @@ static void LoadCSRs(struct net_device *dev) { - struct depca_private *lp = (struct depca_private *)dev->priv; + struct depca_private *lp = dev->priv; u_long ioaddr = dev->base_addr; outw(CSR1, DEPCA_ADDR); /* initialisation block address LSW */ @@ -1144,7 +1144,7 @@ static int InitRestartDepca(struct net_device *dev) { - struct depca_private *lp = (struct depca_private *)dev->priv; + struct depca_private *lp = dev->priv; u_long ioaddr = dev->base_addr; int i, status=0; @@ -1176,7 +1176,7 @@ static struct net_device_stats * depca_get_stats(struct net_device *dev) { - struct depca_private *lp = (struct depca_private *)dev->priv; + struct depca_private *lp = dev->priv; /* Null body since there is no framing error counter */ @@ -1189,7 +1189,7 @@ static void set_multicast_list(struct net_device *dev) { - struct depca_private *lp = (struct depca_private *)dev->priv; + struct depca_private *lp = dev->priv; u_long ioaddr = dev->base_addr; if (dev) { @@ -1220,7 +1220,7 @@ */ static void SetMulticastFilter(struct net_device *dev) { - struct depca_private *lp = (struct depca_private *)dev->priv; + struct depca_private *lp = dev->priv; struct dev_mc_list *dmi=dev->mc_list; char *addrs; int i, j, bit, byte; @@ -1552,7 +1552,7 @@ { struct net_device *new; - new = (struct net_device *)kmalloc(sizeof(struct net_device), GFP_KERNEL); + new = kmalloc(sizeof(struct net_device), GFP_KERNEL); if (new == NULL) { printk("eth%d: Device not initialised, insufficient memory\n",num_eth); return NULL; @@ -1740,7 +1740,7 @@ */ static int load_packet(struct net_device *dev, struct sk_buff *skb) { - struct depca_private *lp = (struct depca_private *)dev->priv; + struct depca_private *lp = dev->priv; int i, entry, end, len, status = 0; entry = lp->tx_new; /* Ring around buffer number. */ @@ -1829,7 +1829,7 @@ static void depca_dbg_open(struct net_device *dev) { - struct depca_private *lp = (struct depca_private *)dev->priv; + struct depca_private *lp = dev->priv; u_long ioaddr = dev->base_addr; struct depca_init *p = &lp->init_block; int i; @@ -1908,7 +1908,7 @@ */ static int depca_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) { - struct depca_private *lp = (struct depca_private *)dev->priv; + struct depca_private *lp = dev->priv; struct depca_ioctl *ioc = (struct depca_ioctl *) &rq->ifr_data; int i, status = 0; u_long ioaddr = dev->base_addr; diff -urN --exclude-from=/home/davej/.exclude linux/drivers/net/dgrs.c linux-dj/drivers/net/dgrs.c --- linux/drivers/net/dgrs.c Mon Mar 19 09:16:23 2001 +++ linux-dj/drivers/net/dgrs.c Mon Mar 19 23:01:46 2001 @@ -245,7 +245,7 @@ static void proc_reset(struct net_device *dev0, int reset) { - DGRS_PRIV *priv0 = (DGRS_PRIV *) dev0->priv; + DGRS_PRIV *priv0 = dev0->priv; if (priv0->plxreg) { @@ -269,7 +269,7 @@ static int check_board_dma(struct net_device *dev0) { - DGRS_PRIV *priv0 = (DGRS_PRIV *) dev0->priv; + DGRS_PRIV *priv0 = dev0->priv; ulong x; /* @@ -350,7 +350,7 @@ { int i; ulong csr = 0; - DGRS_PRIV *priv = (DGRS_PRIV *) dev->priv; + DGRS_PRIV *priv = dev->priv; if (pciaddr) { @@ -474,7 +474,7 @@ */ if (devN == NULL) goto out; - privN = (DGRS_PRIV *) devN->priv; + privN = devN->priv; } else { /* Switch mode */ @@ -687,7 +687,7 @@ static int dgrs_start_xmit(struct sk_buff *skb, struct net_device *devN) { - DGRS_PRIV *privN = (DGRS_PRIV *) devN->priv; + DGRS_PRIV *privN = devN->priv; struct net_device *dev0; DGRS_PRIV *priv0; I596_RBD *rbdp; @@ -804,7 +804,7 @@ */ static struct net_device_stats *dgrs_get_stats( struct net_device *dev ) { - DGRS_PRIV *priv = (DGRS_PRIV *) dev->priv; + DGRS_PRIV *priv = dev->priv; return (&priv->stats); } @@ -815,7 +815,7 @@ static void dgrs_set_multicast_list( struct net_device *dev) { - DGRS_PRIV *priv = (DGRS_PRIV *) dev->priv; + DGRS_PRIV *priv = dev->priv; priv->port->is_promisc = (dev->flags & IFF_PROMISC) ? 1 : 0; } @@ -825,7 +825,7 @@ */ static int dgrs_ioctl(struct net_device *devN, struct ifreq *ifr, int cmd) { - DGRS_PRIV *privN = (DGRS_PRIV *) devN->priv; + DGRS_PRIV *privN = devN->priv; DGRS_IOCTL ioc; int i; @@ -890,8 +890,8 @@ static void dgrs_intr(int irq, void *dev_id, struct pt_regs *regs) { - struct net_device *dev0 = (struct net_device *) dev_id; - DGRS_PRIV *priv0 = (DGRS_PRIV *) dev0->priv; + struct net_device *dev0 = dev_id; + DGRS_PRIV *priv0 = dev0->priv; I596_CB *cbp; int cmd; int i; @@ -979,7 +979,7 @@ static int __init dgrs_download(struct net_device *dev0) { - DGRS_PRIV *priv0 = (DGRS_PRIV *) dev0->priv; + DGRS_PRIV *priv0 = dev0->priv; int is; int i; @@ -1139,7 +1139,7 @@ int __init dgrs_probe1(struct net_device *dev) { - DGRS_PRIV *priv = (DGRS_PRIV *) dev->priv; + DGRS_PRIV *priv = dev->priv; int i; int rc; @@ -1216,7 +1216,7 @@ int __init dgrs_initclone(struct net_device *dev) { - DGRS_PRIV *priv = (DGRS_PRIV *) dev->priv; + DGRS_PRIV *priv = dev->priv; int i; printk("%s: Digi RightSwitch port %d ", @@ -1244,14 +1244,14 @@ int dev_size = sizeof(struct net_device) + sizeof(DGRS_PRIV); int i, ret; - dev = (struct net_device *) kmalloc(dev_size, GFP_KERNEL); + dev = kmalloc(dev_size, GFP_KERNEL); if (!dev) return -ENOMEM; memset(dev, 0, dev_size); dev->priv = ((void *)dev) + sizeof(struct net_device); - priv = (DGRS_PRIV *)dev->priv; + priv = dev->priv; dev->base_addr = io; dev->mem_start = mem; @@ -1287,7 +1287,7 @@ struct net_device *devN; DGRS_PRIV *privN; /* Allocate new dev and priv structures */ - devN = (struct net_device *) kmalloc(dev_size, GFP_KERNEL); + devN = kmalloc(dev_size, GFP_KERNEL); /* Make it an exact copy of dev[0]... */ ret = -ENOMEM; if (!devN) diff -urN --exclude-from=/home/davej/.exclude linux/drivers/net/dmfe.c linux-dj/drivers/net/dmfe.c --- linux/drivers/net/dmfe.c Mon Mar 19 09:16:23 2001 +++ linux-dj/drivers/net/dmfe.c Mon Mar 19 09:29:17 2001 @@ -705,7 +705,7 @@ return; } /* A real interrupt coming */ - db = (struct dmfe_board_info *) dev->priv; + db = dev->priv; ioaddr = dev->base_addr; DMFE_DBUG(0, "dmfe_interrupt()", 0); @@ -865,7 +865,7 @@ */ static struct net_device_stats *dmfe_get_stats(struct net_device *dev) { - struct dmfe_board_info *db = (struct dmfe_board_info *) dev->priv; + struct dmfe_board_info *db = dev->priv; DMFE_DBUG(0, "dmfe_get_stats", 0); return &db->stats; @@ -917,7 +917,7 @@ u32 tmp_cr8; unsigned char tmp_cr12; struct net_device *dev = (struct net_device *) data; - struct dmfe_board_info *db = (struct dmfe_board_info *) dev->priv; + struct dmfe_board_info *db = dev->priv; DMFE_DBUG(0, "dmfe_timer()", 0); diff -urN --exclude-from=/home/davej/.exclude linux/drivers/net/dummy.c linux-dj/drivers/net/dummy.c --- linux/drivers/net/dummy.c Mon Dec 4 01:45:22 2000 +++ linux-dj/drivers/net/dummy.c Mon Mar 19 09:29:14 2001 @@ -80,7 +80,7 @@ { struct net_device_stats *stats; - stats = (struct net_device_stats *)dev->priv; + stats = dev->priv; stats->tx_packets++; stats->tx_bytes+=skb->len; diff -urN --exclude-from=/home/davej/.exclude linux/drivers/net/eepro.c linux-dj/drivers/net/eepro.c --- linux/drivers/net/eepro.c Mon Mar 19 09:16:23 2001 +++ linux-dj/drivers/net/eepro.c Mon Mar 19 09:29:12 2001 @@ -681,7 +681,7 @@ return -ENOMEM; memset(dev->priv, 0, sizeof(struct eepro_local)); - lp = (struct eepro_local *)dev->priv; + lp = dev->priv; /* Now, get the ethernet hardware address from the EEPROM */ @@ -912,7 +912,7 @@ unsigned short temp_reg, old8, old9; int irqMask; int i, ioaddr = dev->base_addr; - struct eepro_local *lp = (struct eepro_local *)dev->priv; + struct eepro_local *lp = dev->priv; if (net_debug > 3) printk(KERN_DEBUG "%s: entering eepro_open routine.\n", dev->name); @@ -1091,14 +1091,14 @@ static void eepro_tx_timeout (struct net_device *dev) { - struct eepro_local *lp = (struct eepro_local *) dev->priv; + struct eepro_local *lp = dev->priv; int ioaddr = dev->base_addr; /* if (net_debug > 1) */ printk (KERN_ERR "%s: transmit timed out, %s?\n", dev->name, "network cable problem"); /* This is not a duplicate. One message for the console, - one for the the log file */ + one for the log file */ printk (KERN_DEBUG "%s: transmit timed out, %s?\n", dev->name, "network cable problem"); eepro_complete_selreset(ioaddr); @@ -1107,7 +1107,7 @@ static int eepro_send_packet(struct sk_buff *skb, struct net_device *dev) { - struct eepro_local *lp = (struct eepro_local *)dev->priv; + struct eepro_local *lp = dev->priv; unsigned long flags; if (net_debug > 5) @@ -1149,9 +1149,9 @@ static void eepro_interrupt(int irq, void *dev_id, struct pt_regs * regs) { - struct net_device *dev = (struct net_device *)dev_id; + struct net_device *dev = dev_id; /* (struct net_device *)(irq2dev_map[irq]);*/ - struct eepro_local *lp = (struct eepro_local *)dev->priv; + struct eepro_local *lp = dev->priv; int ioaddr, status, boguscount = 20; if (dev == NULL) { @@ -1209,7 +1209,7 @@ static int eepro_close(struct net_device *dev) { - struct eepro_local *lp = (struct eepro_local *)dev->priv; + struct eepro_local *lp = dev->priv; int ioaddr = dev->base_addr; short temp_reg; @@ -1254,7 +1254,7 @@ static struct net_device_stats * eepro_get_stats(struct net_device *dev) { - struct eepro_local *lp = (struct eepro_local *)dev->priv; + struct eepro_local *lp = dev->priv; return &lp->stats; } @@ -1264,7 +1264,7 @@ static void set_multicast_list(struct net_device *dev) { - struct eepro_local *lp = (struct eepro_local *)dev->priv; + struct eepro_local *lp = dev->priv; short ioaddr = dev->base_addr; unsigned short mode; struct dev_mc_list *dmi=dev->mc_list; @@ -1399,7 +1399,7 @@ int i; unsigned short retval = 0; short ee_addr = ioaddr + eeprom_reg; - struct eepro_local *lp = (struct eepro_local *)dev->priv; + struct eepro_local *lp = dev->priv; int read_cmd = location | EE_READ_CMD; short ctrl_val = EECS ; @@ -1446,7 +1446,7 @@ static void hardware_send_packet(struct net_device *dev, void *buf, short length) { - struct eepro_local *lp = (struct eepro_local *)dev->priv; + struct eepro_local *lp = dev->priv; short ioaddr = dev->base_addr; unsigned status, tx_available, last, end, boguscount = 100; @@ -1561,7 +1561,7 @@ static void eepro_rx(struct net_device *dev) { - struct eepro_local *lp = (struct eepro_local *)dev->priv; + struct eepro_local *lp = dev->priv; short ioaddr = dev->base_addr; short boguscount = 20; unsigned rcv_car = lp->rx_start; @@ -1654,7 +1654,7 @@ static void eepro_transmit_interrupt(struct net_device *dev) { - struct eepro_local *lp = (struct eepro_local *)dev->priv; + struct eepro_local *lp = dev->priv; short ioaddr = dev->base_addr; short boguscount = 20; unsigned xmt_status; diff -urN --exclude-from=/home/davej/.exclude linux/drivers/net/eepro100.c linux-dj/drivers/net/eepro100.c --- linux/drivers/net/eepro100.c Mon Mar 19 09:16:23 2001 +++ linux-dj/drivers/net/eepro100.c Mon Mar 19 23:02:34 2001 @@ -903,7 +903,7 @@ static int speedo_open(struct net_device *dev) { - struct speedo_private *sp = (struct speedo_private *)dev->priv; + struct speedo_private *sp = dev->priv; long ioaddr = dev->base_addr; int retval; @@ -992,7 +992,7 @@ /* Start the chip hardware after a full reset. */ static void speedo_resume(struct net_device *dev) { - struct speedo_private *sp = (struct speedo_private *)dev->priv; + struct speedo_private *sp = dev->priv; long ioaddr = dev->base_addr; /* Start with a Tx threshold of 256 (0x..20.... 8 byte units). */ @@ -1056,7 +1056,7 @@ static void speedo_timer(unsigned long data) { struct net_device *dev = (struct net_device *)data; - struct speedo_private *sp = (struct speedo_private *)dev->priv; + struct speedo_private *sp = dev->priv; long ioaddr = dev->base_addr; int phy_num = sp->phy[0] & 0x1f; @@ -1110,7 +1110,7 @@ static void speedo_show_state(struct net_device *dev) { - struct speedo_private *sp = (struct speedo_private *)dev->priv; + struct speedo_private *sp = dev->priv; int i; /* Print a few items for debugging. */ @@ -1155,7 +1155,7 @@ static void speedo_init_rx_ring(struct net_device *dev) { - struct speedo_private *sp = (struct speedo_private *)dev->priv; + struct speedo_private *sp = dev->priv; struct RxFD *rxf, *last_rxf = NULL; dma_addr_t last_rxf_dma = 0 /* to shut up the compiler */; int i; @@ -1201,7 +1201,7 @@ static void speedo_purge_tx(struct net_device *dev) { - struct speedo_private *sp = (struct speedo_private *)dev->priv; + struct speedo_private *sp = dev->priv; int entry; while ((int)(sp->cur_tx - sp->dirty_tx) > 0) { @@ -1233,7 +1233,7 @@ static void reset_mii(struct net_device *dev) { - struct speedo_private *sp = (struct speedo_private *)dev->priv; + struct speedo_private *sp = dev->priv; long ioaddr = dev->base_addr; /* Reset the MII transceiver, suggested by Fred Young @ scalable.com. */ if ((sp->phy[0] & 0x8000) == 0) { @@ -1256,7 +1256,7 @@ static void speedo_tx_timeout(struct net_device *dev) { - struct speedo_private *sp = (struct speedo_private *)dev->priv; + struct speedo_private *sp = dev->priv; long ioaddr = dev->base_addr; int status = inw(ioaddr + SCBStatus); unsigned long flags; @@ -1317,7 +1317,7 @@ static int speedo_start_xmit(struct sk_buff *skb, struct net_device *dev) { - struct speedo_private *sp = (struct speedo_private *)dev->priv; + struct speedo_private *sp = dev->priv; long ioaddr = dev->base_addr; int entry; @@ -1380,7 +1380,7 @@ static void speedo_tx_buffer_gc(struct net_device *dev) { unsigned int dirty_tx; - struct speedo_private *sp = (struct speedo_private *)dev->priv; + struct speedo_private *sp = dev->priv; dirty_tx = sp->dirty_tx; while ((int)(sp->cur_tx - dirty_tx) > 0) { @@ -1440,7 +1440,7 @@ after the Tx thread. */ static void speedo_interrupt(int irq, void *dev_instance, struct pt_regs *regs) { - struct net_device *dev = (struct net_device *)dev_instance; + struct net_device *dev = dev_instance; struct speedo_private *sp; long ioaddr, boguscnt = max_interrupt_work; unsigned short status; @@ -1453,7 +1453,7 @@ #endif ioaddr = dev->base_addr; - sp = (struct speedo_private *)dev->priv; + sp = dev->priv; #ifndef final_version /* A lock to prevent simultaneous entry on SMP machines. */ @@ -1586,7 +1586,7 @@ static inline struct RxFD *speedo_rx_alloc(struct net_device *dev, int entry) { - struct speedo_private *sp = (struct speedo_private *)dev->priv; + struct speedo_private *sp = dev->priv; struct RxFD *rxf; struct sk_buff *skb; /* Get a fresh skbuff to replace the consumed one. */ @@ -1611,7 +1611,7 @@ static inline void speedo_rx_link(struct net_device *dev, int entry, struct RxFD *rxf, dma_addr_t rxf_dma) { - struct speedo_private *sp = (struct speedo_private *)dev->priv; + struct speedo_private *sp = dev->priv; rxf->status = cpu_to_le32(0xC0000001); /* '1' for driver use only. */ rxf->link = 0; /* None yet. */ rxf->count = cpu_to_le32(PKT_BUF_SZ << 16); @@ -1625,7 +1625,7 @@ static int speedo_refill_rx_buf(struct net_device *dev, int force) { - struct speedo_private *sp = (struct speedo_private *)dev->priv; + struct speedo_private *sp = dev->priv; int entry; struct RxFD *rxf; @@ -1667,7 +1667,7 @@ static void speedo_refill_rx_buffers(struct net_device *dev, int force) { - struct speedo_private *sp = (struct speedo_private *)dev->priv; + struct speedo_private *sp = dev->priv; /* Refill the RX ring. */ while ((int)(sp->cur_rx - sp->dirty_rx) > 0 && @@ -1677,7 +1677,7 @@ static int speedo_rx(struct net_device *dev) { - struct speedo_private *sp = (struct speedo_private *)dev->priv; + struct speedo_private *sp = dev->priv; int entry = sp->cur_rx % RX_RING_SIZE; int rx_work_limit = sp->dirty_rx + RX_RING_SIZE - sp->cur_rx; int alloc_ok = 1; @@ -1786,7 +1786,7 @@ speedo_close(struct net_device *dev) { long ioaddr = dev->base_addr; - struct speedo_private *sp = (struct speedo_private *)dev->priv; + struct speedo_private *sp = dev->priv; int i; netdevice_stop(dev); @@ -1862,7 +1862,7 @@ static struct net_device_stats * speedo_get_stats(struct net_device *dev) { - struct speedo_private *sp = (struct speedo_private *)dev->priv; + struct speedo_private *sp = dev->priv; long ioaddr = dev->base_addr; /* Update only if the previous dump finished. */ @@ -1894,7 +1894,7 @@ static int speedo_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) { - struct speedo_private *sp = (struct speedo_private *)dev->priv; + struct speedo_private *sp = dev->priv; long ioaddr = dev->base_addr; u16 *data = (u16 *)&rq->ifr_data; int phy = sp->phy[0] & 0x1f; @@ -1942,7 +1942,7 @@ */ static void set_rx_mode(struct net_device *dev) { - struct speedo_private *sp = (struct speedo_private *)dev->priv; + struct speedo_private *sp = dev->priv; long ioaddr = dev->base_addr; struct descriptor *last_cmd; char new_rx_mode; @@ -2145,7 +2145,7 @@ static void eepro100_resume(struct pci_dev *pdev) { struct net_device *dev = pdev->driver_data; - struct speedo_private *sp = (struct speedo_private *)dev->priv; + struct speedo_private *sp = dev->priv; long ioaddr = dev->base_addr; /* I'm absolutely uncertain if this part of code may work. @@ -2167,7 +2167,7 @@ static void __devexit eepro100_remove_one (struct pci_dev *pdev) { struct net_device *dev = pdev->driver_data; - struct speedo_private *sp = (struct speedo_private *)dev->priv; + struct speedo_private *sp = dev->priv; unregister_netdev(dev); diff -urN --exclude-from=/home/davej/.exclude linux/drivers/net/eexpress.c linux-dj/drivers/net/eexpress.c --- linux/drivers/net/eexpress.c Tue Feb 13 21:15:05 2001 +++ linux-dj/drivers/net/eexpress.c Mon Mar 19 09:29:21 2001 @@ -424,7 +424,7 @@ { int ret; unsigned short ioaddr = dev->base_addr; - struct net_local *lp = (struct net_local *)dev->priv; + struct net_local *lp = dev->priv; #if NET_DEBUG > 6 printk(KERN_DEBUG "%s: eexp_open()\n", dev->name); @@ -487,7 +487,7 @@ static struct net_device_stats *eexp_stats(struct net_device *dev) { - struct net_local *lp = (struct net_local *)dev->priv; + struct net_local *lp = dev->priv; return &lp->stats; } @@ -499,7 +499,7 @@ static void unstick_cu(struct net_device *dev) { - struct net_local *lp = (struct net_local *)dev->priv; + struct net_local *lp = dev->priv; unsigned short ioaddr = dev->base_addr; if (lp->started) @@ -573,7 +573,7 @@ static void eexp_timeout(struct net_device *dev) { - struct net_local *lp = (struct net_local *)dev->priv; + struct net_local *lp = dev->priv; #ifdef CONFIG_SMP unsigned long flags; #endif @@ -613,7 +613,7 @@ */ static int eexp_xmit(struct sk_buff *buf, struct net_device *dev) { - struct net_local *lp = (struct net_local *)dev->priv; + struct net_local *lp = dev->priv; #ifdef CONFIG_SMP unsigned long flags; #endif @@ -668,7 +668,7 @@ unsigned short status) { unsigned short ack_cmd = SCB_ack(status); - struct net_local *lp = (struct net_local *)dev->priv; + struct net_local *lp = dev->priv; unsigned short ioaddr = dev->base_addr; if ((dev->flags & IFF_UP) && !(lp->started & STARTED_CU)) { short diag_status, tdr_status; @@ -746,7 +746,7 @@ return; } - lp = (struct net_local *)dev->priv; + lp = dev->priv; ioaddr = dev->base_addr; spin_lock(&lp->lock); @@ -865,7 +865,7 @@ static void eexp_hw_rx_pio(struct net_device *dev) { - struct net_local *lp = (struct net_local *)dev->priv; + struct net_local *lp = dev->priv; unsigned short rx_block = lp->rx_ptr; unsigned short boguscount = lp->num_rx_bufs; unsigned short ioaddr = dev->base_addr; @@ -962,7 +962,7 @@ static void eexp_hw_tx_pio(struct net_device *dev, unsigned short *buf, unsigned short len) { - struct net_local *lp = (struct net_local *)dev->priv; + struct net_local *lp = dev->priv; unsigned short ioaddr = dev->base_addr; if (LOCKUP16 || lp->width) { @@ -1203,7 +1203,7 @@ static unsigned short eexp_hw_lasttxstat(struct net_device *dev) { - struct net_local *lp = (struct net_local *)dev->priv; + struct net_local *lp = dev->priv; unsigned short tx_block = lp->tx_reap; unsigned short status; @@ -1273,7 +1273,7 @@ static void eexp_hw_txrestart(struct net_device *dev) { - struct net_local *lp = (struct net_local *)dev->priv; + struct net_local *lp = dev->priv; unsigned short ioaddr = dev->base_addr; lp->last_tx_restart = lp->tx_link; @@ -1318,7 +1318,7 @@ static void eexp_hw_txinit(struct net_device *dev) { - struct net_local *lp = (struct net_local *)dev->priv; + struct net_local *lp = dev->priv; unsigned short tx_block = TX_BUF_START; unsigned short curtbuf; unsigned short ioaddr = dev->base_addr; @@ -1360,7 +1360,7 @@ static void eexp_hw_rxinit(struct net_device *dev) { - struct net_local *lp = (struct net_local *)dev->priv; + struct net_local *lp = dev->priv; unsigned short rx_block = lp->rx_buf_start; unsigned short ioaddr = dev->base_addr; @@ -1419,7 +1419,7 @@ static void eexp_hw_init586(struct net_device *dev) { - struct net_local *lp = (struct net_local *)dev->priv; + struct net_local *lp = dev->priv; unsigned short ioaddr = dev->base_addr; int i; @@ -1580,7 +1580,7 @@ eexp_set_multicast(struct net_device *dev) { unsigned short ioaddr = dev->base_addr; - struct net_local *lp = (struct net_local *)dev->priv; + struct net_local *lp = dev->priv; int kick = 0, i; if ((dev->flags & IFF_PROMISC) != lp->was_promisc) { outw(CONF_PROMISC & ~31, ioaddr+SM_PTR); diff -urN --exclude-from=/home/davej/.exclude linux/drivers/net/epic100.c linux-dj/drivers/net/epic100.c --- linux/drivers/net/epic100.c Mon Mar 19 09:16:23 2001 +++ linux-dj/drivers/net/epic100.c Mon Mar 19 09:29:12 2001 @@ -971,7 +971,7 @@ after the Tx thread. */ static void epic_interrupt(int irq, void *dev_instance, struct pt_regs *regs) { - struct net_device *dev = (struct net_device *)dev_instance; + struct net_device *dev = dev_instance; struct epic_private *ep = dev->priv; long ioaddr = dev->base_addr; int status, boguscnt = max_interrupt_work; @@ -1325,7 +1325,7 @@ static int mii_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) { - struct epic_private *ep = (void *)dev->priv; + struct epic_private *ep = dev->priv; long ioaddr = dev->base_addr; u16 *data = (u16 *)&rq->ifr_data; diff -urN --exclude-from=/home/davej/.exclude linux/drivers/net/eql.c linux-dj/drivers/net/eql.c --- linux/drivers/net/eql.c Mon Mar 19 09:16:23 2001 +++ linux-dj/drivers/net/eql.c Mon Mar 19 09:29:11 2001 @@ -258,7 +258,7 @@ static int eql_open(struct net_device *dev) { - equalizer_t *eql = (equalizer_t *) dev->priv; + equalizer_t *eql = dev->priv; slave_queue_t *new_queue; #ifdef EQL_DEBUG @@ -290,7 +290,7 @@ static int eql_close(struct net_device *dev) { - equalizer_t *eql = (equalizer_t *) dev->priv; + equalizer_t *eql = dev->priv; #ifdef EQL_DEBUG if ( eql_debug >= 5) @@ -340,7 +340,7 @@ static int eql_slave_xmit(struct sk_buff *skb, struct net_device *dev) { - equalizer_t *eql = (equalizer_t *) dev->priv; + equalizer_t *eql = dev->priv; struct net_device *slave_dev = 0; slave_t *slave; @@ -382,7 +382,7 @@ static struct net_device_stats * eql_get_stats(struct net_device *dev) { - equalizer_t *eql = (equalizer_t *) dev->priv; + equalizer_t *eql = dev->priv; return eql->stats; } @@ -616,7 +616,7 @@ { slave_t *slave; - slave = (slave_t *) kmalloc (sizeof (slave_t), GFP_KERNEL); + slave = kmalloc (sizeof (slave_t), GFP_KERNEL); if (slave) memset(slave, 0, sizeof (slave_t)); return slave; @@ -657,7 +657,7 @@ static inline int eql_is_full(slave_queue_t *queue) { - equalizer_t *eql = (equalizer_t *) queue->master_dev->priv; + equalizer_t *eql = queue->master_dev->priv; if (eql_number_slaves (queue) == eql->max_slaves) return 1; @@ -670,7 +670,7 @@ slave_t *head_slave; slave_t *tail_slave; - queue = (slave_queue_t *) kmalloc (sizeof (slave_queue_t), GFP_KERNEL); + queue = kmalloc (sizeof (slave_queue_t), GFP_KERNEL); if (!queue) goto err_out; diff -urN --exclude-from=/home/davej/.exclude linux/drivers/net/eth16i.c linux-dj/drivers/net/eth16i.c --- linux/drivers/net/eth16i.c Mon Mar 19 09:16:23 2001 +++ linux-dj/drivers/net/eth16i.c Mon Mar 19 09:29:14 2001 @@ -559,7 +559,7 @@ dev->tx_timeout = eth16i_timeout; dev->watchdog_timeo = TX_TIMEOUT; - lp = (struct eth16i_local *)dev->priv; + lp = dev->priv; spin_lock_init(&lp->lock); /* Fill in the fields of the device structure with ethernet values. */ @@ -950,7 +950,7 @@ static int eth16i_open(struct net_device *dev) { - struct eth16i_local *lp = (struct eth16i_local *)dev->priv; + struct eth16i_local *lp = dev->priv; int ioaddr = dev->base_addr; /* Powerup the chip */ @@ -986,7 +986,7 @@ static int eth16i_close(struct net_device *dev) { - struct eth16i_local *lp = (struct eth16i_local *)dev->priv; + struct eth16i_local *lp = dev->priv; int ioaddr = dev->base_addr; eth16i_reset(dev); @@ -1012,7 +1012,7 @@ static void eth16i_timeout(struct net_device *dev) { - struct eth16i_local *lp = (struct eth16i_local *)dev->priv; + struct eth16i_local *lp = dev->priv; int ioaddr = dev->base_addr; /* If we get here, some higher level has decided that @@ -1053,7 +1053,7 @@ static int eth16i_tx(struct sk_buff *skb, struct net_device *dev) { - struct eth16i_local *lp = (struct eth16i_local *)dev->priv; + struct eth16i_local *lp = dev->priv; int ioaddr = dev->base_addr; int status = 0; ushort length = ETH_ZLEN < skb->len ? skb->len : ETH_ZLEN; @@ -1123,7 +1123,7 @@ static void eth16i_rx(struct net_device *dev) { - struct eth16i_local *lp = (struct eth16i_local *)dev->priv; + struct eth16i_local *lp = dev->priv; int ioaddr = dev->base_addr; int boguscount = MAX_RX_LOOP; @@ -1224,7 +1224,7 @@ int ioaddr = 0, status; ioaddr = dev->base_addr; - lp = (struct eth16i_local *)dev->priv; + lp = dev->priv; /* Turn off all interrupts from adapter */ outw(ETH16I_INTR_OFF, ioaddr + TX_INTR_REG); @@ -1329,7 +1329,7 @@ static void eth16i_reset(struct net_device *dev) { - struct eth16i_local *lp = (struct eth16i_local *)dev->priv; + struct eth16i_local *lp = dev->priv; int ioaddr = dev->base_addr; if(eth16i_debug > 1) @@ -1361,7 +1361,7 @@ static struct net_device_stats *eth16i_get_stats(struct net_device *dev) { - struct eth16i_local *lp = (struct eth16i_local *)dev->priv; + struct eth16i_local *lp = dev->priv; return &lp->stats; } diff -urN --exclude-from=/home/davej/.exclude linux/drivers/net/ethertap.c linux-dj/drivers/net/ethertap.c --- linux/drivers/net/ethertap.c Tue Feb 13 21:15:05 2001 +++ linux-dj/drivers/net/ethertap.c Mon Mar 19 09:29:14 2001 @@ -113,7 +113,7 @@ static int ethertap_open(struct net_device *dev) { - struct net_local *lp = (struct net_local*)dev->priv; + struct net_local *lp = dev->priv; if (ethertap_debug > 2) printk("%s: Doing ethertap_open()...", dev->name); @@ -141,7 +141,7 @@ static void set_multicast_list(struct net_device *dev) { unsigned groups = ~0; - struct net_local *lp = (struct net_local *)dev->priv; + struct net_local *lp = dev->priv; if (!(dev->flags&(IFF_NOARP|IFF_PROMISC|IFF_ALLMULTI))) { struct dev_mc_list *dmi; @@ -167,9 +167,9 @@ static int ethertap_start_xmit(struct sk_buff *skb, struct net_device *dev) { - struct net_local *lp = (struct net_local *)dev->priv; + struct net_local *lp = dev->priv; #ifdef CONFIG_ETHERTAP_MC - struct ethhdr *eth = (struct ethhdr*)skb->data; + struct ethhdr *eth = skb->data; #endif if (skb_headroom(skb) < 2) { @@ -225,9 +225,9 @@ static __inline__ int ethertap_rx_skb(struct sk_buff *skb, struct net_device *dev) { - struct net_local *lp = (struct net_local *)dev->priv; + struct net_local *lp = dev->priv; #ifdef CONFIG_ETHERTAP_MC - struct ethhdr *eth = (struct ethhdr*)(skb->data + 2); + struct ethhdr *eth = (skb->data + 2); #endif int len = skb->len; @@ -310,7 +310,7 @@ static int ethertap_close(struct net_device *dev) { - struct net_local *lp = (struct net_local *)dev->priv; + struct net_local *lp = dev->priv; struct sock *sk = lp->nl; if (ethertap_debug > 2) @@ -328,7 +328,7 @@ static struct net_device_stats *ethertap_get_stats(struct net_device *dev) { - struct net_local *lp = (struct net_local *)dev->priv; + struct net_local *lp = dev->priv; return &lp->stats; } diff -urN --exclude-from=/home/davej/.exclude linux/drivers/net/ewrk3.c linux-dj/drivers/net/ewrk3.c --- linux/drivers/net/ewrk3.c Mon Mar 19 09:16:23 2001 +++ linux-dj/drivers/net/ewrk3.c Mon Mar 19 09:29:16 2001 @@ -524,7 +524,7 @@ if (dev->priv == NULL) { return -ENOMEM; } - lp = (struct ewrk3_private *) dev->priv; + lp = dev->priv; memset(dev->priv, 0, sizeof(struct ewrk3_private)); lp->shmem_base = mem_start; lp->shmem_length = shmem_length; @@ -629,7 +629,7 @@ static int ewrk3_open(struct net_device *dev) { - struct ewrk3_private *lp = (struct ewrk3_private *) dev->priv; + struct ewrk3_private *lp = dev->priv; u_long iobase = dev->base_addr; int i, status = 0; u_char icr, csr; @@ -692,7 +692,7 @@ */ static void ewrk3_init(struct net_device *dev) { - struct ewrk3_private *lp = (struct ewrk3_private *) dev->priv; + struct ewrk3_private *lp = dev->priv; u_char csr, page; u_long iobase = dev->base_addr; @@ -725,7 +725,7 @@ static void ewrk3_timeout(struct net_device *dev) { - struct ewrk3_private *lp = (struct ewrk3_private *) dev->priv; + struct ewrk3_private *lp = dev->priv; u_char icr, csr; u_long iobase = dev->base_addr; @@ -761,7 +761,7 @@ */ static int ewrk3_queue_pkt (struct sk_buff *skb, struct net_device *dev) { - struct ewrk3_private *lp = (struct ewrk3_private *) dev->priv; + struct ewrk3_private *lp = dev->priv; u_long iobase = dev->base_addr; u_long buf = 0; u_char icr; @@ -883,7 +883,7 @@ u_long iobase; u_char icr, cr, csr; - lp = (struct ewrk3_private *) dev->priv; + lp = dev->priv; iobase = dev->base_addr; /* get the interrupt information */ @@ -929,7 +929,7 @@ static int ewrk3_rx(struct net_device *dev) { - struct ewrk3_private *lp = (struct ewrk3_private *) dev->priv; + struct ewrk3_private *lp = dev->priv; u_long iobase = dev->base_addr; int i, status = 0; u_char page; @@ -1055,7 +1055,7 @@ */ static int ewrk3_tx(struct net_device *dev) { - struct ewrk3_private *lp = (struct ewrk3_private *) dev->priv; + struct ewrk3_private *lp = dev->priv; u_long iobase = dev->base_addr; u_char tx_status; @@ -1091,7 +1091,7 @@ static int ewrk3_close(struct net_device *dev) { - struct ewrk3_private *lp = (struct ewrk3_private *) dev->priv; + struct ewrk3_private *lp = dev->priv; u_long iobase = dev->base_addr; u_char icr, csr; @@ -1126,7 +1126,7 @@ static struct net_device_stats *ewrk3_get_stats(struct net_device *dev) { - struct ewrk3_private *lp = (struct ewrk3_private *) dev->priv; + struct ewrk3_private *lp = dev->priv; /* Null body since there is no framing error counter */ return &lp->stats; @@ -1137,7 +1137,7 @@ */ static void set_multicast_list(struct net_device *dev) { - struct ewrk3_private *lp = (struct ewrk3_private *) dev->priv; + struct ewrk3_private *lp = dev->priv; u_long iobase = dev->base_addr; u_char csr; @@ -1170,7 +1170,7 @@ */ static void SetMulticastFilter(struct net_device *dev) { - struct ewrk3_private *lp = (struct ewrk3_private *) dev->priv; + struct ewrk3_private *lp = dev->priv; struct dev_mc_list *dmi = dev->mc_list; u_long iobase = dev->base_addr; int i; @@ -1388,7 +1388,7 @@ { struct net_device *new; - new = (struct net_device *) kmalloc(sizeof(struct net_device) + 8, GFP_KERNEL); + new = kmalloc(sizeof(struct net_device) + 8, GFP_KERNEL); if (new == NULL) { printk("eth%d: Device not initialised, insufficient memory\n", num_eth); return NULL; @@ -1628,7 +1628,7 @@ */ static int ewrk3_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) { - struct ewrk3_private *lp = (struct ewrk3_private *) dev->priv; + struct ewrk3_private *lp = dev->priv; struct ewrk3_ioctl *ioc = (struct ewrk3_ioctl *) &rq->ifr_data; u_long iobase = dev->base_addr; int i, j, status = 0; diff -urN --exclude-from=/home/davej/.exclude linux/drivers/net/gmac.c linux-dj/drivers/net/gmac.c --- linux/drivers/net/gmac.c Mon Mar 19 09:16:23 2001 +++ linux-dj/drivers/net/gmac.c Mon Mar 19 09:29:17 2001 @@ -461,7 +461,7 @@ static int gmac_powerup_and_reset(struct net_device *dev) { - struct gmac *gm = (struct gmac *) dev->priv; + struct gmac *gm = dev->priv; int timeout; /* turn on GB clock */ @@ -651,7 +651,7 @@ gfp_flags = GFP_ATOMIC; /* init rx ring */ - ring = (struct gmac_dma_desc *) gm->rxring; + ring = gm->rxring; memset(ring, 0, NRX * sizeof(struct gmac_dma_desc)); for (i = 0; i < NRX; ++i, ++ring) { data = dummy_buf; @@ -741,7 +741,7 @@ static void gmac_set_multicast(struct net_device *dev) { - struct gmac *gm = (struct gmac *) dev->priv; + struct gmac *gm = dev->priv; struct dev_mc_list *dmi = dev->mc_list; int i,j,k,b; unsigned long crc; @@ -813,7 +813,7 @@ gmac_open(struct net_device *dev) { int ret; - struct gmac *gm = (struct gmac *) dev->priv; + struct gmac *gm = dev->priv; /* Power up and reset chip */ if (gmac_powerup_and_reset(dev)) @@ -866,7 +866,7 @@ static int gmac_close(struct net_device *dev) { - struct gmac *gm = (struct gmac *) dev->priv; + struct gmac *gm = dev->priv; int i; gm->opened = 0; @@ -911,7 +911,7 @@ if (gmacs == NULL) return PBOOK_SLEEP_OK; - gm = (struct gmac *) gmacs->priv; + gm = gmacs->priv; if (!gm->opened) return PBOOK_SLEEP_OK; @@ -965,7 +965,7 @@ static void gmac_tx_timeout(struct net_device *dev) { - struct gmac *gm = (struct gmac *) dev->priv; + struct gmac *gm = dev->priv; int i, timeout; unsigned long flags; @@ -1018,7 +1018,7 @@ static int gmac_xmit_start(struct sk_buff *skb, struct net_device *dev) { - struct gmac *gm = (struct gmac *) dev->priv; + struct gmac *gm = dev->priv; volatile struct gmac_dma_desc *dp; unsigned long flags; int i; @@ -1069,7 +1069,7 @@ static void gmac_tx_cleanup(struct net_device *dev, int force_cleanup) { - struct gmac *gm = (struct gmac *) dev->priv; + struct gmac *gm = dev->priv; volatile struct gmac_dma_desc *dp; struct sk_buff *skb; int gone, i; @@ -1109,7 +1109,7 @@ static void gmac_receive(struct net_device *dev) { - struct gmac *gm = (struct gmac *) dev->priv; + struct gmac *gm = dev->priv; int i = gm->next_rx; volatile struct gmac_dma_desc *dp; struct sk_buff *skb, *new_skb; @@ -1233,8 +1233,8 @@ static void gmac_interrupt(int irq, void *dev_id, struct pt_regs *regs) { - struct net_device *dev = (struct net_device *) dev_id; - struct gmac *gm = (struct gmac *) dev->priv; + struct net_device *dev = dev_id; + struct gmac *gm = dev->priv; unsigned int status; status = GM_IN(GM_IRQ_STATUS); @@ -1272,7 +1272,7 @@ static struct net_device_stats * gmac_stats(struct net_device *dev) { - struct gmac *gm = (struct gmac *) dev->priv; + struct gmac *gm = dev->priv; struct net_device_stats *stats = &gm->stats; if (gm && gm->opened) { @@ -1440,7 +1440,7 @@ struct net_device *dev; while ((dev = gmacs) != NULL) { - gm = (struct gmac *) dev->priv; + gm = dev->priv; unregister_netdev(dev); iounmap(gm->regs); free_page(gm->tx_desc_page); diff -urN --exclude-from=/home/davej/.exclude linux/drivers/net/gt96100eth.c linux-dj/drivers/net/gt96100eth.c --- linux/drivers/net/gt96100eth.c Mon Mar 19 09:16:23 2001 +++ linux-dj/drivers/net/gt96100eth.c Mon Mar 19 23:04:24 2001 @@ -144,7 +144,7 @@ static int read_MII(struct net_device *dev, u32 reg) { - struct gt96100_private *gp = (struct gt96100_private *) dev->priv; + struct gt96100_private *gp = dev->priv; int timedout = 20; u32 smir = smirOpCode | (gp->phy_addr << smirPhyAdBit) | (reg << smirRegAdBit); @@ -191,7 +191,7 @@ static int write_MII(struct net_device *dev, u32 reg, u16 data) { - struct gt96100_private *gp = (struct gt96100_private *) dev->priv; + struct gt96100_private *gp = dev->priv; int timedout = 20; u32 smir = (gp->phy_addr << smirPhyAdBit) | (reg << smirRegAdBit) | data; @@ -236,7 +236,7 @@ static int gt96100_add_hash_entry(struct net_device *dev, unsigned char *addr) { - struct gt96100_private *gp = (struct gt96100_private *) dev->priv; + struct gt96100_private *gp = dev->priv; u16 hashResult, stmp; unsigned char ctmp, hash_ea[6]; u32 tblEntry, *tblEntryAddr; @@ -341,7 +341,7 @@ static void abort(struct net_device *dev, u32 abort_bits) { - struct gt96100_private *gp = (struct gt96100_private *) dev->priv; + struct gt96100_private *gp = dev->priv; int timedout = 100; // wait up to 100 msec for hard stop to complete if (gt96100_debug > 2) @@ -391,7 +391,7 @@ static void hard_stop(struct net_device *dev) { - struct gt96100_private *gp = (struct gt96100_private *) dev->priv; + struct gt96100_private *gp = dev->priv; if (gt96100_debug > 2) printk(KERN_INFO "%s: hard stop\n", dev->name); @@ -407,7 +407,7 @@ static void enable_ether_irq(struct net_device *dev) { - struct gt96100_private *gp = (struct gt96100_private *) dev->priv; + struct gt96100_private *gp = dev->priv; u32 intMask; // unmask interrupts @@ -427,7 +427,7 @@ static void disable_ether_irq(struct net_device *dev) { - struct gt96100_private *gp = (struct gt96100_private *) dev->priv; + struct gt96100_private *gp = dev->priv; u32 intMask; // FIX! The kernel's irq code should do this @@ -540,9 +540,7 @@ /* Initialize our private structure. */ if (dev->priv == NULL) { - gp = - (struct gt96100_private *) kmalloc(sizeof(*gp), - GFP_KERNEL); + gp = kmalloc(sizeof(*gp), GFP_KERNEL); if (gp == NULL) { retval = -ENOMEM; goto free_region; @@ -633,7 +631,7 @@ static int gt96100_init(struct net_device *dev) { - struct gt96100_private *gp = (struct gt96100_private *) dev->priv; + struct gt96100_private *gp = dev->priv; unsigned long flags; u32 phyAD, ciu; int i; @@ -851,7 +849,7 @@ static int gt96100_close(struct net_device *dev) { - struct gt96100_private *gp = (struct gt96100_private *) dev->priv; + struct gt96100_private *gp = dev->priv; int i; if (gt96100_debug > 2) @@ -879,7 +877,7 @@ static int gt96100_tx(struct sk_buff *skb, struct net_device *dev) { - struct gt96100_private *gp = (struct gt96100_private *) dev->priv; + struct gt96100_private *gp = dev->priv; unsigned long flags; int nextIn; @@ -939,7 +937,7 @@ static int gt96100_rx(struct net_device *dev, u32 status) { - struct gt96100_private *gp = (struct gt96100_private *) dev->priv; + struct gt96100_private *gp = dev->priv; struct sk_buff *skb; int pkt_len, nextOut; gt96100_rd_t *rd; @@ -1016,8 +1014,8 @@ static void gt96100_interrupt(int irq, void *dev_id, struct pt_regs *regs) { - struct net_device *dev = (struct net_device *) dev_id; - struct gt96100_private *gp = (struct gt96100_private *) dev->priv; + struct net_device *dev = dev_id; + struct gt96100_private *gp = dev->priv; u32 status; if (dev == NULL) { @@ -1189,7 +1187,7 @@ */ static void gt96100_tx_timeout(struct net_device *dev) { -// struct gt96100_private *gp = (struct gt96100_private *)dev->priv; +// struct gt96100_private *gp = dev->priv; printk(KERN_ERR "%s: gt96100_tx_timeout: dev=%p\n", dev->name, dev); @@ -1200,7 +1198,7 @@ static void gt96100_set_rx_mode(struct net_device *dev) { - struct gt96100_private *gp = (struct gt96100_private *) dev->priv; + struct gt96100_private *gp = dev->priv; unsigned long flags; struct dev_mc_list *mcptr; @@ -1234,7 +1232,7 @@ static struct net_device_stats *gt96100_get_stats(struct net_device *dev) { - struct gt96100_private *gp = (struct gt96100_private *) dev->priv; + struct gt96100_private *gp = dev->priv; unsigned long flags; if (gt96100_debug > 2) diff -urN --exclude-from=/home/davej/.exclude linux/drivers/net/hamachi.c linux-dj/drivers/net/hamachi.c --- linux/drivers/net/hamachi.c Mon Mar 19 09:16:24 2001 +++ linux-dj/drivers/net/hamachi.c Mon Mar 19 09:29:17 2001 @@ -785,7 +785,7 @@ static int hamachi_open(struct net_device *dev) { - struct hamachi_private *hmp = (struct hamachi_private *)dev->priv; + struct hamachi_private *hmp = dev->priv; long ioaddr = dev->base_addr; int i; u_int32_t rx_int_var, tx_int_var; @@ -933,7 +933,7 @@ static inline int hamachi_tx(struct net_device *dev) { - struct hamachi_private *hmp = (struct hamachi_private *)dev->priv; + struct hamachi_private *hmp = dev->priv; /* Update the dirty pointer until we find an entry that is still owned by the card */ @@ -959,7 +959,7 @@ static void hamachi_timer(unsigned long data) { struct net_device *dev = (struct net_device *)data; - struct hamachi_private *hmp = (struct hamachi_private *)dev->priv; + struct hamachi_private *hmp = dev->priv; long ioaddr = dev->base_addr; int next_tick = 10*HZ; @@ -984,7 +984,7 @@ static void hamachi_tx_timeout(struct net_device *dev) { int i; - struct hamachi_private *hmp = (struct hamachi_private *)dev->priv; + struct hamachi_private *hmp = dev->priv; long ioaddr = dev->base_addr; printk(KERN_WARNING "%s: Hamachi transmit timed out, status %8.8x," @@ -1080,7 +1080,7 @@ /* Initialize the Rx and Tx rings, along with various 'dev' bits. */ static void hamachi_init_ring(struct net_device *dev) { - struct hamachi_private *hmp = (struct hamachi_private *)dev->priv; + struct hamachi_private *hmp = dev->priv; int i; hmp->tx_full = 0; @@ -1178,7 +1178,7 @@ static int hamachi_start_xmit(struct sk_buff *skb, struct net_device *dev) { - struct hamachi_private *hmp = (struct hamachi_private *)dev->priv; + struct hamachi_private *hmp = dev->priv; unsigned entry; u16 status; @@ -1292,7 +1292,7 @@ after the Tx thread. */ static void hamachi_interrupt(int irq, void *dev_instance, struct pt_regs *rgs) { - struct net_device *dev = (struct net_device *)dev_instance; + struct net_device *dev = dev_instance; struct hamachi_private *hmp; long ioaddr, boguscnt = max_interrupt_work; @@ -1304,7 +1304,7 @@ #endif ioaddr = dev->base_addr; - hmp = (struct hamachi_private *)dev->priv; + hmp = dev->priv; spin_lock(&hmp->lock); do { @@ -1446,7 +1446,7 @@ for clarity and better register allocation. */ static int hamachi_rx(struct net_device *dev) { - struct hamachi_private *hmp = (struct hamachi_private *)dev->priv; + struct hamachi_private *hmp = dev->priv; int entry = hmp->cur_rx % RX_RING_SIZE; int boguscnt = (hmp->dirty_rx + RX_RING_SIZE) - hmp->cur_rx; @@ -1653,7 +1653,7 @@ static void hamachi_error(struct net_device *dev, int intr_status) { long ioaddr = dev->base_addr; - struct hamachi_private *hmp = (struct hamachi_private *)dev->priv; + struct hamachi_private *hmp = dev->priv; if (intr_status & (LinkChange|NegotiationChange)) { if (hamachi_debug > 1) @@ -1687,7 +1687,7 @@ static int hamachi_close(struct net_device *dev) { long ioaddr = dev->base_addr; - struct hamachi_private *hmp = (struct hamachi_private *)dev->priv; + struct hamachi_private *hmp = dev->priv; int i; netif_stop_queue(dev); @@ -1760,7 +1760,7 @@ static struct net_device_stats *hamachi_get_stats(struct net_device *dev) { long ioaddr = dev->base_addr; - struct hamachi_private *hmp = (struct hamachi_private *)dev->priv; + struct hamachi_private *hmp = dev->priv; /* We should lock this segment of code for SMP eventually, although the vulnerability window is very small and statistics are diff -urN --exclude-from=/home/davej/.exclude linux/drivers/net/hamradio/baycom_par.c linux-dj/drivers/net/hamradio/baycom_par.c --- linux/drivers/net/hamradio/baycom_par.c Wed Jul 5 19:59:11 2000 +++ linux-dj/drivers/net/hamradio/baycom_par.c Mon Mar 19 23:06:00 2001 @@ -277,8 +277,8 @@ static void par96_interrupt(int irq, void *dev_id, struct pt_regs *regs) { - struct net_device *dev = (struct net_device *)dev_id; - struct baycom_state *bc = (struct baycom_state *)dev->priv; + struct net_device *dev = dev_id; + struct baycom_state *bc = dev->priv; if (!dev || !bc || bc->hdrv.magic != HDLCDRV_MAGIC) return; @@ -307,8 +307,8 @@ static void par96_wakeup(void *handle) { - struct net_device *dev = (struct net_device *)handle; - struct baycom_state *bc = (struct baycom_state *)dev->priv; + struct net_device *dev = handle; + struct baycom_state *bc = dev->priv; printk(KERN_DEBUG "baycom_par: %s: why am I being woken up?\n", dev->name); if (!parport_claim(bc->pdev)) @@ -319,7 +319,7 @@ static int par96_open(struct net_device *dev) { - struct baycom_state *bc = (struct baycom_state *)dev->priv; + struct baycom_state *bc = dev->priv; struct parport *pp = parport_enumerate(); if (!dev || !bc) @@ -366,7 +366,7 @@ static int par96_close(struct net_device *dev) { - struct baycom_state *bc = (struct baycom_state *)dev->priv; + struct baycom_state *bc = dev->priv; struct parport *pp; if (!dev || !bc) @@ -429,7 +429,7 @@ printk(KERN_ERR "bc_ioctl: invalid device struct\n"); return -EINVAL; } - bc = (struct baycom_state *)dev->priv; + bc = dev->priv; if (cmd != SIOCDEVPRIVATE) return -ENOIOCTLCMD; @@ -523,7 +523,7 @@ j = hdlcdrv_register_hdlcdrv(dev, &par96_ops, sizeof(struct baycom_state), ifname, iobase[i], 0, 0); if (!j) { - bc = (struct baycom_state *)dev->priv; + bc = dev->priv; if (set_hw && baycom_setmode(bc, mode[i])) set_hw = 0; found++; @@ -543,7 +543,7 @@ for(i = 0; i < NR_PORTS; i++) { struct net_device *dev = baycom_device+i; - struct baycom_state *bc = (struct baycom_state *)dev->priv; + struct baycom_state *bc = dev->priv; if (bc) { if (bc->hdrv.magic != HDLCDRV_MAGIC) diff -urN --exclude-from=/home/davej/.exclude linux/drivers/net/hamradio/baycom_ser_fdx.c linux-dj/drivers/net/hamradio/baycom_ser_fdx.c --- linux/drivers/net/hamradio/baycom_ser_fdx.c Wed Jul 5 19:59:11 2000 +++ linux-dj/drivers/net/hamradio/baycom_ser_fdx.c Mon Mar 19 23:07:23 2001 @@ -286,8 +286,8 @@ static void ser12_interrupt(int irq, void *dev_id, struct pt_regs *regs) { - struct net_device *dev = (struct net_device *)dev_id; - struct baycom_state *bc = (struct baycom_state *)dev->priv; + struct net_device *dev = dev_id; + struct baycom_state *bc = dev->priv; struct timeval tv; unsigned char iir, msr; unsigned int txcount = 0; @@ -412,7 +412,7 @@ static int ser12_open(struct net_device *dev) { - struct baycom_state *bc = (struct baycom_state *)dev->priv; + struct baycom_state *bc = dev->priv; enum uart u; if (!dev || !bc) @@ -466,7 +466,7 @@ static int ser12_close(struct net_device *dev) { - struct baycom_state *bc = (struct baycom_state *)dev->priv; + struct baycom_state *bc = dev->priv; if (!dev || !bc) return -EINVAL; @@ -537,7 +537,7 @@ printk(KERN_ERR "bc_ioctl: invalid device struct\n"); return -EINVAL; } - bc = (struct baycom_state *)dev->priv; + bc = dev->priv; if (cmd != SIOCDEVPRIVATE) return -ENOIOCTLCMD; @@ -639,7 +639,7 @@ j = hdlcdrv_register_hdlcdrv(dev, &ser12_ops, sizeof(struct baycom_state), ifname, iobase[i], irq[i], 0); if (!j) { - bc = (struct baycom_state *)dev->priv; + bc = dev->priv; if (set_hw && baycom_setmode(bc, mode[i])) set_hw = 0; bc->baud = baud[i]; @@ -660,7 +660,7 @@ for(i = 0; i < NR_PORTS; i++) { struct net_device *dev = baycom_device+i; - struct baycom_state *bc = (struct baycom_state *)dev->priv; + struct baycom_state *bc = dev->priv; if (bc) { if (bc->hdrv.magic != HDLCDRV_MAGIC) diff -urN --exclude-from=/home/davej/.exclude linux/drivers/net/hamradio/baycom_ser_hdx.c linux-dj/drivers/net/hamradio/baycom_ser_hdx.c --- linux/drivers/net/hamradio/baycom_ser_hdx.c Wed Jul 5 19:59:11 2000 +++ linux-dj/drivers/net/hamradio/baycom_ser_hdx.c Mon Mar 19 23:08:05 2001 @@ -380,8 +380,8 @@ static void ser12_interrupt(int irq, void *dev_id, struct pt_regs *regs) { - struct net_device *dev = (struct net_device *)dev_id; - struct baycom_state *bc = (struct baycom_state *)dev->priv; + struct net_device *dev = dev_id; + struct baycom_state *bc = dev->priv; unsigned char iir; if (!dev || !bc || bc->hdrv.magic != HDLCDRV_MAGIC) @@ -473,7 +473,7 @@ static int ser12_open(struct net_device *dev) { - struct baycom_state *bc = (struct baycom_state *)dev->priv; + struct baycom_state *bc = dev->priv; enum uart u; if (!dev || !bc) @@ -514,7 +514,7 @@ static int ser12_close(struct net_device *dev) { - struct baycom_state *bc = (struct baycom_state *)dev->priv; + struct baycom_state *bc = dev->priv; if (!dev || !bc) return -EINVAL; @@ -580,7 +580,7 @@ printk(KERN_ERR "bc_ioctl: invalid device struct\n"); return -EINVAL; } - bc = (struct baycom_state *)dev->priv; + bc = dev->priv; if (cmd != SIOCDEVPRIVATE) return -ENOIOCTLCMD; @@ -679,7 +679,7 @@ j = hdlcdrv_register_hdlcdrv(dev, &ser12_ops, sizeof(struct baycom_state), ifname, iobase[i], irq[i], 0); if (!j) { - bc = (struct baycom_state *)dev->priv; + bc = dev->priv; if (set_hw && baycom_setmode(bc, mode[i])) set_hw = 0; found++; @@ -699,7 +699,7 @@ for(i = 0; i < NR_PORTS; i++) { struct net_device *dev = baycom_device+i; - struct baycom_state *bc = (struct baycom_state *)dev->priv; + struct baycom_state *bc = dev->priv; if (bc) { if (bc->hdrv.magic != HDLCDRV_MAGIC) diff -urN --exclude-from=/home/davej/.exclude linux/drivers/net/hamradio/soundmodem/sm_sbc.c linux-dj/drivers/net/hamradio/soundmodem/sm_sbc.c --- linux/drivers/net/hamradio/soundmodem/sm_sbc.c Tue Jul 18 23:55:19 2000 +++ linux-dj/drivers/net/hamradio/soundmodem/sm_sbc.c Mon Mar 19 23:08:43 2001 @@ -323,8 +323,8 @@ static void sbc_interrupt(int irq, void *dev_id, struct pt_regs *regs) { - struct net_device *dev = (struct net_device *)dev_id; - struct sm_state *sm = (struct sm_state *)dev->priv; + struct net_device *dev = dev_id; + struct sm_state *sm = dev->priv; unsigned int curfrag; if (!dev || !sm || sm->hdrv.magic != HDLCDRV_MAGIC) @@ -684,8 +684,8 @@ static void sbcfdx_interrupt(int irq, void *dev_id, struct pt_regs *regs) { - struct net_device *dev = (struct net_device *)dev_id; - struct sm_state *sm = (struct sm_state *)dev->priv; + struct net_device *dev = dev_id; + struct sm_state *sm = dev->priv; unsigned char intsrc, pbint = 0, captint = 0; unsigned int ocfrag, icfrag; unsigned long flags; diff -urN --exclude-from=/home/davej/.exclude linux/drivers/net/hamradio/soundmodem/sm_wss.c linux-dj/drivers/net/hamradio/soundmodem/sm_wss.c --- linux/drivers/net/hamradio/soundmodem/sm_wss.c Tue Jul 18 23:55:19 2000 +++ linux-dj/drivers/net/hamradio/soundmodem/sm_wss.c Mon Mar 19 23:08:58 2001 @@ -383,8 +383,8 @@ static void wss_interrupt(int irq, void *dev_id, struct pt_regs *regs) { - struct net_device *dev = (struct net_device *)dev_id; - struct sm_state *sm = (struct sm_state *)dev->priv; + struct net_device *dev = dev_id; + struct sm_state *sm = dev->priv; unsigned int curfrag; unsigned int nums; @@ -703,8 +703,8 @@ static void wssfdx_interrupt(int irq, void *dev_id, struct pt_regs *regs) { - struct net_device *dev = (struct net_device *)dev_id; - struct sm_state *sm = (struct sm_state *)dev->priv; + struct net_device *dev = dev_id; + struct sm_state *sm = dev->priv; unsigned long flags; unsigned char cry_int_src; unsigned icfrag, ocfrag, isamps, osamps; diff -urN --exclude-from=/home/davej/.exclude linux/drivers/net/hp100.c linux-dj/drivers/net/hp100.c --- linux/drivers/net/hp100.c Mon Mar 19 09:16:24 2001 +++ linux-dj/drivers/net/hp100.c Mon Mar 19 09:29:19 2001 @@ -717,7 +717,7 @@ if ( (dev->priv=kmalloc(sizeof(struct hp100_private), GFP_KERNEL)) == NULL) return -ENOMEM; - lp = (struct hp100_private *)dev->priv; + lp = dev->priv; memset( lp, 0, sizeof( struct hp100_private ) ); spin_lock_init(&lp->lock); lp->id = eid; @@ -863,7 +863,7 @@ static void hp100_hwinit( struct net_device *dev ) { int ioaddr = dev->base_addr; - struct hp100_private *lp = (struct hp100_private *)dev->priv; + struct hp100_private *lp = dev->priv; #ifdef HP100_DEBUG_B hp100_outw( 0x4202, TRACE ); @@ -959,7 +959,7 @@ static void hp100_mmuinit( struct net_device *dev ) { int ioaddr = dev->base_addr; - struct hp100_private *lp = (struct hp100_private *)dev->priv; + struct hp100_private *lp = dev->priv; int i; #ifdef HP100_DEBUG_B @@ -1151,7 +1151,7 @@ static int hp100_open( struct net_device *dev ) { - struct hp100_private *lp = (struct hp100_private *)dev->priv; + struct hp100_private *lp = dev->priv; #ifdef HP100_DEBUG_B int ioaddr=dev->base_addr; #endif @@ -1192,7 +1192,7 @@ static int hp100_close( struct net_device *dev ) { int ioaddr = dev->base_addr; - struct hp100_private *lp = (struct hp100_private *)dev->priv; + struct hp100_private *lp = dev->priv; #ifdef HP100_DEBUG_B hp100_outw( 0x4205, TRACE ); @@ -1224,7 +1224,7 @@ */ static void hp100_init_pdls( struct net_device *dev ) { - struct hp100_private *lp = (struct hp100_private *)dev->priv; + struct hp100_private *lp = dev->priv; hp100_ring_t *ringptr; u_int *pageptr; int i; @@ -1409,7 +1409,7 @@ { int ioaddr=dev->base_addr; - struct hp100_private *lp = (struct hp100_private *)dev->priv; + struct hp100_private *lp = dev->priv; hp100_ring_t *ringptr; #ifdef HP100_DEBUG_B @@ -1456,7 +1456,7 @@ static void hp100_BM_shutdown( struct net_device *dev ) { int ioaddr = dev->base_addr; - struct hp100_private *lp = (struct hp100_private *)dev->priv; + struct hp100_private *lp = dev->priv; unsigned long time; #ifdef HP100_DEBUG_B @@ -1552,7 +1552,7 @@ unsigned long flags; int i, ok_flag; int ioaddr = dev->base_addr; - struct hp100_private *lp = (struct hp100_private *)dev->priv; + struct hp100_private *lp = dev->priv; hp100_ring_t *ringptr; #ifdef HP100_DEBUG_B @@ -1683,7 +1683,7 @@ */ static void hp100_clean_txring( struct net_device *dev ) { - struct hp100_private *lp = (struct hp100_private *)dev->priv; + struct hp100_private *lp = dev->priv; int ioaddr = dev->base_addr; int donecount; @@ -1725,7 +1725,7 @@ int i, ok_flag; int ioaddr = dev->base_addr; u_short val; - struct hp100_private *lp = (struct hp100_private *)dev->priv; + struct hp100_private *lp = dev->priv; #ifdef HP100_DEBUG_B hp100_outw( 0x4212, TRACE ); @@ -1889,7 +1889,7 @@ { int packets, pkt_len; int ioaddr = dev->base_addr; - struct hp100_private *lp = (struct hp100_private *)dev->priv; + struct hp100_private *lp = dev->priv; u_int header; struct sk_buff *skb; @@ -2005,7 +2005,7 @@ static void hp100_rx_bm( struct net_device *dev ) { int ioaddr = dev->base_addr; - struct hp100_private *lp = (struct hp100_private *)dev->priv; + struct hp100_private *lp = dev->priv; hp100_ring_t *ptr; u_int header; int pkt_len; @@ -2130,7 +2130,7 @@ { unsigned long flags; int ioaddr = dev->base_addr; - struct hp100_private *lp = (struct hp100_private *)dev->priv; + struct hp100_private *lp = dev->priv; #ifdef HP100_DEBUG_B hp100_outw( 0x4215, TRACE ); @@ -2148,7 +2148,7 @@ { int ioaddr = dev->base_addr; u_short val; - struct hp100_private *lp = (struct hp100_private *)dev->priv; + struct hp100_private *lp = dev->priv; #ifdef HP100_DEBUG_B hp100_outw( 0x4216, TRACE ); @@ -2171,7 +2171,7 @@ static void hp100_misc_interrupt( struct net_device *dev ) { - struct hp100_private *lp = (struct hp100_private *)dev->priv; + struct hp100_private *lp = dev->priv; #ifdef HP100_DEBUG_B hp100_outw( 0x4216, TRACE ); @@ -2214,7 +2214,7 @@ { unsigned long flags; int ioaddr = dev->base_addr; - struct hp100_private *lp = (struct hp100_private *)dev->priv; + struct hp100_private *lp = dev->priv; #ifdef HP100_DEBUG_B hp100_outw( 0x4218, TRACE ); @@ -2364,8 +2364,8 @@ static void hp100_interrupt( int irq, void *dev_id, struct pt_regs *regs ) { - struct net_device *dev = (struct net_device *)dev_id; - struct hp100_private *lp = (struct hp100_private *)dev->priv; + struct net_device *dev = dev_id; + struct hp100_private *lp = dev->priv; int ioaddr; u_int val; @@ -2508,7 +2508,7 @@ { unsigned long flags; int ioaddr = dev->base_addr; - struct hp100_private *lp = (struct hp100_private *)dev->priv; + struct hp100_private *lp = dev->priv; #ifdef HP100_DEBUG_B hp100_outw( 0x4220, TRACE ); @@ -2574,7 +2574,7 @@ static void hp100_stop_interface( struct net_device *dev ) { - struct hp100_private *lp = (struct hp100_private *)dev->priv; + struct hp100_private *lp = dev->priv; int ioaddr = dev->base_addr; u_int val; @@ -2637,7 +2637,7 @@ { int ioaddr = dev->base_addr; u_short val_VG, val_10; - struct hp100_private *lp = (struct hp100_private *)dev->priv; + struct hp100_private *lp = dev->priv; #ifdef HP100_DEBUG_B hp100_outw( 0x4223, TRACE ); @@ -2677,7 +2677,7 @@ static int hp100_down_vg_link( struct net_device *dev ) { - struct hp100_private *lp = (struct hp100_private *)dev->priv; + struct hp100_private *lp = dev->priv; int ioaddr = dev->base_addr; unsigned long time; long savelan, newlan; @@ -2772,7 +2772,7 @@ static int hp100_login_to_vg_hub( struct net_device *dev, u_short force_relogin ) { int ioaddr = dev->base_addr; - struct hp100_private *lp = (struct hp100_private *)dev->priv; + struct hp100_private *lp = dev->priv; u_short val=0; unsigned long time; int startst; @@ -2945,7 +2945,7 @@ static void hp100_cascade_reset( struct net_device *dev, u_short enable ) { int ioaddr = dev->base_addr; - struct hp100_private *lp = (struct hp100_private *)dev->priv; + struct hp100_private *lp = dev->priv; int i; #ifdef HP100_DEBUG_B @@ -3034,7 +3034,7 @@ static void release_dev(int i) { struct net_device *d = hp100_devlist[i]; - struct hp100_private *p = (struct hp100_private *)d->priv; + struct hp100_private *p = d->priv; unregister_netdev(d); release_region(d->base_addr, HP100_REGION_SIZE); diff -urN --exclude-from=/home/davej/.exclude linux/drivers/net/hplance.c linux-dj/drivers/net/hplance.c --- linux/drivers/net/hplance.c Tue Feb 13 21:15:04 2001 +++ linux-dj/drivers/net/hplance.c Mon Mar 19 09:29:15 2001 @@ -143,7 +143,7 @@ printk("%c%2.2x", i == 0 ? ' ' : ':', dev->dev_addr[i]); } - lp = (struct hplance_private *)dev->priv; + lp = dev->priv; lp->lance.name = (char*)name; /* discards const, shut up gcc */ lp->lance.ll = (struct lance_regs *)(va + HPLANCE_REGOFF); lp->lance.init_block = (struct lance_init_block *)(va + HPLANCE_MEMOFF); /* CPU addr */ @@ -177,7 +177,7 @@ */ static void hplance_writerap(struct hplance_private *lp, unsigned short value) { - struct hplance_reg *hpregs = (struct hplance_reg *)lp->base; + struct hplance_reg *hpregs = lp->base; do { lp->lance.ll->rap = value; } while ((hpregs->status & LE_ACK) == 0); @@ -185,7 +185,7 @@ static void hplance_writerdp(struct hplance_private *lp, unsigned short value) { - struct hplance_reg *hpregs = (struct hplance_reg *)lp->base; + struct hplance_reg *hpregs = lp->base; do { lp->lance.ll->rdp = value; } while ((hpregs->status & LE_ACK) == 0); @@ -194,7 +194,7 @@ static unsigned short hplance_readrdp(struct hplance_private *lp) { unsigned short val; - struct hplance_reg *hpregs = (struct hplance_reg *)lp->base; + struct hplance_reg *hpregs = lp->base; do { val = lp->lance.ll->rdp; } while ((hpregs->status & LE_ACK) == 0); @@ -204,8 +204,8 @@ static int hplance_open(struct net_device *dev) { int status; - struct hplance_private *lp = (struct hplance_private *)dev->priv; - struct hplance_reg *hpregs = (struct hplance_reg *)lp->base; + struct hplance_private *lp = dev->priv; + struct hplance_reg *hpregs = lp->base; status = lance_open(dev); /* call generic lance open code */ if (status) @@ -218,8 +218,8 @@ static int hplance_close(struct net_device *dev) { - struct hplance_private *lp = (struct hplance_private *)dev->priv; - struct hplance_reg *hpregs = (struct hplance_reg *)lp->base; + struct hplance_private *lp = dev->priv; + struct hplance_reg *hpregs = lp->base; writeb(0,&(hpregs->status)); /* disable interrupts at boardlevel */ lance_close(dev); return 0; diff -urN --exclude-from=/home/davej/.exclude linux/drivers/net/hydra.c linux-dj/drivers/net/hydra.c --- linux/drivers/net/hydra.c Tue Feb 13 21:15:04 2001 +++ linux-dj/drivers/net/hydra.c Mon Mar 19 09:29:21 2001 @@ -242,7 +242,7 @@ struct net_device *dev, *next; while ((dev = root_hydra_dev)) { - next = (struct net_device *)(ei_status.priv); + next = ei_status.priv; unregister_netdev(dev); free_irq(IRQ_AMIGA_PORTS, dev); release_mem_region(ZTWO_PADDR(dev->base_addr)-HYDRA_NIC_BASE, 0x10000); diff -urN --exclude-from=/home/davej/.exclude linux/drivers/net/ibmlana.c linux-dj/drivers/net/ibmlana.c --- linux/drivers/net/ibmlana.c Tue Feb 13 21:15:05 2001 +++ linux-dj/drivers/net/ibmlana.c Mon Mar 19 09:29:20 2001 @@ -228,7 +228,7 @@ static void InitDscrs(struct IBMLANA_NETDEV *dev) { - ibmlana_priv *priv = (ibmlana_priv *) dev->priv; + ibmlana_priv *priv = dev->priv; u32 addr, baddr, raddr; int z; tda_t tda; @@ -312,7 +312,7 @@ static int InitSONIC(struct IBMLANA_NETDEV *dev) { - ibmlana_priv *priv = (ibmlana_priv *) dev->priv; + ibmlana_priv *priv = dev->priv; /* set up start & end of resource area */ @@ -533,7 +533,7 @@ static void StartTx(struct IBMLANA_NETDEV *dev, int descr) { - ibmlana_priv *priv = (ibmlana_priv *) dev->priv; + ibmlana_priv *priv = dev->priv; int addr; addr = priv->tdastart + (descr * sizeof(tda_t)); @@ -556,7 +556,7 @@ static void irqrbe_handler(struct IBMLANA_NETDEV *dev) { - ibmlana_priv *priv = (ibmlana_priv *) dev->priv; + ibmlana_priv *priv = dev->priv; /* point the SONIC back to the RRA start */ @@ -568,7 +568,7 @@ static void irqrx_handler(struct IBMLANA_NETDEV *dev) { - ibmlana_priv *priv = (ibmlana_priv *) dev->priv; + ibmlana_priv *priv = dev->priv; rda_t rda; u32 rdaaddr, lrdaaddr; @@ -670,7 +670,7 @@ static void irqtx_handler(struct IBMLANA_NETDEV *dev) { - ibmlana_priv *priv = (ibmlana_priv *) dev->priv; + ibmlana_priv *priv = dev->priv; tda_t tda; /* fetch descriptor (we forgot the size ;-) */ @@ -708,7 +708,7 @@ static void irqtxerr_handler(struct IBMLANA_NETDEV *dev) { - ibmlana_priv *priv = (ibmlana_priv *) dev->priv; + ibmlana_priv *priv = dev->priv; tda_t tda; /* fetch descriptor to check status */ @@ -753,7 +753,7 @@ static void irq_handler(int irq, void *device, struct pt_regs *regs) { - struct IBMLANA_NETDEV *dev = (struct IBMLANA_NETDEV *) device; + struct IBMLANA_NETDEV *dev = device; u16 ival; /* in case we're not meant... */ @@ -815,7 +815,7 @@ static int ibmlana_getinfo(char *buf, int slot, void *d) { int len = 0, i; - struct IBMLANA_NETDEV *dev = (struct IBMLANA_NETDEV *) d; + struct IBMLANA_NETDEV *dev = d; ibmlana_priv *priv; /* can't say anything about an uninitialized device... */ @@ -824,7 +824,7 @@ return len; if (dev->priv == NULL) return len; - priv = (ibmlana_priv *) dev->priv; + priv = dev->priv; /* print info */ @@ -850,7 +850,7 @@ static int ibmlana_open(struct IBMLANA_NETDEV *dev) { int result; - ibmlana_priv *priv = (ibmlana_priv *) dev->priv; + ibmlana_priv *priv = dev->priv; /* register resources - only necessary for IRQ */ @@ -904,7 +904,7 @@ static int ibmlana_tx(struct sk_buff *skb, struct IBMLANA_NETDEV *dev) { - ibmlana_priv *priv = (ibmlana_priv *) dev->priv; + ibmlana_priv *priv = dev->priv; int retval = 0, tmplen, addr; unsigned long flags; tda_t tda; @@ -999,7 +999,7 @@ static struct net_device_stats *ibmlana_stats(struct IBMLANA_NETDEV *dev) { - ibmlana_priv *priv = (ibmlana_priv *) dev->priv; + ibmlana_priv *priv = dev->priv; return &(priv->stat); } @@ -1125,8 +1125,7 @@ /* allocate structure */ - priv = dev->priv = - (ibmlana_priv *) kmalloc(sizeof(ibmlana_priv), GFP_KERNEL); + priv = dev->priv = kmalloc(sizeof(ibmlana_priv), GFP_KERNEL); if (!priv) { release_region(iobase, IBM_LANA_IORANGE); return -ENOMEM; @@ -1229,7 +1228,7 @@ for (z = 0; z < DEVMAX; z++) { dev = moddevs + z; if (dev->priv != NULL) { - priv = (ibmlana_priv *) dev->priv; + priv = dev->priv; /*DeinitBoard(dev); */ if (dev->irq != 0) free_irq(dev->irq, dev); diff -urN --exclude-from=/home/davej/.exclude linux/drivers/net/ioc3-eth.c linux-dj/drivers/net/ioc3-eth.c --- linux/drivers/net/ioc3-eth.c Mon Mar 19 09:16:24 2001 +++ linux-dj/drivers/net/ioc3-eth.c Mon Mar 19 23:09:46 2001 @@ -402,7 +402,7 @@ static struct net_device_stats *ioc3_get_stats(struct net_device *dev) { - struct ioc3_private *ip = (struct ioc3_private *) dev->priv; + struct ioc3_private *ip = dev->priv; struct ioc3 *ioc3 = ip->regs; ip->stats.collisions += (ioc3->etcdc & ETCDC_COLLCNT_MASK); @@ -566,7 +566,7 @@ after the Tx thread. */ static void ioc3_interrupt(int irq, void *_dev, struct pt_regs *regs) { - struct net_device *dev = (struct net_device *)_dev; + struct net_device *dev = _dev; struct ioc3_private *ip = dev->priv; struct ioc3 *ioc3 = ip->regs; const u32 enabled = EISR_RXTIMERINT | EISR_RXOFLO | EISR_RXBUFOFLO | @@ -595,7 +595,7 @@ static void negotiate(unsigned long data) { struct net_device *dev = (struct net_device *) data; - struct ioc3_private *ip = (struct ioc3_private *) dev->priv; + struct ioc3_private *ip = dev->priv; struct ioc3 *ioc3 = ip->regs; mod_timer(&ip->negtimer, jiffies + 20 * HZ); @@ -864,7 +864,7 @@ return -EAGAIN; } - ip = (struct ioc3_private *) dev->priv; + ip = dev->priv; ip->ehar_h = 0; ip->ehar_l = 0; @@ -1131,7 +1131,7 @@ /* Provide ioctl() calls to examine the MII xcvr state. */ static int ioc3_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) { - struct ioc3_private *ip = (struct ioc3_private *) dev->priv; + struct ioc3_private *ip = dev->priv; u16 *data = (u16 *)&rq->ifr_data; struct ioc3 *ioc3 = ip->regs; int phy = ip->phy; diff -urN --exclude-from=/home/davej/.exclude linux/drivers/net/irda/irport.c linux-dj/drivers/net/irda/irport.c --- linux/drivers/net/irda/irport.c Mon Mar 19 09:16:24 2001 +++ linux-dj/drivers/net/irda/irport.c Mon Mar 19 23:10:07 2001 @@ -700,7 +700,7 @@ */ void irport_interrupt(int irq, void *dev_id, struct pt_regs *regs) { - struct net_device *dev = (struct net_device *) dev_id; + struct net_device *dev = dev_id; struct irport_cb *self; int boguscount = 0; int iobase; diff -urN --exclude-from=/home/davej/.exclude linux/drivers/net/irda/nsc-ircc.c linux-dj/drivers/net/irda/nsc-ircc.c --- linux/drivers/net/irda/nsc-ircc.c Mon Mar 19 09:16:24 2001 +++ linux-dj/drivers/net/irda/nsc-ircc.c Mon Mar 19 23:10:27 2001 @@ -1735,7 +1735,7 @@ */ static void nsc_ircc_interrupt(int irq, void *dev_id, struct pt_regs *regs) { - struct net_device *dev = (struct net_device *) dev_id; + struct net_device *dev = dev_id; struct nsc_ircc_cb *self; __u8 bsr, eir; int iobase; diff -urN --exclude-from=/home/davej/.exclude linux/drivers/net/irda/smc-ircc.c linux-dj/drivers/net/irda/smc-ircc.c --- linux/drivers/net/irda/smc-ircc.c Mon Mar 19 09:16:24 2001 +++ linux-dj/drivers/net/irda/smc-ircc.c Mon Mar 19 23:10:42 2001 @@ -857,7 +857,7 @@ */ static void ircc_interrupt(int irq, void *dev_id, struct pt_regs *regs) { - struct net_device *dev = (struct net_device *) dev_id; + struct net_device *dev = dev_id; struct irport_cb *irport; struct ircc_cb *self; int iobase, iir; diff -urN --exclude-from=/home/davej/.exclude linux/drivers/net/irda/w83977af_ir.c linux-dj/drivers/net/irda/w83977af_ir.c --- linux/drivers/net/irda/w83977af_ir.c Mon Mar 19 09:16:24 2001 +++ linux-dj/drivers/net/irda/w83977af_ir.c Mon Mar 19 23:10:55 2001 @@ -1114,7 +1114,7 @@ */ static void w83977af_interrupt(int irq, void *dev_id, struct pt_regs *regs) { - struct net_device *dev = (struct net_device *) dev_id; + struct net_device *dev = dev_id; struct w83977af_ir *self; __u8 set, icr, isr; int iobase; diff -urN --exclude-from=/home/davej/.exclude linux/drivers/net/isa-skeleton.c linux-dj/drivers/net/isa-skeleton.c --- linux/drivers/net/isa-skeleton.c Tue Feb 13 21:15:05 2001 +++ linux-dj/drivers/net/isa-skeleton.c Mon Mar 19 09:29:20 2001 @@ -276,7 +276,7 @@ memset(dev->priv, 0, sizeof(struct net_local)); - np = (struct net_local *)dev->priv; + np = dev->priv; spin_lock_init(&np->lock); /* Grab the region so that no one else tries to probe our ioports. */ @@ -299,7 +299,7 @@ static void net_tx_timeout(struct net_device *dev) { - struct net_local *np = (struct net_local *)dev->priv; + struct net_local *np = dev->priv; printk(KERN_WARNING "%s: transmit timed out, %s?\n", dev->name, tx_done(dev) ? "IRQ conflict" : "network cable problem"); @@ -334,7 +334,7 @@ static int net_open(struct net_device *dev) { - struct net_local *np = (struct net_local *)dev->priv; + struct net_local *np = dev->priv; int ioaddr = dev->base_addr; /* * This is used if the interrupt line can turned off (shared). @@ -372,7 +372,7 @@ */ static int net_send_packet(struct sk_buff *skb, struct net_device *dev) { - struct net_local *np = (struct net_local *)dev->priv; + struct net_local *np = dev->priv; int ioaddr = dev->base_addr; short length = ETH_ZLEN < skb->len ? skb->len : ETH_ZLEN; unsigned char *buf = skb->data; @@ -438,7 +438,7 @@ */ void net_tx(struct net_device *dev) { - struct net_local *np = (struct net_local *)dev->priv; + struct net_local *np = dev->priv; int entry; /* This protects us from concurrent execution of @@ -480,7 +480,7 @@ ioaddr = dev->base_addr; - np = (struct net_local *)dev->priv; + np = dev->priv; status = inw(ioaddr + 0); if (status & RX_INTR) { @@ -505,7 +505,7 @@ static void net_rx(struct net_device *dev) { - struct net_local *lp = (struct net_local *)dev->priv; + struct net_local *lp = dev->priv; int ioaddr = dev->base_addr; int boguscount = 10; @@ -557,7 +557,7 @@ static int net_close(struct net_device *dev) { - struct net_local *lp = (struct net_local *)dev->priv; + struct net_local *lp = dev->priv; int ioaddr = dev->base_addr; lp->open_time = 0; @@ -586,7 +586,7 @@ */ static struct net_device_stats *net_get_stats(struct net_device *dev) { - struct net_local *lp = (struct net_local *)dev->priv; + struct net_local *lp = dev->priv; short ioaddr = dev->base_addr; /* Update the statistics from the device registers. */ diff -urN --exclude-from=/home/davej/.exclude linux/drivers/net/jazzsonic.c linux-dj/drivers/net/jazzsonic.c --- linux/drivers/net/jazzsonic.c Mon Mar 19 09:16:24 2001 +++ linux-dj/drivers/net/jazzsonic.c Mon Mar 19 09:29:21 2001 @@ -186,7 +186,7 @@ lp = NULL; i = 0; do { - lp = (struct sonic_local *)kmalloc(sizeof(*lp), GFP_KERNEL); + lp = kmalloc(sizeof(*lp), GFP_KERNEL); if ((unsigned long)lp >> 16 != ((unsigned long)lp + sizeof(*lp) ) >> 16) { /* FIXME, free the memory later */ kfree (lp); @@ -230,10 +230,10 @@ /* now convert pointer to KSEG1 pointer */ lp->rba = (char *)KSEG1ADDR(lp->rba); flush_cache_all(); - dev->priv = (struct sonic_local *)KSEG1ADDR(lp); + dev->priv = KSEG1ADDR(lp); } - lp = (struct sonic_local *)dev->priv; + lp = dev->priv; dev->open = sonic_open; dev->stop = sonic_close; dev->hard_start_xmit = sonic_send_packet; diff -urN --exclude-from=/home/davej/.exclude linux/drivers/net/lance.c linux-dj/drivers/net/lance.c --- linux/drivers/net/lance.c Mon Mar 19 09:16:24 2001 +++ linux-dj/drivers/net/lance.c Mon Mar 19 09:29:12 2001 @@ -828,7 +828,7 @@ static void lance_tx_timeout (struct net_device *dev) { - struct lance_private *lp = (struct lance_private *) dev->priv; + struct lance_private *lp = dev->priv; int ioaddr = dev->base_addr; outw (0, ioaddr + LANCE_ADDR); diff -urN --exclude-from=/home/davej/.exclude linux/drivers/net/lasi_82596.c linux-dj/drivers/net/lasi_82596.c --- linux/drivers/net/lasi_82596.c Mon Mar 19 09:16:24 2001 +++ linux-dj/drivers/net/lasi_82596.c Mon Mar 19 09:29:11 2001 @@ -417,7 +417,7 @@ static inline void MPU_PORT(struct net_device *dev, int c, volatile void *x) { - struct i596_private *lp = (struct i596_private *) dev->priv; + struct i596_private *lp = dev->priv; u32 v = (u32) (c) | (u32) (x); @@ -466,7 +466,7 @@ static void i596_display_data(struct net_device *dev) { - struct i596_private *lp = (struct i596_private *) dev->priv; + struct i596_private *lp = dev->priv; struct i596_cmd *cmd; struct i596_rfd *rfd; struct i596_rbd *rbd; @@ -526,7 +526,7 @@ static inline void init_rx_bufs(struct net_device *dev) { - struct i596_private *lp = (struct i596_private *)dev->priv; + struct i596_private *lp = dev->priv; int i; struct i596_rfd *rfd; struct i596_rbd *rbd; @@ -580,7 +580,7 @@ static inline void remove_rx_bufs(struct net_device *dev) { - struct i596_private *lp = (struct i596_private *)dev->priv; + struct i596_private *lp = dev->priv; struct i596_rbd *rbd; int i; @@ -595,7 +595,7 @@ static void rebuild_rx_bufs(struct net_device *dev) { - struct i596_private *lp = (struct i596_private *) dev->priv; + struct i596_private *lp = dev->priv; int i; /* Ensure rx frame/buffer descriptors are tidy */ @@ -616,7 +616,7 @@ static int init_i596_mem(struct net_device *dev) { - struct i596_private *lp = (struct i596_private *) dev->priv; + struct i596_private *lp = dev->priv; unsigned long flags; disable_irq(dev->irq); /* disable IRQs from LAN */ @@ -709,7 +709,7 @@ static inline int i596_rx(struct net_device *dev) { - struct i596_private *lp = (struct i596_private *)dev->priv; + struct i596_private *lp = dev->priv; struct i596_rfd *rfd; struct i596_rbd *rbd; int frames = 0; @@ -919,7 +919,7 @@ static void i596_add_cmd(struct net_device *dev, struct i596_cmd *cmd) { - struct i596_private *lp = (struct i596_private *) dev->priv; + struct i596_private *lp = dev->priv; int ioaddr = dev->base_addr; unsigned long flags; @@ -967,7 +967,7 @@ device list */ static int i596_test(struct net_device *dev) { - struct i596_private *lp = (struct i596_private *) dev->priv; + struct i596_private *lp = dev->priv; volatile int *tint; u32 data; @@ -1020,7 +1020,7 @@ static void i596_tx_timeout (struct net_device *dev) { - struct i596_private *lp = (struct i596_private *) dev->priv; + struct i596_private *lp = dev->priv; int ioaddr = dev->base_addr; /* Transmitter timeout, serious problems. */ @@ -1050,7 +1050,7 @@ static int i596_start_xmit(struct sk_buff *skb, struct net_device *dev) { - struct i596_private *lp = (struct i596_private *) dev->priv; + struct i596_private *lp = dev->priv; struct tx_cmd *tx_cmd; struct i596_tbd *tbd; short length = ETH_ZLEN < skb->len ? skb->len : ETH_ZLEN; @@ -1204,7 +1204,7 @@ dev->priv = (void *)(dev->mem_start); - lp = (struct i596_private *) dev->priv; + lp = dev->priv; DEB(DEB_INIT,printk ("%s: lp at 0x%08lx (%d bytes), lp->scb at 0x%08lx\n", dev->name, (unsigned long)lp, sizeof(struct i596_private), (unsigned long)&lp->scb)); @@ -1249,7 +1249,7 @@ return; } - lp = (struct i596_private *) dev->priv; + lp = dev->priv; spin_lock (&lp->lock); @@ -1394,7 +1394,7 @@ static int i596_close(struct net_device *dev) { - struct i596_private *lp = (struct i596_private *) dev->priv; + struct i596_private *lp = dev->priv; unsigned long flags; netif_stop_queue(dev); @@ -1429,7 +1429,7 @@ static struct net_device_stats * i596_get_stats(struct net_device *dev) { - struct i596_private *lp = (struct i596_private *) dev->priv; + struct i596_private *lp = dev->priv; return &lp->stats; } @@ -1440,7 +1440,7 @@ static void set_multicast_list(struct net_device *dev) { - struct i596_private *lp = (struct i596_private *) dev->priv; + struct i596_private *lp = dev->priv; int config = 0, cnt; DEB(DEB_MULTI,printk("%s: set multicast list, %d entries, promisc %s, allmulti %s\n", dev->name, dev->mc_count, dev->flags & IFF_PROMISC ? "ON" : "OFF", dev->flags & IFF_ALLMULTI ? "ON" : "OFF")); @@ -1533,7 +1533,7 @@ void cleanup_module(void) { unregister_netdev(&dev_82596); - lp = (struct i596_private *) dev_82596.priv; + lp = dev_82596.priv; if (dma_consistent) pci_free_consistent( NULL, sizeof( struct i596_private), diff -urN --exclude-from=/home/davej/.exclude linux/drivers/net/loopback.c linux-dj/drivers/net/loopback.c --- linux/drivers/net/loopback.c Mon Mar 19 09:16:24 2001 +++ linux-dj/drivers/net/loopback.c Mon Mar 19 09:29:19 2001 @@ -60,7 +60,7 @@ */ static int loopback_xmit(struct sk_buff *skb, struct net_device *dev) { - struct net_device_stats *stats = (struct net_device_stats *)dev->priv; + struct net_device_stats *stats = dev->priv; /* * Optimise so buffers with skb->free=1 are not copied but @@ -99,7 +99,7 @@ static struct net_device_stats *get_stats(struct net_device *dev) { - return (struct net_device_stats *)dev->priv; + return dev->priv; } /* Initialize the rest of the LOOPBACK device. */ diff -urN --exclude-from=/home/davej/.exclude linux/drivers/net/mac89x0.c linux-dj/drivers/net/mac89x0.c --- linux/drivers/net/mac89x0.c Mon Mar 19 09:16:24 2001 +++ linux-dj/drivers/net/mac89x0.c Mon Mar 19 09:29:14 2001 @@ -222,7 +222,7 @@ return -ENOMEM; memset(dev->priv, 0, sizeof(struct net_local)); } - lp = (struct net_local *)dev->priv; + lp = dev->priv; /* Fill in the 'dev' fields. */ dev->base_addr = ioaddr; @@ -322,7 +322,7 @@ static int net_open(struct net_device *dev) { - struct net_local *lp = (struct net_local *)dev->priv; + struct net_local *lp = dev->priv; int i; /* Disable the interrupt for now */ @@ -386,7 +386,7 @@ if (test_and_set_bit(0, (void*)&dev->tbusy) != 0) printk("%s: Transmitter access conflict.\n", dev->name); else { - struct net_local *lp = (struct net_local *)dev->priv; + struct net_local *lp = dev->priv; unsigned long flags; if (net_debug > 3) @@ -441,7 +441,7 @@ dev->interrupt = 1; ioaddr = dev->base_addr; - lp = (struct net_local *)dev->priv; + lp = dev->priv; /* we MUST read all the events out of the ISQ, otherwise we'll never get interrupted again. As a consequence, we can't have any limit @@ -500,7 +500,7 @@ static void net_rx(struct net_device *dev) { - struct net_local *lp = (struct net_local *)dev->priv; + struct net_local *lp = dev->priv; struct sk_buff *skb; int status, length; @@ -566,7 +566,7 @@ static struct net_device_stats * net_get_stats(struct net_device *dev) { - struct net_local *lp = (struct net_local *)dev->priv; + struct net_local *lp = dev->priv; unsigned long flags; save_flags(flags); @@ -581,7 +581,7 @@ static void set_multicast_list(struct net_device *dev) { - struct net_local *lp = (struct net_local *)dev->priv; + struct net_local *lp = dev->priv; if(dev->flags&IFF_PROMISC) { diff -urN --exclude-from=/home/davej/.exclude linux/drivers/net/mace.c linux-dj/drivers/net/mace.c --- linux/drivers/net/mace.c Mon Mar 19 09:16:24 2001 +++ linux-dj/drivers/net/mace.c Mon Mar 19 09:29:18 2001 @@ -160,7 +160,7 @@ printk(", chip revision %d.%d\n", in_8(&mp->mace->chipid_hi), in_8(&mp->mace->chipid_lo)); - mp = (struct mace_data *) dev->priv; + mp = dev->priv; mp->maccc = ENXMT | ENRCV; mp->tx_dma = (volatile struct dbdma_regs *) ioremap(mace->addrs[1].address, 0x1000); @@ -219,8 +219,7 @@ static void mace_reset(struct net_device *dev) { - struct mace_data *mp = (struct mace_data *) dev->priv; - volatile struct mace *mb = mp->mace; + volatile struct mace *mb = (dev->priv)->mace; int i; /* soft-reset the chip */ @@ -266,7 +265,7 @@ static void __mace_set_address(struct net_device *dev, void *addr) { - volatile struct mace *mb = ((struct mace_data *) dev->priv)->mace; + volatile struct mace *mb = (dev->priv)->mace; unsigned char *p = addr; int i; @@ -280,7 +279,7 @@ static int mace_set_address(struct net_device *dev, void *addr) { - struct mace_data *mp = (struct mace_data *) dev->priv; + struct mace_data *mp = dev->priv; volatile struct mace *mb = mp->mace; unsigned long flags; @@ -298,7 +297,7 @@ static int mace_open(struct net_device *dev) { - struct mace_data *mp = (struct mace_data *) dev->priv; + struct mace_data *mp = dev->priv; volatile struct mace *mb = mp->mace; volatile struct dbdma_regs *rd = mp->rx_dma; volatile struct dbdma_regs *td = mp->tx_dma; @@ -386,7 +385,7 @@ static int mace_close(struct net_device *dev) { - struct mace_data *mp = (struct mace_data *) dev->priv; + struct mace_data *mp = dev->priv; volatile struct mace *mb = mp->mace; volatile struct dbdma_regs *rd = mp->rx_dma; volatile struct dbdma_regs *td = mp->tx_dma; @@ -406,7 +405,7 @@ static inline void mace_set_timeout(struct net_device *dev) { - struct mace_data *mp = (struct mace_data *) dev->priv; + struct mace_data *mp = dev->priv; unsigned long flags; save_flags(flags); @@ -423,7 +422,7 @@ static int mace_xmit_start(struct sk_buff *skb, struct net_device *dev) { - struct mace_data *mp = (struct mace_data *) dev->priv; + struct mace_data *mp = dev->priv; volatile struct dbdma_regs *td = mp->tx_dma; volatile struct dbdma_cmd *cp, *np; unsigned long flags; @@ -479,7 +478,7 @@ static struct net_device_stats *mace_stats(struct net_device *dev) { - struct mace_data *p = (struct mace_data *) dev->priv; + struct mace_data *p = dev->priv; return &p->stats; } @@ -491,7 +490,7 @@ static void mace_set_multicast(struct net_device *dev) { - struct mace_data *mp = (struct mace_data *) dev->priv; + struct mace_data *mp = dev->priv; volatile struct mace *mb = mp->mace; int i, j, k, b; unsigned long crc; @@ -567,8 +566,8 @@ static void mace_interrupt(int irq, void *dev_id, struct pt_regs *regs) { - struct net_device *dev = (struct net_device *) dev_id; - struct mace_data *mp = (struct mace_data *) dev->priv; + struct net_device *dev = dev_id; + struct mace_data *mp = dev->priv; volatile struct mace *mb = mp->mace; volatile struct dbdma_regs *td = mp->tx_dma; volatile struct dbdma_cmd *cp; @@ -710,7 +709,7 @@ static void mace_tx_timeout(unsigned long data) { struct net_device *dev = (struct net_device *) data; - struct mace_data *mp = (struct mace_data *) dev->priv; + struct mace_data *mp = dev->priv; volatile struct mace *mb = mp->mace; volatile struct dbdma_regs *td = mp->tx_dma; volatile struct dbdma_regs *rd = mp->rx_dma; @@ -780,8 +779,8 @@ static void mace_rxdma_intr(int irq, void *dev_id, struct pt_regs *regs) { - struct net_device *dev = (struct net_device *) dev_id; - struct mace_data *mp = (struct mace_data *) dev->priv; + struct net_device *dev = dev_id; + struct mace_data *mp = dev->priv; volatile struct dbdma_regs *rd = mp->rx_dma; volatile struct dbdma_cmd *cp, *np; int i, nb, stat, next; @@ -896,7 +895,7 @@ struct mace_data *mp; while ((dev = mace_devs) != 0) { - mp = (struct mace_data *) mace_devs->priv; + mp = mace_devs->priv; mace_devs = mp->next_mace; free_irq(dev->irq, dev); diff -urN --exclude-from=/home/davej/.exclude linux/drivers/net/macmace.c linux-dj/drivers/net/macmace.c --- linux/drivers/net/macmace.c Mon Mar 19 09:16:24 2001 +++ linux-dj/drivers/net/macmace.c Mon Mar 19 23:11:11 2001 @@ -116,7 +116,7 @@ static void mace68k_rxdma_reset(struct net_device *dev) { - struct mace68k_data *mp = (struct mace68k_data *) dev->priv; + struct mace68k_data *mp = dev->priv; volatile struct mace *mace = mp->mace; u8 mcc = mace->maccc; @@ -153,8 +153,7 @@ static void mace68k_txdma_reset(struct net_device *dev) { - struct mace68k_data *mp = (struct mace68k_data *) dev->priv; - volatile struct mace *mace = mp->mace; + volatile struct mace *mace = (dev->priv)->mace; u8 mcc = mace->maccc; psc_write_word(PSC_ENETWR_CTL,0x8800); @@ -224,7 +223,7 @@ printk("no free memory.\n"); return -ENOMEM; } - mp = (struct mace68k_data *) dev->priv; + mp = dev->priv; dev->base_addr = (u32)MACE_BASE; mp->mace = (volatile struct mace *) MACE_BASE; @@ -304,7 +303,7 @@ ether_setup(dev); - mp = (struct mace68k_data *) dev->priv; + mp = dev->priv; mp->maccc = ENXMT | ENRCV; mp->dma_intr = IRQ_MAC_MACE_DMA; @@ -328,8 +327,7 @@ static void mace68k_reset(struct net_device *dev) { - struct mace68k_data *mp = (struct mace68k_data *) dev->priv; - volatile struct mace *mb = mp->mace; + volatile struct mace *mb = (dev->priv)->mace; int i; /* soft-reset the chip */ @@ -382,7 +380,7 @@ static int mace68k_set_address(struct net_device *dev, void *addr) { unsigned char *p = addr; - struct mace68k_data *mp = (struct mace68k_data *) dev->priv; + struct mace68k_data *mp = dev->priv; volatile struct mace *mb = mp->mace; int i; unsigned long flags; @@ -409,7 +407,7 @@ static int mace68k_open(struct net_device *dev) { - struct mace68k_data *mp = (struct mace68k_data *) dev->priv; + struct mace68k_data *mp = dev->priv; volatile struct mace *mb = mp->mace; /* reset the chip */ @@ -458,8 +456,7 @@ static int mace68k_close(struct net_device *dev) { - struct mace68k_data *mp = (struct mace68k_data *) dev->priv; - volatile struct mace *mb = mp->mace; + volatile struct mace *mb = (dev->priv)->mace; /* disable rx and tx */ mb->maccc = 0; @@ -476,7 +473,7 @@ static inline void mace68k_set_timeout(struct net_device *dev) { - struct mace68k_data *mp = (struct mace68k_data *) dev->priv; + struct mace68k_data *mp = dev->priv; unsigned long flags; save_flags(flags); @@ -497,7 +494,7 @@ static int mace68k_xmit_start(struct sk_buff *skb, struct net_device *dev) { - struct mace68k_data *mp = (struct mace68k_data *) dev->priv; + struct mace68k_data *mp = dev->priv; /* * This may need atomic types ??? */ @@ -535,7 +532,7 @@ static struct net_device_stats *mace68k_stats(struct net_device *dev) { - struct mace68k_data *p = (struct mace68k_data *) dev->priv; + struct mace68k_data *p = dev->priv; return &p->stats; } @@ -546,7 +543,7 @@ static void mace68k_set_multicast(struct net_device *dev) { - struct mace68k_data *mp = (struct mace68k_data *) dev->priv; + struct mace68k_data *mp = dev->priv; volatile struct mace *mb = mp->mace; int i, j, k, b; unsigned long crc; @@ -638,7 +635,7 @@ static void mace68k_xmit_error(struct net_device *dev) { - struct mace68k_data *mp = (struct mace68k_data *) dev->priv; + struct mace68k_data *mp = dev->priv; volatile struct mace *mb = mp->mace; u8 xmtfs, xmtrc; @@ -666,7 +663,7 @@ static void mace68k_recv_interrupt(struct net_device *dev) { -// struct mace68k_data *mp = (struct mace68k_data *) dev->priv; +// struct mace68k_data *mp = dev->priv; // volatile struct mace *mb = mp->mace; } @@ -676,8 +673,8 @@ static void mace68k_interrupt(int irq, void *dev_id, struct pt_regs *regs) { - struct net_device *dev = (struct net_device *) dev_id; - struct mace68k_data *mp = (struct mace68k_data *) dev->priv; + struct net_device *dev = dev_id; + struct mace68k_data *mp = dev->priv; volatile struct mace *mb = mp->mace; u8 ir; @@ -693,7 +690,7 @@ static void mace68k_tx_timeout(unsigned long data) { // struct net_device *dev = (struct net_device *) data; -// struct mace68k_data *mp = (struct mace68k_data *) dev->priv; +// struct mace68k_data *mp = dev->priv; // volatile struct mace *mb = mp->mace; } @@ -703,7 +700,7 @@ static void mace_dma_rx_frame(struct net_device *dev, struct mace_frame *mf) { - struct mace68k_data *mp = (struct mace68k_data *) dev->priv; + struct mace68k_data *mp = dev->priv; struct sk_buff *skb; if(mf->status&RS_OFLO) @@ -744,8 +741,8 @@ static void mace68k_dma_intr(int irq, void *dev_id, struct pt_regs *regs) { - struct net_device *dev = (struct net_device *) dev_id; - struct mace68k_data *mp = (struct mace68k_data *) dev->priv; + struct net_device *dev = dev_id; + struct mace68k_data *mp = dev->priv; #if 0 u32 psc_status; diff -urN --exclude-from=/home/davej/.exclude linux/drivers/net/macsonic.c linux-dj/drivers/net/macsonic.c --- linux/drivers/net/macsonic.c Mon Mar 19 09:16:24 2001 +++ linux-dj/drivers/net/macsonic.c Mon Mar 19 09:29:15 2001 @@ -126,7 +126,7 @@ int __init macsonic_init(struct net_device* dev) { - struct sonic_local* lp = (struct sonic_local *)dev->priv; + struct sonic_local* lp = dev->priv; int i; /* Allocate the entire chunk of memory for the descriptors. @@ -165,7 +165,7 @@ /* FIXME, maybe we should use skbs */ if ((lp->rba = (char *) - kmalloc(SONIC_NUM_RRS * SONIC_RBSIZE, GFP_DMA)) == NULL) { + kmalloc(SONIC_NUM_RRS * SONIC_RBSIZE, GFP_KERNEL | GFP_DMA)) == NULL) { printk(KERN_ERR "%s: couldn't allocate receive buffers\n", dev->name); kfree(lp->sonic_desc); lp->sonic_desc = NULL; @@ -333,7 +333,7 @@ if (dev == NULL) return -ENOMEM; - lp = (struct sonic_local*) dev->priv; + lp = dev->priv; memset(lp, 0, sizeof(struct sonic_local)); /* Danger! My arms are flailing wildly! You *must* set this before using sonic_read() */ @@ -529,7 +529,7 @@ if (dev == NULL) return -ENOMEM; - lp = (struct sonic_local*) dev->priv; + lp = dev->priv; memset(lp, 0, sizeof(struct sonic_local)); /* Danger! My arms are flailing wildly! You *must* set this before using sonic_read() */ diff -urN --exclude-from=/home/davej/.exclude linux/drivers/net/mvme147.c linux-dj/drivers/net/mvme147.c --- linux/drivers/net/mvme147.c Tue Feb 13 21:15:04 2001 +++ linux-dj/drivers/net/mvme147.c Mon Mar 19 09:29:21 2001 @@ -118,7 +118,7 @@ dev->dev_addr[3], dev->dev_addr[4], dev->dev_addr[5]); - lp = (struct m147lance_private *)dev->priv; + lp = dev->priv; lp->ram = (void *)__get_dma_pages(GFP_ATOMIC, 3); /* 16K */ if (!lp->ram) { diff -urN --exclude-from=/home/davej/.exclude linux/drivers/net/myri_sbus.c linux-dj/drivers/net/myri_sbus.c --- linux/drivers/net/myri_sbus.c Tue Feb 13 21:15:05 2001 +++ linux-dj/drivers/net/myri_sbus.c Mon Mar 19 23:12:54 2001 @@ -542,8 +542,8 @@ static void myri_interrupt(int irq, void *dev_id, struct pt_regs *regs) { - struct net_device *dev = (struct net_device *) dev_id; - struct myri_eth *mp = (struct myri_eth *) dev->priv; + struct net_device *dev = dev_id; + struct myri_eth *mp = dev->priv; unsigned long lregs = mp->lregs; struct myri_channel *chan = &mp->shmem->channel; u32 status; @@ -573,14 +573,14 @@ static int myri_open(struct net_device *dev) { - struct myri_eth *mp = (struct myri_eth *) dev->priv; + struct myri_eth *mp = dev->priv; return myri_init(mp, in_interrupt()); } static int myri_close(struct net_device *dev) { - struct myri_eth *mp = (struct myri_eth *) dev->priv; + struct myri_eth *mp = dev->priv; myri_clean_rings(mp); return 0; @@ -588,7 +588,7 @@ static void myri_tx_timeout(struct net_device *dev) { - struct myri_eth *mp = (struct myri_eth *) dev->priv; + struct myri_eth *mp = dev->priv; printk(KERN_ERR "%s: transmit timed out, resetting\n", dev->name); @@ -599,7 +599,7 @@ static int myri_start_xmit(struct sk_buff *skb, struct net_device *dev) { - struct myri_eth *mp = (struct myri_eth *) dev->priv; + struct myri_eth *mp = dev->priv; struct sendq *sq = mp->sq; struct myri_txd *txd; unsigned long flags; @@ -902,7 +902,7 @@ printk("%s: MyriCOM MyriNET Ethernet ", dev->name); - mp = (struct myri_eth *) dev->priv; + mp = dev->priv; mp->myri_sdev = sdev; /* Clean out skb arrays. */ diff -urN --exclude-from=/home/davej/.exclude linux/drivers/net/natsemi.c linux-dj/drivers/net/natsemi.c --- linux/drivers/net/natsemi.c Mon Mar 19 09:16:24 2001 +++ linux-dj/drivers/net/natsemi.c Mon Mar 19 09:29:12 2001 @@ -557,7 +557,7 @@ static int netdev_open(struct net_device *dev) { - struct netdev_private *np = (struct netdev_private *)dev->priv; + struct netdev_private *np = dev->priv; long ioaddr = dev->base_addr; int i; @@ -635,7 +635,7 @@ static void check_duplex(struct net_device *dev) { - struct netdev_private *np = (struct netdev_private *)dev->priv; + struct netdev_private *np = dev->priv; long ioaddr = dev->base_addr; int duplex; @@ -663,7 +663,7 @@ static void netdev_timer(unsigned long data) { struct net_device *dev = (struct net_device *)data; - struct netdev_private *np = (struct netdev_private *)dev->priv; + struct netdev_private *np = dev->priv; long ioaddr = dev->base_addr; int next_tick = 60*HZ; @@ -677,7 +677,7 @@ static void tx_timeout(struct net_device *dev) { - struct netdev_private *np = (struct netdev_private *)dev->priv; + struct netdev_private *np = dev->priv; long ioaddr = dev->base_addr; printk(KERN_WARNING "%s: Transmit timed out, status %8.8x," @@ -711,7 +711,7 @@ /* Initialize the Rx and Tx rings, along with various 'dev' bits. */ static void init_ring(struct net_device *dev) { - struct netdev_private *np = (struct netdev_private *)dev->priv; + struct netdev_private *np = dev->priv; int i; np->cur_rx = np->cur_tx = 0; @@ -753,7 +753,7 @@ static int start_tx(struct sk_buff *skb, struct net_device *dev) { - struct netdev_private *np = (struct netdev_private *)dev->priv; + struct netdev_private *np = dev->priv; unsigned entry; /* Note: Ordering is important here, set the field with the @@ -792,7 +792,7 @@ after the Tx thread. */ static void intr_handler(int irq, void *dev_instance, struct pt_regs *rgs) { - struct net_device *dev = (struct net_device *)dev_instance; + struct net_device *dev = dev_instance; struct netdev_private *np; long ioaddr; int boguscnt = max_interrupt_work; @@ -888,7 +888,7 @@ for clarity and better register allocation. */ static int netdev_rx(struct net_device *dev) { - struct netdev_private *np = (struct netdev_private *)dev->priv; + struct netdev_private *np = dev->priv; int entry = np->cur_rx % RX_RING_SIZE; int boguscnt = np->dirty_rx + RX_RING_SIZE - np->cur_rx; s32 desc_status = le32_to_cpu(np->rx_head_desc->cmd_status); @@ -995,7 +995,7 @@ static void netdev_error(struct net_device *dev, int intr_status) { - struct netdev_private *np = (struct netdev_private *)dev->priv; + struct netdev_private *np = dev->priv; long ioaddr = dev->base_addr; if (intr_status & LinkChange) { @@ -1031,7 +1031,7 @@ static struct net_device_stats *get_stats(struct net_device *dev) { long ioaddr = dev->base_addr; - struct netdev_private *np = (struct netdev_private *)dev->priv; + struct netdev_private *np = dev->priv; /* We should lock this segment of code for SMP eventually, although the vulnerability window is very small and statistics are @@ -1072,7 +1072,7 @@ static void set_rx_mode(struct net_device *dev) { long ioaddr = dev->base_addr; - struct netdev_private *np = (struct netdev_private *)dev->priv; + struct netdev_private *np = dev->priv; u8 mc_filter[64]; /* Multicast hash filter */ u32 rx_mode; @@ -1105,7 +1105,7 @@ static int mii_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) { - struct netdev_private *np = (struct netdev_private *)dev->priv; + struct netdev_private *np = dev->priv; u16 *data = (u16 *)&rq->ifr_data; switch(cmd) { @@ -1141,7 +1141,7 @@ static int netdev_close(struct net_device *dev) { long ioaddr = dev->base_addr; - struct netdev_private *np = (struct netdev_private *)dev->priv; + struct netdev_private *np = dev->priv; int i; netif_stop_queue(dev); diff -urN --exclude-from=/home/davej/.exclude linux/drivers/net/net_init.c linux-dj/drivers/net/net_init.c --- linux/drivers/net/net_init.c Mon Mar 19 09:16:24 2001 +++ linux-dj/drivers/net/net_init.c Mon Mar 19 09:29:11 2001 @@ -76,7 +76,7 @@ /* ensure 32-byte alignment of the private area */ alloc_size = sizeof (*dev) + sizeof_priv + 31; - dev = (struct net_device *) kmalloc (alloc_size, GFP_KERNEL); + dev = kmalloc (alloc_size, GFP_KERNEL); if (dev == NULL) { printk(KERN_ERR "alloc_dev: Unable to allocate device memory.\n"); diff -urN --exclude-from=/home/davej/.exclude linux/drivers/net/ni5010.c linux-dj/drivers/net/ni5010.c --- linux/drivers/net/ni5010.c Mon Mar 19 09:16:24 2001 +++ linux-dj/drivers/net/ni5010.c Mon Mar 19 09:29:15 2001 @@ -457,7 +457,7 @@ PRINTK2((KERN_DEBUG "%s: entering ni5010_interrupt\n", dev->name)); ioaddr = dev->base_addr; - lp = (struct ni5010_local *)dev->priv; + lp = dev->priv; status = inb(IE_ISTAT); PRINTK3((KERN_DEBUG "%s: IE_ISTAT = %#02x\n", dev->name, status)); @@ -498,7 +498,7 @@ /* We have a good packet, get it out of the buffer. */ static void ni5010_rx(struct net_device *dev) { - struct ni5010_local *lp = (struct ni5010_local *)dev->priv; + struct ni5010_local *lp = dev->priv; int ioaddr = dev->base_addr; unsigned char rcv_stat; struct sk_buff *skb; @@ -562,7 +562,7 @@ static int process_xmt_interrupt(struct net_device *dev) { - struct ni5010_local *lp = (struct ni5010_local *)dev->priv; + struct ni5010_local *lp = dev->priv; int ioaddr = dev->base_addr; int xmit_stat; @@ -622,7 +622,7 @@ closed. */ static struct net_device_stats *ni5010_get_stats(struct net_device *dev) { - struct ni5010_local *lp = (struct ni5010_local *)dev->priv; + struct ni5010_local *lp = dev->priv; PRINTK2((KERN_DEBUG "%s: entering ni5010_get_stats\n", dev->name)); @@ -664,7 +664,7 @@ static void hardware_send_packet(struct net_device *dev, char *buf, int length) { - struct ni5010_local *lp = (struct ni5010_local *)dev->priv; + struct ni5010_local *lp = dev->priv; int ioaddr = dev->base_addr; unsigned long flags; unsigned int buf_offs; diff -urN --exclude-from=/home/davej/.exclude linux/drivers/net/ni52.c linux-dj/drivers/net/ni52.c --- linux/drivers/net/ni52.c Tue Feb 13 21:15:05 2001 +++ linux-dj/drivers/net/ni52.c Mon Mar 19 09:29:18 2001 @@ -282,7 +282,7 @@ static int check586(struct net_device *dev,char *where,unsigned size) { struct priv pb; - struct priv *p = /* (struct priv *) dev->priv*/ &pb; + struct priv *p = /* dev->priv*/ &pb; char *iscp_addrs[2]; int i; @@ -323,7 +323,7 @@ */ static void alloc586(struct net_device *dev) { - struct priv *p = (struct priv *) dev->priv; + struct priv *p = dev->priv; ni_reset586(); DELAY(1); @@ -468,7 +468,7 @@ dev->mem_end = dev->mem_start + size; /* set mem_end showed by 'ifconfig' */ #endif - dev->priv = (void *) kmalloc(sizeof(struct priv),GFP_KERNEL); + dev->priv = kmalloc(sizeof(struct priv),GFP_KERNEL); if(dev->priv == NULL) { printk("%s: Ooops .. can't allocate private driver memory.\n",dev->name); retval = -ENOMEM; @@ -537,7 +537,7 @@ { void *ptr; int i,result=0; - struct priv *p = (struct priv *) dev->priv; + struct priv *p = dev->priv; volatile struct configure_cmd_struct *cfg_cmd; volatile struct iasetup_cmd_struct *ias_cmd; volatile struct tdr_cmd_struct *tdr_cmd; @@ -593,7 +593,7 @@ * individual address setup */ - ias_cmd = (struct iasetup_cmd_struct *)ptr; + ias_cmd = ptr; ias_cmd->cmd_status = 0; ias_cmd->cmd_cmd = CMD_IASETUP | CMD_LAST; @@ -617,7 +617,7 @@ * TDR, wire check .. e.g. no resistor e.t.c */ - tdr_cmd = (struct tdr_cmd_struct *)ptr; + tdr_cmd = ptr; tdr_cmd->cmd_status = 0; tdr_cmd->cmd_cmd = CMD_TDR | CMD_LAST; @@ -770,10 +770,10 @@ static void *alloc_rfa(struct net_device *dev,void *ptr) { - volatile struct rfd_struct *rfd = (struct rfd_struct *)ptr; + volatile struct rfd_struct *rfd = ptr; volatile struct rbd_struct *rbd; int i; - struct priv *p = (struct priv *) dev->priv; + struct priv *p = dev->priv; memset((char *) rfd,0,sizeof(struct rfd_struct)*(p->num_recv_buffs+rfdadd)); p->rfd_first = rfd; @@ -786,7 +786,7 @@ ptr = (void *) (rfd + (p->num_recv_buffs + rfdadd) ); - rbd = (struct rbd_struct *) ptr; + rbd = ptr; ptr = (void *) (rbd + p->num_recv_buffs); /* clr descriptors */ @@ -825,7 +825,7 @@ printk ("ni5210-interrupt: irq %d for unknown device.\n",irq); return; } - p = (struct priv *) dev->priv; + p = dev->priv; if(debuglevel > 1) printk("I"); @@ -894,7 +894,7 @@ unsigned short totlen; struct sk_buff *skb; struct rbd_struct *rbd; - struct priv *p = (struct priv *) dev->priv; + struct priv *p = dev->priv; if(debuglevel > 0) printk("R"); @@ -909,7 +909,7 @@ { totlen &= RBD_MASK; /* length of this frame */ rbd->status = 0; - skb = (struct sk_buff *) dev_alloc_skb(totlen+2); + skb = dev_alloc_skb(totlen+2); if(skb != NULL) { skb->dev = dev; @@ -1015,7 +1015,7 @@ static void ni52_rnr_int(struct net_device *dev) { - struct priv *p = (struct priv *) dev->priv; + struct priv *p = dev->priv; p->stats.rx_errors++; @@ -1039,7 +1039,7 @@ static void ni52_xmt_int(struct net_device *dev) { int status; - struct priv *p = (struct priv *) dev->priv; + struct priv *p = dev->priv; if(debuglevel > 0) printk("X"); @@ -1089,7 +1089,7 @@ static void startrecv586(struct net_device *dev) { - struct priv *p = (struct priv *) dev->priv; + struct priv *p = dev->priv; WAIT_4_SCB_CMD(); WAIT_4_SCB_CMD_RUC(); @@ -1101,7 +1101,7 @@ static void ni52_timeout(struct net_device *dev) { - struct priv *p = (struct priv *) dev->priv; + struct priv *p = dev->priv; #ifndef NO_NOPCOMMANDS if(p->scb->cus & CU_ACTIVE) /* COMMAND-UNIT active? */ { @@ -1143,7 +1143,7 @@ #ifndef NO_NOPCOMMANDS int next_nop; #endif - struct priv *p = (struct priv *) dev->priv; + struct priv *p = dev->priv; if(skb->len > XMIT_BUFF_SIZE) { @@ -1248,7 +1248,7 @@ static struct net_device_stats *ni52_get_stats(struct net_device *dev) { - struct priv *p = (struct priv *) dev->priv; + struct priv *p = dev->priv; unsigned short crc,aln,rsc,ovrn; crc = p->scb->crc_errs; /* get error-statistic from the ni82586 */ @@ -1328,7 +1328,7 @@ */ void ni52_dump(struct net_device *dev,void *ptr) { - struct priv *p = (struct priv *) dev->priv; + struct priv *p = dev->priv; struct dump_cmd_struct *dump_cmd = (struct dump_cmd_struct *) ptr; int i; diff -urN --exclude-from=/home/davej/.exclude linux/drivers/net/ni65.c linux-dj/drivers/net/ni65.c --- linux/drivers/net/ni65.c Tue Feb 13 21:15:05 2001 +++ linux-dj/drivers/net/ni65.c Mon Mar 19 23:13:26 2001 @@ -268,7 +268,7 @@ */ static int ni65_open(struct net_device *dev) { - struct priv *p = (struct priv *) dev->priv; + struct priv *p = dev->priv; int irqval = request_irq(dev->irq, &ni65_interrupt,0, cards[p->cardno].cardname,dev); if (irqval) { @@ -295,7 +295,7 @@ */ static int ni65_close(struct net_device *dev) { - struct priv *p = (struct priv *) dev->priv; + struct priv *p = dev->priv; netif_stop_queue(dev); @@ -376,7 +376,7 @@ if( (j=ni65_alloc_buffer(dev)) < 0) return j; - p = (struct priv *) dev->priv; + p = dev->priv; p->cmdr_addr = ioaddr + cards[i].cmd_offset; p->cardno = i; @@ -578,7 +578,7 @@ if(!ptr) return -ENOMEM; - p = dev->priv = (struct priv *) (((unsigned long) ptr + 7) & ~0x7); + p = dev->priv = (((unsigned long) ptr + 7) & ~0x7); memset((char *) dev->priv,0,sizeof(struct priv)); p->self = ptr; @@ -724,7 +724,7 @@ static int ni65_lance_reinit(struct net_device *dev) { int i; - struct priv *p = (struct priv *) dev->priv; + struct priv *p = dev->priv; unsigned long flags; p->lock = 0; @@ -810,7 +810,7 @@ struct priv *p; int bcnt = 32; - p = (struct priv *) dev->priv; + p = dev->priv; while(--bcnt) { csr0 = inw(PORT+L_DATAREG); @@ -831,7 +831,7 @@ if(csr0 & CSR0_ERR) { - struct priv *p = (struct priv *) dev->priv; + struct priv *p = dev->priv; if(debuglevel > 1) printk("%s: general error: %04x.\n",dev->name,csr0); if(csr0 & CSR0_BABL) @@ -856,7 +856,7 @@ int j; for(j=0;jpriv; + struct priv *p = dev->priv; int i,k,num1,num2; for(i=RMDNUM-1;i>0;i--) { num2 = (p->rmdnum + i) & (RMDNUM-1); @@ -913,7 +913,7 @@ */ static void ni65_xmit_intr(struct net_device *dev,int csr0) { - struct priv *p = (struct priv *) dev->priv; + struct priv *p = dev->priv; while(p->xmit_queued) { @@ -980,7 +980,7 @@ struct rmd *rmdp; int rmdstat,len; int cnt=0; - struct priv *p = (struct priv *) dev->priv; + struct priv *p = dev->priv; rmdp = p->rmdhead + p->rmdnum; while(!( (rmdstat = rmdp->u.s.status) & RCV_OWN)) @@ -1072,7 +1072,7 @@ static void ni65_timeout(struct net_device *dev) { int i; - struct priv *p = (struct priv *) dev->priv; + struct priv *p = dev->priv; printk(KERN_ERR "%s: xmitter timed out, try to restart!\n",dev->name); for(i=0;ipriv; + struct priv *p = dev->priv; netif_stop_queue(dev); @@ -1154,7 +1154,7 @@ #if 0 int i; - struct priv *p = (struct priv *) dev->priv; + struct priv *p = dev->priv; for(i=0;irmdhead + ((p->rmdnum + i) & (RMDNUM-1)); @@ -1202,7 +1202,7 @@ void cleanup_module(void) { struct priv *p; - p = (struct priv *) dev_ni65.priv; + p = dev_ni65.priv; if(!p) { printk("Ooops .. no private struct\n"); return; diff -urN --exclude-from=/home/davej/.exclude linux/drivers/net/pci-skeleton.c linux-dj/drivers/net/pci-skeleton.c --- linux/drivers/net/pci-skeleton.c Mon Mar 19 09:16:24 2001 +++ linux-dj/drivers/net/pci-skeleton.c Mon Mar 19 09:29:21 2001 @@ -989,7 +989,7 @@ static int mdio_read (struct net_device *dev, int phy_id, int location) { - struct netdrv_private *tp = (struct netdrv_private *) dev->priv; + struct netdrv_private *tp = dev->priv; void *mdio_addr = tp->mmio_addr + Config4; int mii_cmd = (0xf6 << 10) | (phy_id << 5) | location; int retval = 0; @@ -1032,7 +1032,7 @@ static void mdio_write (struct net_device *dev, int phy_id, int location, int value) { - struct netdrv_private *tp = (struct netdrv_private *) dev->priv; + struct netdrv_private *tp = dev->priv; void *mdio_addr = tp->mmio_addr + Config4; int mii_cmd = (0x5002 << 16) | (phy_id << 23) | (location << 18) | value; @@ -1075,7 +1075,7 @@ static int netdrv_open (struct net_device *dev) { - struct netdrv_private *tp = (struct netdrv_private *) dev->priv; + struct netdrv_private *tp = dev->priv; int retval; #ifdef NETDRV_DEBUG void *ioaddr = tp->mmio_addr; @@ -1136,7 +1136,7 @@ /* Start the hardware at open or resume. */ static void netdrv_hw_start (struct net_device *dev) { - struct netdrv_private *tp = (struct netdrv_private *) dev->priv; + struct netdrv_private *tp = dev->priv; void *ioaddr = tp->mmio_addr; u32 i; u8 tmp; @@ -1228,7 +1228,7 @@ /* Initialize the Rx and Tx rings, along with various 'dev' bits. */ static void netdrv_init_ring (struct net_device *dev) { - struct netdrv_private *tp = (struct netdrv_private *) dev->priv; + struct netdrv_private *tp = dev->priv; int i; DPRINTK ("ENTER\n"); @@ -1344,7 +1344,7 @@ static void netdrv_timer (unsigned long data) { struct net_device *dev = (struct net_device *) data; - struct netdrv_private *tp = (struct netdrv_private *) dev->priv; + struct netdrv_private *tp = dev->priv; void *ioaddr = tp->mmio_addr; int next_tick = 60 * HZ; int mii_reg5; @@ -1411,7 +1411,7 @@ static void netdrv_tx_timeout (struct net_device *dev) { - struct netdrv_private *tp = (struct netdrv_private *) dev->priv; + struct netdrv_private *tp = dev->priv; void *ioaddr = tp->mmio_addr; int i; u8 tmp8; @@ -1458,7 +1458,7 @@ static int netdrv_start_xmit (struct sk_buff *skb, struct net_device *dev) { - struct netdrv_private *tp = (struct netdrv_private *) dev->priv; + struct netdrv_private *tp = dev->priv; void *ioaddr = tp->mmio_addr; int entry; @@ -1798,8 +1798,8 @@ static void netdrv_interrupt (int irq, void *dev_instance, struct pt_regs *regs) { - struct net_device *dev = (struct net_device *) dev_instance; - struct netdrv_private *tp = (struct netdrv_private *) dev->priv; + struct net_device *dev = dev_instance; + struct netdrv_private *tp = dev->priv; int boguscnt = max_interrupt_work; void *ioaddr = tp->mmio_addr; int status = 0, link_changed = 0; /* avoid bogus "uninit" warning */ @@ -1882,7 +1882,7 @@ static int netdrv_close (struct net_device *dev) { - struct netdrv_private *tp = (struct netdrv_private *) dev->priv; + struct netdrv_private *tp = dev->priv; void *ioaddr = tp->mmio_addr; unsigned long flags; @@ -1933,7 +1933,7 @@ static int mii_ioctl (struct net_device *dev, struct ifreq *rq, int cmd) { - struct netdrv_private *tp = (struct netdrv_private *) dev->priv; + struct netdrv_private *tp = dev->priv; u16 *data = (u16 *) & rq->ifr_data; unsigned long flags; int rc = 0; @@ -1974,7 +1974,7 @@ static struct net_device_stats *netdrv_get_stats (struct net_device *dev) { - struct netdrv_private *tp = (struct netdrv_private *) dev->priv; + struct netdrv_private *tp = dev->priv; void *ioaddr = tp->mmio_addr; DPRINTK ("ENTER\n"); @@ -2022,7 +2022,7 @@ static void netdrv_set_rx_mode (struct net_device *dev) { - struct netdrv_private *tp = (struct netdrv_private *) dev->priv; + struct netdrv_private *tp = dev->priv; void *ioaddr = tp->mmio_addr; u32 mc_filter[2]; /* Multicast hash filter */ int i, rx_mode; @@ -2078,7 +2078,7 @@ static void netdrv_suspend (struct pci_dev *pdev) { struct net_device *dev = pci_get_drvdata (pdev); - struct netdrv_private *tp = (struct netdrv_private *) dev->priv; + struct netdrv_private *tp = dev->priv; void *ioaddr = tp->mmio_addr; unsigned long flags; diff -urN --exclude-from=/home/davej/.exclude linux/drivers/net/pcmcia/netwave_cs.c linux-dj/drivers/net/pcmcia/netwave_cs.c --- linux/drivers/net/pcmcia/netwave_cs.c Mon Mar 19 09:16:24 2001 +++ linux-dj/drivers/net/pcmcia/netwave_cs.c Mon Mar 19 23:13:52 2001 @@ -1225,7 +1225,7 @@ static void netwave_interrupt(int irq, void* dev_id, struct pt_regs *regs) { ioaddr_t iobase; u_char *ramBase; - struct net_device *dev = (struct net_device *)dev_id; + struct net_device *dev = dev_id; struct netwave_private *priv = dev->priv; dev_link_t *link = &priv->link; int i; diff -urN --exclude-from=/home/davej/.exclude linux/drivers/net/pcmcia/ray_cs.c linux-dj/drivers/net/pcmcia/ray_cs.c --- linux/drivers/net/pcmcia/ray_cs.c Mon Mar 19 09:16:24 2001 +++ linux-dj/drivers/net/pcmcia/ray_cs.c Mon Mar 19 23:14:29 2001 @@ -1855,7 +1855,7 @@ =============================================================================*/ static void ray_interrupt(int irq, void *dev_id, struct pt_regs * regs) { - struct net_device *dev = (struct net_device *)dev_id; + struct net_device *dev = dev_id; dev_link_t *link; ray_dev_t *local; struct ccs *pccs; diff -urN --exclude-from=/home/davej/.exclude linux/drivers/net/pcmcia/xirc2ps_cs.c linux-dj/drivers/net/pcmcia/xirc2ps_cs.c --- linux/drivers/net/pcmcia/xirc2ps_cs.c Mon Mar 19 09:16:24 2001 +++ linux-dj/drivers/net/pcmcia/xirc2ps_cs.c Mon Mar 19 23:14:41 2001 @@ -1296,7 +1296,7 @@ static void xirc2ps_interrupt(int irq, void *dev_id, struct pt_regs *regs) { - struct net_device *dev = (struct net_device *)dev_id; + struct net_device *dev = dev_id; local_info_t *lp = dev->priv; ioaddr_t ioaddr; u_char saved_page; diff -urN --exclude-from=/home/davej/.exclude linux/drivers/net/pcnet32.c linux-dj/drivers/net/pcnet32.c --- linux/drivers/net/pcnet32.c Mon Mar 19 09:16:24 2001 +++ linux-dj/drivers/net/pcnet32.c Mon Mar 19 09:29:17 2001 @@ -690,7 +690,7 @@ request_region(ioaddr, PCNET32_TOTAL_SIZE, chipname); /* pci_alloc_consistent returns page-aligned memory, so we do not have to check the alignment */ - if ((lp = (struct pcnet32_private *)pci_alloc_consistent(pdev, sizeof(*lp), &lp_dma_addr)) == NULL) + if ((lp = pci_alloc_consistent(pdev, sizeof(*lp), &lp_dma_addr)) == NULL) return -ENOMEM; memset(lp, 0, sizeof(*lp)); @@ -798,7 +798,7 @@ static int pcnet32_open(struct net_device *dev) { - struct pcnet32_private *lp = (struct pcnet32_private *)dev->priv; + struct pcnet32_private *lp = dev->priv; unsigned long ioaddr = dev->base_addr; u16 val; int i; @@ -929,7 +929,7 @@ static void pcnet32_purge_tx_ring(struct net_device *dev) { - struct pcnet32_private *lp = (struct pcnet32_private *)dev->priv; + struct pcnet32_private *lp = dev->priv; int i; for (i = 0; i < TX_RING_SIZE; i++) { @@ -947,7 +947,7 @@ static int pcnet32_init_ring(struct net_device *dev) { - struct pcnet32_private *lp = (struct pcnet32_private *)dev->priv; + struct pcnet32_private *lp = dev->priv; int i; lp->tx_full = 0; @@ -988,7 +988,7 @@ static void pcnet32_restart(struct net_device *dev, unsigned int csr0_bits) { - struct pcnet32_private *lp = (struct pcnet32_private *)dev->priv; + struct pcnet32_private *lp = dev->priv; unsigned long ioaddr = dev->base_addr; int i; @@ -1010,7 +1010,7 @@ static void pcnet32_tx_timeout (struct net_device *dev) { - struct pcnet32_private *lp = (struct pcnet32_private *)dev->priv; + struct pcnet32_private *lp = dev->priv; unsigned int ioaddr = dev->base_addr; /* Transmitter timeout, serious problems. */ @@ -1043,7 +1043,7 @@ static int pcnet32_start_xmit(struct sk_buff *skb, struct net_device *dev) { - struct pcnet32_private *lp = (struct pcnet32_private *)dev->priv; + struct pcnet32_private *lp = dev->priv; unsigned int ioaddr = dev->base_addr; u16 status; int entry; @@ -1111,7 +1111,7 @@ static void pcnet32_interrupt(int irq, void *dev_id, struct pt_regs * regs) { - struct net_device *dev = (struct net_device *)dev_id; + struct net_device *dev = dev_id; struct pcnet32_private *lp; unsigned long ioaddr; u16 csr0,rap; @@ -1124,7 +1124,7 @@ } ioaddr = dev->base_addr; - lp = (struct pcnet32_private *)dev->priv; + lp = dev->priv; spin_lock(&lp->lock); @@ -1257,7 +1257,7 @@ static int pcnet32_rx(struct net_device *dev) { - struct pcnet32_private *lp = (struct pcnet32_private *)dev->priv; + struct pcnet32_private *lp = dev->priv; int entry = lp->cur_rx & RX_RING_MOD_MASK; /* If we own the next entry, it's a new packet. Send it up. */ @@ -1351,7 +1351,7 @@ pcnet32_close(struct net_device *dev) { unsigned long ioaddr = dev->base_addr; - struct pcnet32_private *lp = (struct pcnet32_private *)dev->priv; + struct pcnet32_private *lp = dev->priv; int i; netif_stop_queue(dev); @@ -1401,7 +1401,7 @@ static struct net_device_stats * pcnet32_get_stats(struct net_device *dev) { - struct pcnet32_private *lp = (struct pcnet32_private *)dev->priv; + struct pcnet32_private *lp = dev->priv; unsigned long ioaddr = dev->base_addr; u16 saved_addr; unsigned long flags; @@ -1418,7 +1418,7 @@ /* taken from the sunlance driver, which it took from the depca driver */ static void pcnet32_load_multicast (struct net_device *dev) { - struct pcnet32_private *lp = (struct pcnet32_private *) dev->priv; + struct pcnet32_private *lp = dev->priv; volatile struct pcnet32_init_block *ib = &lp->init_block; volatile u16 *mcast_table = (u16 *)&ib->filter; struct dev_mc_list *dmi=dev->mc_list; @@ -1471,7 +1471,7 @@ static void pcnet32_set_multicast_list(struct net_device *dev) { unsigned long ioaddr = dev->base_addr; - struct pcnet32_private *lp = (struct pcnet32_private *)dev->priv; + struct pcnet32_private *lp = dev->priv; if (dev->flags&IFF_PROMISC) { /* Log any net taps. */ @@ -1491,7 +1491,7 @@ static int pcnet32_mii_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) { unsigned long ioaddr = dev->base_addr; - struct pcnet32_private *lp = (struct pcnet32_private *)dev->priv; + struct pcnet32_private *lp = dev->priv; u16 *data = (u16 *)&rq->ifr_data; int phyaddr = lp->a.read_bcr (ioaddr, 33); @@ -1580,7 +1580,7 @@ /* No need to check MOD_IN_USE, as sys_delete_module() checks. */ while (pcnet32_dev) { - struct pcnet32_private *lp = (struct pcnet32_private *) pcnet32_dev->priv; + struct pcnet32_private *lp = pcnet32_dev->priv; next_dev = lp->next; unregister_netdev(pcnet32_dev); release_region(pcnet32_dev->base_addr, PCNET32_TOTAL_SIZE); diff -urN --exclude-from=/home/davej/.exclude linux/drivers/net/plip.c linux-dj/drivers/net/plip.c --- linux/drivers/net/plip.c Tue Feb 13 21:15:05 2001 +++ linux-dj/drivers/net/plip.c Mon Mar 19 09:29:19 2001 @@ -332,7 +332,7 @@ return -ENOMEM; } memset(dev->priv, 0, sizeof(struct net_local)); - nl = (struct net_local *) dev->priv; + nl = dev->priv; nl->orig_hard_header = dev->hard_header; dev->hard_header = plip_hard_header; @@ -377,7 +377,7 @@ static void plip_kick_bh(struct net_device *dev) { - struct net_local *nl = (struct net_local *)dev->priv; + struct net_local *nl = dev->priv; if (nl->is_deferred) { queue_task(&nl->immediate, &tq_immediate); @@ -422,7 +422,7 @@ static void plip_bh(struct net_device *dev) { - struct net_local *nl = (struct net_local *)dev->priv; + struct net_local *nl = dev->priv; struct plip_local *snd = &nl->snd_data; struct plip_local *rcv = &nl->rcv_data; plip_func f; @@ -440,7 +440,7 @@ static void plip_timer_bh(struct net_device *dev) { - struct net_local *nl = (struct net_local *)dev->priv; + struct net_local *nl = dev->priv; if (!(atomic_read (&nl->kill_timer))) { plip_interrupt (-1, dev, NULL); @@ -974,7 +974,7 @@ return; } - nl = (struct net_local *)dev->priv; + nl = dev->priv; rcv = &nl->rcv_data; spin_lock_irq (&nl->lock); @@ -1019,7 +1019,7 @@ static int plip_tx_packet(struct sk_buff *skb, struct net_device *dev) { - struct net_local *nl = (struct net_local *)dev->priv; + struct net_local *nl = dev->priv; struct plip_local *snd = &nl->snd_data; if (netif_queue_stopped(dev)) @@ -1080,7 +1080,7 @@ unsigned short type, void *daddr, void *saddr, unsigned len) { - struct net_local *nl = (struct net_local *)dev->priv; + struct net_local *nl = dev->priv; int ret; if ((ret = nl->orig_hard_header(skb, dev, type, daddr, saddr, len)) >= 0) @@ -1092,7 +1092,7 @@ int plip_hard_header_cache(struct neighbour *neigh, struct hh_cache *hh) { - struct net_local *nl = (struct net_local *)neigh->dev->priv; + struct net_local *nl = neigh->dev->priv; int ret; if ((ret = nl->orig_hard_header_cache(neigh, hh)) == 0) @@ -1113,7 +1113,7 @@ static int plip_open(struct net_device *dev) { - struct net_local *nl = (struct net_local *)dev->priv; + struct net_local *nl = dev->priv; struct in_device *in_dev; /* Grab the port */ @@ -1172,7 +1172,7 @@ static int plip_close(struct net_device *dev) { - struct net_local *nl = (struct net_local *)dev->priv; + struct net_local *nl = dev->priv; struct plip_local *snd = &nl->snd_data; struct plip_local *rcv = &nl->rcv_data; @@ -1218,8 +1218,8 @@ static int plip_preempt(void *handle) { - struct net_device *dev = (struct net_device *)handle; - struct net_local *nl = (struct net_local *)dev->priv; + struct net_device *dev = handle; + struct net_local *nl = dev->priv; /* Stand our ground if a datagram is on the wire */ if (nl->connection != PLIP_CN_NONE) { @@ -1234,8 +1234,8 @@ static void plip_wakeup(void *handle) { - struct net_device *dev = (struct net_device *)handle; - struct net_local *nl = (struct net_local *)dev->priv; + struct net_device *dev = handle; + struct net_local *nl = dev->priv; if (nl->port_owner) { /* Why are we being woken up? */ @@ -1263,7 +1263,7 @@ static struct net_device_stats * plip_get_stats(struct net_device *dev) { - struct net_local *nl = (struct net_local *)dev->priv; + struct net_local *nl = dev->priv; struct net_device_stats *r = &nl->enet_stats; return r; @@ -1272,7 +1272,7 @@ static int plip_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) { - struct net_local *nl = (struct net_local *) dev->priv; + struct net_local *nl = dev->priv; struct plipconf *pc = (struct plipconf *) &rq->ifr_data; switch(pc->pcmd) { diff -urN --exclude-from=/home/davej/.exclude linux/drivers/net/ppp_deflate.c linux-dj/drivers/net/ppp_deflate.c --- linux/drivers/net/ppp_deflate.c Tue Feb 13 21:15:05 2001 +++ linux-dj/drivers/net/ppp_deflate.c Mon Mar 19 09:29:15 2001 @@ -150,7 +150,7 @@ z_comp_free(arg) void *arg; { - struct ppp_deflate_state *state = (struct ppp_deflate_state *) arg; + struct ppp_deflate_state *state = arg; if (state) { deflateEnd(&state->strm); @@ -180,7 +180,7 @@ if (w_size < DEFLATE_MIN_SIZE || w_size > DEFLATE_MAX_SIZE) return NULL; - state = (struct ppp_deflate_state *) kmalloc(sizeof(*state), GFP_KERNEL); + state = kmalloc(sizeof(*state), GFP_KERNEL); if (state == NULL) return NULL; @@ -210,7 +210,7 @@ unsigned char *options; int opt_len, unit, hdrlen, debug; { - struct ppp_deflate_state *state = (struct ppp_deflate_state *) arg; + struct ppp_deflate_state *state = arg; if (opt_len < CILEN_DEFLATE || (options[0] != CI_DEFLATE && options[0] != CI_DEFLATE_DRAFT) @@ -233,7 +233,7 @@ z_comp_reset(arg) void *arg; { - struct ppp_deflate_state *state = (struct ppp_deflate_state *) arg; + struct ppp_deflate_state *state = arg; state->seqno = 0; deflateReset(&state->strm); @@ -246,7 +246,7 @@ unsigned char *obuf; /* compressed packet (out) */ int isize, osize; { - struct ppp_deflate_state *state = (struct ppp_deflate_state *) arg; + struct ppp_deflate_state *state = arg; int r, proto, off, olen, oavail; unsigned char *wptr; @@ -325,7 +325,7 @@ void *arg; struct compstat *stats; { - struct ppp_deflate_state *state = (struct ppp_deflate_state *) arg; + struct ppp_deflate_state *state = arg; *stats = state->stats; } @@ -334,7 +334,7 @@ z_decomp_free(arg) void *arg; { - struct ppp_deflate_state *state = (struct ppp_deflate_state *) arg; + struct ppp_deflate_state *state = arg; if (state) { inflateEnd(&state->strm); @@ -364,7 +364,7 @@ if (w_size < DEFLATE_MIN_SIZE || w_size > DEFLATE_MAX_SIZE) return NULL; - state = (struct ppp_deflate_state *) kmalloc(sizeof(*state), GFP_KERNEL); + state = kmalloc(sizeof(*state), GFP_KERNEL); if (state == NULL) return NULL; @@ -392,7 +392,7 @@ unsigned char *options; int opt_len, unit, hdrlen, mru, debug; { - struct ppp_deflate_state *state = (struct ppp_deflate_state *) arg; + struct ppp_deflate_state *state = arg; if (opt_len < CILEN_DEFLATE || (options[0] != CI_DEFLATE && options[0] != CI_DEFLATE_DRAFT) @@ -416,7 +416,7 @@ z_decomp_reset(arg) void *arg; { - struct ppp_deflate_state *state = (struct ppp_deflate_state *) arg; + struct ppp_deflate_state *state = arg; state->seqno = 0; inflateReset(&state->strm); @@ -446,7 +446,7 @@ unsigned char *obuf; int osize; { - struct ppp_deflate_state *state = (struct ppp_deflate_state *) arg; + struct ppp_deflate_state *state = arg; int olen, seq, r; int decode_proto, overflow; unsigned char overflow_buf[1]; @@ -552,7 +552,7 @@ unsigned char *ibuf; int icnt; { - struct ppp_deflate_state *state = (struct ppp_deflate_state *) arg; + struct ppp_deflate_state *state = arg; int proto, r; /* diff -urN --exclude-from=/home/davej/.exclude linux/drivers/net/ppp_generic.c linux-dj/drivers/net/ppp_generic.c --- linux/drivers/net/ppp_generic.c Sun Feb 4 18:05:30 2001 +++ linux-dj/drivers/net/ppp_generic.c Mon Mar 19 09:29:12 2001 @@ -318,7 +318,7 @@ static int ppp_release(struct inode *inode, struct file *file) { - struct ppp_file *pf = (struct ppp_file *) file->private_data; + struct ppp_file *pf = file->private_data; lock_kernel(); if (pf != 0) { @@ -341,7 +341,7 @@ static ssize_t ppp_read(struct file *file, char *buf, size_t count, loff_t *ppos) { - struct ppp_file *pf = (struct ppp_file *) file->private_data; + struct ppp_file *pf = file->private_data; return ppp_file_read(pf, file, buf, count); } @@ -397,7 +397,7 @@ static ssize_t ppp_write(struct file *file, const char *buf, size_t count, loff_t *ppos) { - struct ppp_file *pf = (struct ppp_file *) file->private_data; + struct ppp_file *pf = file->private_data; return ppp_file_write(pf, buf, count); } @@ -443,7 +443,7 @@ /* No kernel lock - fine */ static unsigned int ppp_poll(struct file *file, poll_table *wait) { - struct ppp_file *pf = (struct ppp_file *) file->private_data; + struct ppp_file *pf = file->private_data; unsigned int mask; if (pf == 0) @@ -463,7 +463,7 @@ static int ppp_ioctl(struct inode *inode, struct file *file, unsigned int cmd, unsigned long arg) { - struct ppp_file *pf = (struct ppp_file *) file->private_data; + struct ppp_file *pf = file->private_data; struct ppp *ppp; int err = -EFAULT, val, val2, i; struct ppp_idle idle; @@ -735,7 +735,7 @@ static int ppp_start_xmit(struct sk_buff *skb, struct net_device *dev) { - struct ppp *ppp = (struct ppp *) dev->priv; + struct ppp *ppp = dev->priv; int npi, proto; unsigned char *pp; @@ -788,7 +788,7 @@ static struct net_device_stats * ppp_net_stats(struct net_device *dev) { - struct ppp *ppp = (struct ppp *) dev->priv; + struct ppp *ppp = dev->priv; return &ppp->stats; } diff -urN --exclude-from=/home/davej/.exclude linux/drivers/net/pppoe.c linux-dj/drivers/net/pppoe.c --- linux/drivers/net/pppoe.c Mon Mar 19 09:16:24 2001 +++ linux-dj/drivers/net/pppoe.c Mon Mar 19 09:29:21 2001 @@ -236,7 +236,7 @@ unsigned long event, void *ptr) { int error = NOTIFY_DONE; - struct net_device *dev = (struct net_device *) ptr; + struct net_device *dev = ptr; struct pppox_opt *po = NULL; int hash = 0; @@ -891,7 +891,7 @@ ***********************************************************************/ int pppoe_xmit(struct ppp_channel *chan, struct sk_buff *skb) { - struct sock *sk = (struct sock *) chan->private; + struct sock *sk = chan->private; return __pppoe_xmit(sk, skb); } diff -urN --exclude-from=/home/davej/.exclude linux/drivers/net/ptifddi.c linux-dj/drivers/net/ptifddi.c --- linux/drivers/net/ptifddi.c Tue Jul 11 22:46:08 2000 +++ linux-dj/drivers/net/ptifddi.c Mon Mar 19 23:16:59 2001 @@ -118,28 +118,28 @@ static void pti_interrupt(int irq, void *dev_id, struct pt_regs *regs) { - struct net_device *dev = (struct net_device *) dev_id; - struct ptifddi *pp = (struct ptifddi *) dev->priv; + struct net_device *dev = dev_id; + struct ptifddi *pp = dev->priv; } static int pti_open(struct net_device *dev) { - struct ptifddi *pp = (struct ptifddi *) dev->priv; + struct ptifddi *pp = dev->priv; return pti_init(pp, in_interrupt()); } static int pti_close(struct net_device *dev) { - struct ptifddi *pp = (struct ptifddi *) dev->priv; + struct ptifddi *pp = dev->priv; return 0; } static int pti_start_xmit(struct sk_buff *skb, struct net_device *dev) { - struct ptifddi *pp = (struct ptifddi *) dev->priv; + struct ptifddi *pp = dev->priv; } static struct net_device_stats *pti_get_stats(struct net_device *dev) diff -urN --exclude-from=/home/davej/.exclude linux/drivers/net/rcpci45.c linux-dj/drivers/net/rcpci45.c --- linux/drivers/net/rcpci45.c Mon Mar 19 09:16:24 2001 +++ linux-dj/drivers/net/rcpci45.c Mon Mar 19 23:17:59 2001 @@ -276,7 +276,7 @@ RCopen(struct net_device *dev) { int post_buffers = MAX_NMBR_RCV_BUFFERS; - PDPA pDpa = (PDPA) dev->priv; + PDPA pDpa = dev->priv; int count = 0; int requested = 0; int error; @@ -367,7 +367,7 @@ RC_xmit_packet(struct sk_buff *skb, struct net_device *dev) { - PDPA pDpa = (PDPA) dev->priv; + PDPA pDpa = dev->priv; singleTCB tcb; psingleTCB ptcb = &tcb; RC_RETURN status = 0; @@ -668,9 +668,9 @@ { PDPA pDpa; - struct net_device *dev = (struct net_device *)(dev_id); + struct net_device *dev = dev_id; - pDpa = (PDPA) (dev->priv); + pDpa = dev->priv; if (pDpa->shutdown) dprintk("shutdown: service irq\n"); @@ -687,7 +687,7 @@ static void rc_timer(unsigned long data) { struct net_device *dev = (struct net_device *)data; - PDPA pDpa = (PDPA) (dev->priv); + PDPA pDpa = dev->priv; int init_status; static int retry; int post_buffers = MAX_NMBR_RCV_BUFFERS; @@ -766,7 +766,7 @@ static int RCclose(struct net_device *dev) { - PDPA pDpa = (PDPA) dev->priv; + PDPA pDpa = dev->priv; netif_stop_queue(dev); diff -urN --exclude-from=/home/davej/.exclude linux/drivers/net/rrunner.c linux-dj/drivers/net/rrunner.c --- linux/drivers/net/rrunner.c Mon Mar 19 09:16:24 2001 +++ linux-dj/drivers/net/rrunner.c Mon Mar 19 23:57:04 2001 @@ -172,7 +172,7 @@ if (!dev->priv) return -ENOMEM; - rrpriv = (struct rr_private *)dev->priv; + rrpriv = dev->priv; memset(rrpriv, 0, sizeof(*rrpriv)); #ifdef CONFIG_SMP @@ -292,7 +292,7 @@ while (root_dev) { next = ((struct rr_private *)root_dev->priv)->next; - rr = (struct rr_private *)root_dev->priv; + rr = root_dev->priv; if (!(readl(&rr->regs->HostCtrl) & NIC_HALTED)){ printk(KERN_ERR "%s: trying to unload running NIC\n", @@ -358,7 +358,7 @@ u32 start_pc; int i; - rrpriv = (struct rr_private *)dev->priv; + rrpriv = dev->priv; regs = rrpriv->regs; rr_load_firmware(dev); @@ -574,7 +574,7 @@ u32 sram_size, rev; int i; - rrpriv = (struct rr_private *)dev->priv; + rrpriv = dev->priv; regs = rrpriv->regs; rev = readl(®s->FwRev); @@ -648,7 +648,7 @@ int ecode = 0; short i; - rrpriv = (struct rr_private *)dev->priv; + rrpriv = dev->priv; regs = rrpriv->regs; spin_lock_irqsave(&rrpriv->lock, flags); @@ -803,7 +803,7 @@ struct rr_regs *regs; u32 tmp; - rrpriv = (struct rr_private *)dev->priv; + rrpriv = dev->priv; regs = rrpriv->regs; while (prodidx != eidx){ @@ -957,7 +957,7 @@ static void rx_int(struct net_device *dev, u32 rxlimit, u32 index) { - struct rr_private *rrpriv = (struct rr_private *)dev->priv; + struct rr_private *rrpriv = dev->priv; struct rr_regs *regs = rrpriv->regs; do { @@ -1026,10 +1026,10 @@ { struct rr_private *rrpriv; struct rr_regs *regs; - struct net_device *dev = (struct net_device *)dev_id; + struct net_device *dev = dev_id; u32 prodidx, rxindex, eidx, txcsmr, rxlimit, txcon; - rrpriv = (struct rr_private *)dev->priv; + rrpriv = dev->priv; regs = rrpriv->regs; if (!(readl(®s->HostCtrl) & RR_INT)) @@ -1092,7 +1092,7 @@ static void rr_timer(unsigned long data) { struct net_device *dev = (struct net_device *)data; - struct rr_private *rrpriv = (struct rr_private *)dev->priv; + struct rr_private *rrpriv = dev->priv; struct rr_regs *regs = rrpriv->regs; unsigned long flags; int i; @@ -1138,7 +1138,7 @@ int ecode = 0; unsigned long flags; - rrpriv = (struct rr_private *)dev->priv; + rrpriv = dev->priv; regs = rrpriv->regs; if (rrpriv->fw_rev < 0x00020000) { @@ -1220,7 +1220,7 @@ short i; int len; - rrpriv = (struct rr_private *)dev->priv; + rrpriv = dev->priv; regs = rrpriv->regs; printk("%s: dumping NIC TX rings\n", dev->name); @@ -1286,7 +1286,7 @@ netif_stop_queue(dev); rr_if_down(dev); - rrpriv = (struct rr_private *)dev->priv; + rrpriv = dev->priv; regs = rrpriv->regs; /* @@ -1359,7 +1359,7 @@ static int rr_start_xmit(struct sk_buff *skb, struct net_device *dev) { - struct rr_private *rrpriv = (struct rr_private *)dev->priv; + struct rr_private *rrpriv = dev->priv; struct rr_regs *regs = rrpriv->regs; struct ring_ctrl *txctrl; unsigned long flags; @@ -1428,7 +1428,7 @@ { struct rr_private *rrpriv; - rrpriv = (struct rr_private *)dev->priv; + rrpriv = dev->priv; return(&rrpriv->stats); } @@ -1451,7 +1451,7 @@ u32 p2len, p2size, nr_seg, revision, io, sram_size; struct eeprom *hw = NULL; - rrpriv = (struct rr_private *)dev->priv; + rrpriv = dev->priv; regs = rrpriv->regs; if (dev->flags & IFF_UP) diff -urN --exclude-from=/home/davej/.exclude linux/drivers/net/saa9730.c linux-dj/drivers/net/saa9730.c --- linux/drivers/net/saa9730.c Mon Mar 19 09:16:24 2001 +++ linux-dj/drivers/net/saa9730.c Mon Mar 19 23:20:37 2001 @@ -310,8 +310,7 @@ static int lan_saa9730_cam_init(struct net_device *dev) { - struct lan_saa9730_private *lp = - (struct lan_saa9730_private *) dev->priv; + struct lan_saa9730_private *lp = dev->priv; unsigned int i; /* Copy MAC-address into all entries. */ @@ -554,8 +553,7 @@ static int lan_saa9730_tx(struct net_device *dev) { - struct lan_saa9730_private *lp = - (struct lan_saa9730_private *) dev->priv; + struct lan_saa9730_private *lp = dev->priv; unsigned int *pPacket; unsigned int tx_status; @@ -631,8 +629,7 @@ static int lan_saa9730_rx(struct net_device *dev) { - struct lan_saa9730_private *lp = - (struct lan_saa9730_private *) dev->priv; + struct lan_saa9730_private *lp = dev->priv; int len = 0; struct sk_buff *skb = 0; unsigned int rx_status; @@ -747,9 +744,8 @@ static void lan_saa9730_interrupt(const int irq, void *dev_id, struct pt_regs *regs) { - struct net_device *dev = (struct net_device *) dev_id; - struct lan_saa9730_private *lp = - (struct lan_saa9730_private *) dev->priv; + struct net_device *dev = dev_id; + struct lan_saa9730_private *lp = dev->priv; if (lan_saa9730_debug > 5) printk("lan_saa9730_interrupt\n"); @@ -782,8 +778,7 @@ static int lan_saa9730_open(struct net_device *dev) { - struct lan_saa9730_private *lp = - (struct lan_saa9730_private *) dev->priv; + struct lan_saa9730_private *lp = dev->priv; /* Associate IRQ with lan_saa9730_interrupt */ if (request_irq(dev->irq, &lan_saa9730_interrupt, 0, "SAA9730 Eth", @@ -860,8 +855,7 @@ static void lan_saa9730_tx_timeout(struct net_device *dev) { - struct lan_saa9730_private *lp = - (struct lan_saa9730_private *) dev->priv; + struct lan_saa9730_private *lp = dev->priv; /* Transmitter timeout, serious problems */ lp->stats.tx_errors++; @@ -876,8 +870,7 @@ static int lan_saa9730_start_xmit(struct sk_buff *skb, struct net_device *dev) { - struct lan_saa9730_private *lp = - (struct lan_saa9730_private *) dev->priv; + struct lan_saa9730_private *lp = dev->priv; unsigned long flags; int skblen; int len; @@ -912,8 +905,7 @@ static int lan_saa9730_close(struct net_device *dev) { - struct lan_saa9730_private *lp = - (struct lan_saa9730_private *) dev->priv; + struct lan_saa9730_private *lp = dev->priv; if (lan_saa9730_debug > 1) printk("lan_saa9730_close:\n"); @@ -935,16 +927,14 @@ static struct net_device_stats *lan_saa9730_get_stats(struct net_device *dev) { - struct lan_saa9730_private *lp = - (struct lan_saa9730_private *) dev->priv; + struct lan_saa9730_private *lp = dev->priv; return &lp->stats; } static void lan_saa9730_set_multicast(struct net_device *dev) { - struct lan_saa9730_private *lp = - (struct lan_saa9730_private *) dev->priv; + struct lan_saa9730_private *lp = dev->priv; /* Stop the controller */ lan_saa9730_stop(lp); diff -urN --exclude-from=/home/davej/.exclude linux/drivers/net/sb1000.c linux-dj/drivers/net/sb1000.c --- linux/drivers/net/sb1000.c Mon Mar 19 09:16:24 2001 +++ linux-dj/drivers/net/sb1000.c Mon Mar 19 09:29:15 2001 @@ -769,7 +769,7 @@ int ioaddr, ns; unsigned int skbsize; struct sk_buff *skb; - struct sb1000_private *lp = (struct sb1000_private *)dev->priv; + struct sb1000_private *lp = dev->priv; struct net_device_stats *stats = &lp->stats; /* SB1000 frame constants */ @@ -928,7 +928,7 @@ char *name; unsigned char st[5]; int ioaddr[2]; - struct sb1000_private *lp = (struct sb1000_private *)dev->priv; + struct sb1000_private *lp = dev->priv; const unsigned char Command0[6] = {0x80, 0x26, 0x00, 0x00, 0x00, 0x00}; const int ErrorDpcCounterInitialize = 200; @@ -955,7 +955,7 @@ { char *name; int ioaddr[2], status; - struct sb1000_private *lp = (struct sb1000_private *)dev->priv; + struct sb1000_private *lp = dev->priv; const unsigned short FirmwareVersion[] = {0x01, 0x01}; ioaddr[0] = dev->base_addr; @@ -1023,7 +1023,7 @@ short PID[4]; int ioaddr[2], status, frequency; unsigned int stats[5]; - struct sb1000_private *lp = (struct sb1000_private *)dev->priv; + struct sb1000_private *lp = dev->priv; if (!(dev && dev->flags & IFF_UP)) return -ENODEV; @@ -1116,8 +1116,8 @@ char *name; unsigned char st; int ioaddr[2]; - struct net_device *dev = (struct net_device *) dev_id; - struct sb1000_private *lp = (struct sb1000_private *)dev->priv; + struct net_device *dev = dev_id; + struct sb1000_private *lp = dev->priv; const unsigned char Command0[6] = {0x80, 0x2c, 0x00, 0x00, 0x00, 0x00}; const unsigned char Command1[6] = {0x80, 0x2e, 0x00, 0x00, 0x00, 0x00}; @@ -1173,7 +1173,7 @@ static struct net_device_stats *sb1000_stats(struct net_device *dev) { - struct sb1000_private *lp = (struct sb1000_private *)dev->priv; + struct sb1000_private *lp = dev->priv; return &lp->stats; } @@ -1181,7 +1181,7 @@ { int i; int ioaddr[2]; - struct sb1000_private *lp = (struct sb1000_private *)dev->priv; + struct sb1000_private *lp = dev->priv; if (sb1000_debug > 2) printk(KERN_DEBUG "%s: Shutting down sb1000.\n", dev->name); diff -urN --exclude-from=/home/davej/.exclude linux/drivers/net/seeq8005.c linux-dj/drivers/net/seeq8005.c --- linux/drivers/net/seeq8005.c Tue Feb 13 21:15:05 2001 +++ linux-dj/drivers/net/seeq8005.c Mon Mar 19 09:29:14 2001 @@ -346,7 +346,7 @@ */ static int seeq8005_open(struct net_device *dev) { - struct net_local *lp = (struct net_local *)dev->priv; + struct net_local *lp = dev->priv; { int irqval = request_irq(dev->irq, &seeq8005_interrupt, 0, "seeq8005", dev); @@ -379,7 +379,7 @@ static int seeq8005_send_packet(struct sk_buff *skb, struct net_device *dev) { - struct net_local *lp = (struct net_local *)dev->priv; + struct net_local *lp = dev->priv; short length = ETH_ZLEN < skb->len ? skb->len : ETH_ZLEN; unsigned char *buf = skb->data; @@ -404,7 +404,7 @@ int ioaddr, status, boguscount = 0; ioaddr = dev->base_addr; - lp = (struct net_local *)dev->priv; + lp = dev->priv; status = inw(SEEQ_STATUS); do { @@ -438,7 +438,7 @@ /* We have a good packet(s), get it/them out of the buffers. */ static void seeq8005_rx(struct net_device *dev) { - struct net_local *lp = (struct net_local *)dev->priv; + struct net_local *lp = dev->priv; int boguscount = 10; int pkt_hdr; int ioaddr = dev->base_addr; @@ -537,7 +537,7 @@ /* The inverse routine to net_open(). */ static int seeq8005_close(struct net_device *dev) { - struct net_local *lp = (struct net_local *)dev->priv; + struct net_local *lp = dev->priv; int ioaddr = dev->base_addr; lp->open_time = 0; @@ -559,7 +559,7 @@ closed. */ static struct net_device_stats *seeq8005_get_stats(struct net_device *dev) { - struct net_local *lp = (struct net_local *)dev->priv; + struct net_local *lp = dev->priv; return &lp->stats; } @@ -594,7 +594,7 @@ void seeq8005_init(struct net_device *dev, int startp) { - struct net_local *lp = (struct net_local *)dev->priv; + struct net_local *lp = dev->priv; int ioaddr = dev->base_addr; int i; diff -urN --exclude-from=/home/davej/.exclude linux/drivers/net/sgiseeq.c linux-dj/drivers/net/sgiseeq.c --- linux/drivers/net/sgiseeq.c Mon Mar 19 09:16:24 2001 +++ linux-dj/drivers/net/sgiseeq.c Mon Mar 19 23:21:07 2001 @@ -151,7 +151,7 @@ static int seeq_init_ring(struct net_device *dev) { - struct sgiseeq_private *sp = (struct sgiseeq_private *) dev->priv; + struct sgiseeq_private *sp = dev->priv; volatile struct sgiseeq_init_block *ib = &sp->srings; int i; @@ -172,7 +172,7 @@ if(!ib->tx_desc[i].tdma.pbuf) { unsigned long buffer; - buffer = (unsigned long) kmalloc(PKT_BUF_SZ, GFP_KERNEL); + buffer = kmalloc(PKT_BUF_SZ, GFP_KERNEL); if (!buffer) return -ENOMEM; ib->tx_desc[i].buf_vaddr = KSEG1ADDR(buffer); @@ -187,7 +187,7 @@ if (!ib->rx_desc[i].rdma.pbuf) { unsigned long buffer; - buffer = (unsigned long) kmalloc(PKT_BUF_SZ, GFP_KERNEL); + buffer = kmalloc(PKT_BUF_SZ, GFP_KERNEL); if (!buffer) return -ENOMEM; ib->rx_desc[i].buf_vaddr = KSEG1ADDR(buffer); @@ -424,8 +424,8 @@ static void sgiseeq_interrupt(int irq, void *dev_id, struct pt_regs *regs) { - struct net_device *dev = (struct net_device *) dev_id; - struct sgiseeq_private *sp = (struct sgiseeq_private *) dev->priv; + struct net_device *dev = dev_id; + struct sgiseeq_private *sp = dev->priv; volatile struct hpc3_ethregs *hregs = sp->hregs; volatile struct sgiseeq_regs *sregs = sp->sregs; @@ -446,7 +446,7 @@ static int sgiseeq_open(struct net_device *dev) { - struct sgiseeq_private *sp = (struct sgiseeq_private *)dev->priv; + struct sgiseeq_private *sp = dev->priv; volatile struct sgiseeq_regs *sregs = sp->sregs; unsigned long flags; int err; @@ -469,7 +469,7 @@ static int sgiseeq_close(struct net_device *dev) { - struct sgiseeq_private *sp = (struct sgiseeq_private *) dev->priv; + struct sgiseeq_private *sp = dev->priv; volatile struct sgiseeq_regs *sregs = sp->sregs; netif_stop_queue(dev); @@ -484,7 +484,7 @@ static inline int sgiseeq_reset(struct net_device *dev) { - struct sgiseeq_private *sp = (struct sgiseeq_private *) dev->priv; + struct sgiseeq_private *sp = dev->priv; volatile struct sgiseeq_regs *sregs = sp->sregs; int err; @@ -506,7 +506,7 @@ static int sgiseeq_start_xmit(struct sk_buff *skb, struct net_device *dev) { - struct sgiseeq_private *sp = (struct sgiseeq_private *) dev->priv; + struct sgiseeq_private *sp = dev->priv; volatile struct hpc3_ethregs *hregs = sp->hregs; unsigned long flags; struct sgiseeq_tx_desc *td; @@ -570,7 +570,7 @@ static struct net_device_stats *sgiseeq_get_stats(struct net_device *dev) { - struct sgiseeq_private *sp = (struct sgiseeq_private *) dev->priv; + struct sgiseeq_private *sp = dev->priv; return &sp->stats; } @@ -615,7 +615,7 @@ int i; struct sgiseeq_private *sp; - dev->priv = (struct sgiseeq_private *) get_free_page(GFP_KERNEL); + dev->priv = get_free_page(GFP_KERNEL); if (dev->priv == NULL) return -ENOMEM; @@ -631,7 +631,7 @@ printk("\n"); - sp = (struct sgiseeq_private *) dev->priv; + sp = dev->priv; #ifdef DEBUG gpriv = sp; gdev = dev; diff -urN --exclude-from=/home/davej/.exclude linux/drivers/net/sis900.c linux-dj/drivers/net/sis900.c --- linux/drivers/net/sis900.c Mon Mar 19 09:16:24 2001 +++ linux-dj/drivers/net/sis900.c Mon Mar 19 09:29:14 2001 @@ -355,7 +355,7 @@ static int __init sis900_mii_probe (struct net_device * net_dev) { - struct sis900_private * sis_priv = (struct sis900_private *)net_dev->priv; + struct sis900_private * sis_priv = net_dev->priv; int phy_addr; u8 revision; @@ -613,7 +613,7 @@ static int sis900_open(struct net_device *net_dev) { - struct sis900_private *sis_priv = (struct sis900_private *)net_dev->priv; + struct sis900_private *sis_priv = net_dev->priv; long ioaddr = net_dev->base_addr; u8 revision; int ret; @@ -706,7 +706,7 @@ static void sis900_init_tx_ring(struct net_device *net_dev) { - struct sis900_private *sis_priv = (struct sis900_private *)net_dev->priv; + struct sis900_private *sis_priv = net_dev->priv; long ioaddr = net_dev->base_addr; int i; @@ -740,7 +740,7 @@ static void sis900_init_rx_ring(struct net_device *net_dev) { - struct sis900_private *sis_priv = (struct sis900_private *)net_dev->priv; + struct sis900_private *sis_priv = net_dev->priv; long ioaddr = net_dev->base_addr; int i; @@ -811,7 +811,7 @@ static void sis630_set_eq(struct net_device *net_dev, u8 revision) { - struct sis900_private *sis_priv = (struct sis900_private *)net_dev->priv; + struct sis900_private *sis_priv = net_dev->priv; u16 reg14h, eq_value, max_value=0, min_value=0; u8 host_bridge_rev; int i, maxcount=10; @@ -878,7 +878,7 @@ static void sis900_timer(unsigned long data) { struct net_device *net_dev = (struct net_device *)data; - struct sis900_private *sis_priv = (struct sis900_private *)net_dev->priv; + struct sis900_private *sis_priv = net_dev->priv; struct mii_phy *mii_phy = sis_priv->mii; static int next_tick = 5*HZ; u16 status; @@ -955,7 +955,7 @@ static void sis900_check_mode (struct net_device *net_dev, struct mii_phy *mii_phy) { - struct sis900_private *sis_priv = (struct sis900_private *)net_dev->priv; + struct sis900_private *sis_priv = net_dev->priv; long ioaddr = net_dev->base_addr; int speed, duplex; u32 tx_flags = 0, rx_flags = 0; @@ -1174,7 +1174,7 @@ static void sis900_tx_timeout(struct net_device *net_dev) { - struct sis900_private *sis_priv = (struct sis900_private *)net_dev->priv; + struct sis900_private *sis_priv = net_dev->priv; long ioaddr = net_dev->base_addr; unsigned long flags; int i; @@ -1227,7 +1227,7 @@ static int sis900_start_xmit(struct sk_buff *skb, struct net_device *net_dev) { - struct sis900_private *sis_priv = (struct sis900_private *)net_dev->priv; + struct sis900_private *sis_priv = net_dev->priv; long ioaddr = net_dev->base_addr; unsigned int entry; unsigned long flags; @@ -1276,8 +1276,8 @@ static void sis900_interrupt(int irq, void *dev_instance, struct pt_regs *regs) { - struct net_device *net_dev = (struct net_device *)dev_instance; - struct sis900_private *sis_priv = (struct sis900_private *)net_dev->priv; + struct net_device *net_dev = dev_instance; + struct sis900_private *sis_priv = net_dev->priv; int boguscnt = max_interrupt_work; long ioaddr = net_dev->base_addr; u32 status; @@ -1335,7 +1335,7 @@ static int sis900_rx(struct net_device *net_dev) { - struct sis900_private *sis_priv = (struct sis900_private *)net_dev->priv; + struct sis900_private *sis_priv = net_dev->priv; long ioaddr = net_dev->base_addr; unsigned int entry = sis_priv->cur_rx % NUM_RX_DESC; u32 rx_status = sis_priv->rx_ring[entry].cmdsts; @@ -1464,7 +1464,7 @@ static void sis900_finish_xmit (struct net_device *net_dev) { - struct sis900_private *sis_priv = (struct sis900_private *)net_dev->priv; + struct sis900_private *sis_priv = net_dev->priv; for (; sis_priv->dirty_tx < sis_priv->cur_tx; sis_priv->dirty_tx++) { unsigned int entry; @@ -1529,7 +1529,7 @@ sis900_close(struct net_device *net_dev) { long ioaddr = net_dev->base_addr; - struct sis900_private *sis_priv = (struct sis900_private *)net_dev->priv; + struct sis900_private *sis_priv = net_dev->priv; int i; netif_stop_queue(net_dev); @@ -1573,7 +1573,7 @@ static int mii_ioctl(struct net_device *net_dev, struct ifreq *rq, int cmd) { - struct sis900_private *sis_priv = (struct sis900_private *)net_dev->priv; + struct sis900_private *sis_priv = net_dev->priv; u16 *data = (u16 *)&rq->ifr_data; switch(cmd) { @@ -1603,7 +1603,7 @@ static struct net_device_stats * sis900_get_stats(struct net_device *net_dev) { - struct sis900_private *sis_priv = (struct sis900_private *)net_dev->priv; + struct sis900_private *sis_priv = net_dev->priv; return &sis_priv->stats; } @@ -1620,7 +1620,7 @@ static int sis900_set_config(struct net_device *dev, struct ifmap *map) { - struct sis900_private *sis_priv = (struct sis900_private *)dev->priv; + struct sis900_private *sis_priv = dev->priv; struct mii_phy *mii_phy = sis_priv->mii; u16 status; diff -urN --exclude-from=/home/davej/.exclude linux/drivers/net/sk98lin/skge.c linux-dj/drivers/net/sk98lin/skge.c --- linux/drivers/net/sk98lin/skge.c Mon Mar 19 09:16:25 2001 +++ linux-dj/drivers/net/sk98lin/skge.c Mon Mar 19 23:22:33 2001 @@ -502,7 +502,7 @@ SK_AC *pAC; if (dev->priv) { - pAC = (SK_AC*) dev->priv; + pAC = dev->priv; AllocFlag = pAC->AllocFlag; if (AllocFlag & SK_ALLOC_IRQ) { free_irq(dev->irq, dev); @@ -653,7 +653,7 @@ SK_EVPARA EvPara; while (root_dev) { - pAC = (SK_AC*)root_dev->priv; + pAC = root_dev->priv; next = pAC->Next; netif_stop_queue(root_dev); @@ -1102,11 +1102,11 @@ */ static void SkGeIsr(int irq, void *dev_id, struct pt_regs *ptregs) { -struct net_device *dev = (struct net_device *)dev_id; +struct net_device *dev = dev_id; SK_AC *pAC; SK_U32 IntSrc; /* interrupts source register contents */ - pAC = (SK_AC*) dev->priv; + pAC = dev->priv; /* * Check and process if its our interrupt @@ -1256,11 +1256,11 @@ */ static void SkGeIsrOnePort(int irq, void *dev_id, struct pt_regs *ptregs) { -struct net_device *dev = (struct net_device *)dev_id; +struct net_device *dev = dev_id; SK_AC *pAC; SK_U32 IntSrc; /* interrupts source register contents */ - pAC = (SK_AC*) dev->priv; + pAC = dev->priv; /* * Check and process if its our interrupt @@ -1381,7 +1381,7 @@ int i; SK_EVPARA EvPara; /* an event parameter union */ - pAC = (SK_AC*) dev->priv; + pAC = dev->priv; SK_DBG_MSG(NULL, SK_DBGMOD_DRV, SK_DBGCAT_DRV_ENTRY, ("SkGeOpen: pAC=0x%lX:\n", (unsigned long)pAC)); @@ -1474,7 +1474,7 @@ netif_stop_queue(dev); - pAC = (SK_AC*) dev->priv; + pAC = dev->priv; SK_DBG_MSG(NULL, SK_DBGMOD_DRV, SK_DBGCAT_DRV_ENTRY, ("SkGeClose: pAC=0x%lX ", (unsigned long)pAC)); @@ -1534,7 +1534,7 @@ SK_AC *pAC; int Rc; /* return code of XmitFrame */ - pAC = (SK_AC*) dev->priv; + pAC = dev->priv; Rc = XmitFrame(pAC, &pAC->TxPort[pAC->ActivePort][TX_PRIO_LOW], skb); @@ -2316,7 +2316,7 @@ */ static int SkGeSetMacAddr(struct net_device *dev, void *p) { -SK_AC *pAC = (SK_AC*) dev->priv; +SK_AC *pAC = dev->priv; struct sockaddr *addr = p; unsigned int Flags; @@ -2359,7 +2359,7 @@ SK_DBG_MSG(NULL, SK_DBGMOD_DRV, SK_DBGCAT_DRV_ENTRY, ("SkGeSetRxMode starts now... ")); - pAC = (SK_AC*) dev->priv; + pAC = dev->priv; spin_lock_irqsave(&pAC->SlowPathLock, Flags); if (dev->flags & IFF_PROMISC) { @@ -2425,7 +2425,7 @@ SK_DBG_MSG(NULL, SK_DBGMOD_DRV, SK_DBGCAT_DRV_ENTRY, ("SkGeChangeMtu starts now...\n")); - pAC = (SK_AC*) dev->priv; + pAC = dev->priv; if ((NewMtu < 68) || (NewMtu > SK_JUMBO_MTU)) { return -EINVAL; } @@ -2568,7 +2568,7 @@ */ static struct net_device_stats *SkGeStats(struct net_device *dev) { -SK_AC *pAC = (SK_AC*) dev->priv; +SK_AC *pAC = dev->priv; SK_PNMI_STRUCT_DATA *pPnmiStruct; /* structure for all Pnmi-Data */ SK_PNMI_STAT *pPnmiStat; /* pointer to virtual XMAC stat. data */SK_PNMI_CONF *pPnmiConf; /* pointer to virtual link config. */ unsigned int Size; /* size of pnmi struct */ @@ -2637,7 +2637,7 @@ SK_DBG_MSG(NULL, SK_DBGMOD_DRV, SK_DBGCAT_DRV_ENTRY, ("SkGeIoctl starts now...\n")); - pAC = (SK_AC*) dev->priv; + pAC = dev->priv; if(copy_from_user(&Ioctl, rq->ifr_data, sizeof(SK_GE_IOCTL))) { return -EFAULT; diff -urN --exclude-from=/home/davej/.exclude linux/drivers/net/sk_g16.c linux-dj/drivers/net/sk_g16.c --- linux/drivers/net/sk_g16.c Mon Mar 19 09:16:25 2001 +++ linux-dj/drivers/net/sk_g16.c Mon Mar 19 09:29:15 2001 @@ -840,7 +840,7 @@ dev->dev_addr[5]); /* Allocate memory for private structure */ - p = dev->priv = (void *) kmalloc(sizeof(struct priv), GFP_KERNEL); + p = dev->priv = kmalloc(sizeof(struct priv), GFP_KERNEL); if (p == NULL) { printk("%s: ERROR - no memory for driver data!\n", dev->name); return -ENOMEM; @@ -927,7 +927,7 @@ int irqtab[] = SK_IRQS; - struct priv *p = (struct priv *)dev->priv; + struct priv *p = dev->priv; PRINTK(("## %s: At beginning of SK_open(). CSR0: %#06x\n", SK_NAME, SK_read_reg(CSR0))); @@ -1081,7 +1081,7 @@ { int i; unsigned long flags; - struct priv *p = (struct priv *) dev->priv; + struct priv *p = dev->priv; struct tmd *tmdp; struct rmd *rmdp; @@ -1254,7 +1254,7 @@ static int SK_send_packet(struct sk_buff *skb, struct net_device *dev) { - struct priv *p = (struct priv *) dev->priv; + struct priv *p = dev->priv; struct tmd *tmdp; PRINTK2(("## %s: SK_send_packet() called, CSR0 %#04x.\n", @@ -1340,7 +1340,7 @@ { int csr0; struct net_device *dev = dev_id; - struct priv *p = (struct priv *) dev->priv; + struct priv *p = dev->priv; PRINTK2(("## %s: SK_interrupt(). status: %#06x\n", @@ -1409,7 +1409,7 @@ { int tmdstat; struct tmd *tmdp; - struct priv *p = (struct priv *) dev->priv; + struct priv *p = dev->priv; PRINTK2(("## %s: SK_txintr() status: %#06x\n", @@ -1523,7 +1523,7 @@ struct rmd *rmdp; int rmdstat; - struct priv *p = (struct priv *) dev->priv; + struct priv *p = dev->priv; PRINTK2(("## %s: SK_rxintr(). CSR0: %#06x\n", SK_NAME, SK_read_reg(CSR0))); @@ -1707,7 +1707,7 @@ static struct net_device_stats *SK_get_stats(struct net_device *dev) { - struct priv *p = (struct priv *) dev->priv; + struct priv *p = dev->priv; PRINTK(("## %s: SK_get_stats(). CSR0: %#06x\n", SK_NAME, SK_read_reg(CSR0))); @@ -2084,7 +2084,7 @@ { int i; - struct priv *p = (struct priv *) dev->priv; + struct priv *p = dev->priv; printk("## %s: RAM Details.\n" "## RAM at %#08x tmdhead: %#08x rmdhead: %#08x initblock: %#08x\n", diff -urN --exclude-from=/home/davej/.exclude linux/drivers/net/sk_mca.c linux-dj/drivers/net/sk_mca.c --- linux/drivers/net/sk_mca.c Tue Feb 13 21:15:05 2001 +++ linux-dj/drivers/net/sk_mca.c Mon Mar 19 23:23:00 2001 @@ -220,7 +220,7 @@ static void ResetBoard(struct SKMCA_NETDEV *dev) { - skmca_priv *priv = (skmca_priv *) dev->priv; + skmca_priv *priv = dev->priv; SKMCA_WRITEB(CTRL_RESET_ON, priv->ctrladdr); udelay(10); @@ -231,7 +231,7 @@ static int WaitLANCE(struct SKMCA_NETDEV *dev) { - skmca_priv *priv = (skmca_priv *) dev->priv; + skmca_priv *priv = dev->priv; int t = 0; while ((SKMCA_READB(priv->ctrladdr) & STAT_IO_BUSY) == @@ -250,7 +250,7 @@ static void SetLANCE(struct SKMCA_NETDEV *dev, u16 addr, u16 value) { - skmca_priv *priv = (skmca_priv *) dev->priv; + skmca_priv *priv = dev->priv; unsigned long flags; /* disable interrupts */ @@ -289,7 +289,7 @@ static u16 GetLANCE(struct SKMCA_NETDEV *dev, u16 addr) { - skmca_priv *priv = (skmca_priv *) dev->priv; + skmca_priv *priv = dev->priv; unsigned long flags; unsigned int res; @@ -427,7 +427,7 @@ static void InitLANCE(struct SKMCA_NETDEV *dev) { - skmca_priv *priv = (skmca_priv *) dev->priv; + skmca_priv *priv = dev->priv; /* build up descriptors. */ @@ -586,7 +586,7 @@ static u16 irqmiss_handler(struct SKMCA_NETDEV *dev, u16 oldcsr0) { - skmca_priv *priv = (skmca_priv *) dev->priv; + skmca_priv *priv = dev->priv; /* update statistics */ @@ -602,7 +602,7 @@ static u16 irqrx_handler(struct SKMCA_NETDEV *dev, u16 oldcsr0) { - skmca_priv *priv = (skmca_priv *) dev->priv; + skmca_priv *priv = dev->priv; LANCE_RxDescr descr; unsigned int descraddr; @@ -685,7 +685,7 @@ static u16 irqtx_handler(struct SKMCA_NETDEV *dev, u16 oldcsr0) { - skmca_priv *priv = (skmca_priv *) dev->priv; + skmca_priv *priv = dev->priv; LANCE_TxDescr descr; unsigned int descraddr; @@ -761,7 +761,7 @@ static void irq_handler(int irq, void *device, struct pt_regs *regs) { - struct SKMCA_NETDEV *dev = (struct SKMCA_NETDEV *) device; + struct SKMCA_NETDEV *dev = device; u16 csr0val; /* read CSR0 to get interrupt cause */ @@ -821,7 +821,7 @@ static int skmca_getinfo(char *buf, int slot, void *d) { int len = 0, i; - struct SKMCA_NETDEV *dev = (struct SKMCA_NETDEV *) d; + struct SKMCA_NETDEV *dev = d; skmca_priv *priv; /* can't say anything about an uninitialized device... */ @@ -830,7 +830,7 @@ return len; if (dev->priv == NULL) return len; - priv = (skmca_priv *) dev->priv; + priv = dev->priv; /* print info */ @@ -855,7 +855,7 @@ static int skmca_open(struct SKMCA_NETDEV *dev) { int result; - skmca_priv *priv = (skmca_priv *) dev->priv; + skmca_priv *priv = dev->priv; /* register resources - only necessary for IRQ */ result = @@ -909,7 +909,7 @@ static int skmca_tx(struct sk_buff *skb, struct SKMCA_NETDEV *dev) { - skmca_priv *priv = (skmca_priv *) dev->priv; + skmca_priv *priv = dev->priv; LANCE_TxDescr descr; unsigned int address; int tmplen, retval = 0; @@ -1016,7 +1016,7 @@ static struct net_device_stats *skmca_stats(struct SKMCA_NETDEV *dev) { - skmca_priv *priv = (skmca_priv *) dev->priv; + skmca_priv *priv = dev->priv; return &(priv->stat); } @@ -1282,7 +1282,7 @@ for (z = 0; z < DEVMAX; z++) { dev = moddevs + z; if (dev->priv != NULL) { - priv = (skmca_priv *) dev->priv; + priv = dev->priv; DeinitBoard(dev); if (dev->irq != 0) free_irq(dev->irq, dev); diff -urN --exclude-from=/home/davej/.exclude linux/drivers/net/skfp/skfddi.c linux-dj/drivers/net/skfp/skfddi.c --- linux/drivers/net/skfp/skfddi.c Mon Mar 19 09:16:25 2001 +++ linux-dj/drivers/net/skfp/skfddi.c Mon Mar 19 23:57:51 2001 @@ -386,7 +386,7 @@ /* Initialize board structure with bus-specific info */ - smc = (struct s_smc *) dev->priv; + smc = dev->priv; smc->os.dev = dev; smc->os.bus_type = SK_BUS_TYPE_PCI; smc->os.pdev = *pdev; @@ -493,8 +493,7 @@ if (dev) { if (!dev->priv) { /* Allocate space for private board structure */ - dev->priv = (void *) kmalloc(sizeof(struct s_smc), - GFP_KERNEL); + dev->priv = kmalloc(sizeof(struct s_smc), GFP_KERNEL); if (dev->priv == NULL) { printk("%s: Could not allocate memory for", dev->name); @@ -569,7 +568,7 @@ return NULL; } else { memset((char *) new, 0, len); - new->priv = (struct s_smc *) (new + 1); + new->priv = new + 1; new->init = init; /* initialisation routine */ if (!loading_module) { new->next = dev->next; @@ -659,7 +658,7 @@ */ static int skfp_driver_init(struct net_device *dev) { - struct s_smc *smc = (struct s_smc *) dev->priv; + struct s_smc *smc = dev->priv; skfddi_priv *bp = PRIV(dev); u8 val; /* used for I/O read/writes */ @@ -769,7 +768,7 @@ */ static int skfp_open(struct net_device *dev) { - struct s_smc *smc = (struct s_smc *) dev->priv; + struct s_smc *smc = dev->priv; PRINTK(KERN_INFO "entering skfp_open\n"); /* Register IRQ - support shared interrupts by passing device ptr */ @@ -836,7 +835,7 @@ */ static int skfp_close(struct net_device *dev) { - struct s_smc *smc = (struct s_smc *) dev->priv; + struct s_smc *smc = dev->priv; struct sk_buff *skb; skfddi_priv *bp = PRIV(dev); @@ -902,7 +901,7 @@ void skfp_interrupt(int irq, void *dev_id, struct pt_regs *regs) { - struct net_device *dev = (struct net_device *) dev_id; + struct net_device *dev = dev_id; struct s_smc *smc; /* private board structure pointer */ skfddi_priv *bp = PRIV(dev); @@ -912,7 +911,7 @@ return; } - smc = (struct s_smc *) dev->priv; + smc = dev->priv; // IRQs enabled or disabled ? if (inpd(ADDR(B0_IMSK)) == 0) { @@ -974,7 +973,7 @@ */ struct net_device_stats *skfp_ctl_get_stats(struct net_device *dev) { - struct s_smc *bp = (struct s_smc *) dev->priv; + struct s_smc *bp = dev->priv; /* Fill the bp->stats structure with driver-maintained counters */ @@ -1151,7 +1150,7 @@ static void skfp_ctl_set_multicast_list_wo_lock(struct net_device *dev) { - struct s_smc *smc = (struct s_smc *) dev->priv; + struct s_smc *smc = dev->priv; struct dev_mc_list *dmi; /* ptr to multicast addr entry */ int i; @@ -1232,8 +1231,8 @@ */ static int skfp_ctl_set_mac_address(struct net_device *dev, void *addr) { - struct s_smc *smc = (struct s_smc *) dev->priv; - struct sockaddr *p_sockaddr = (struct sockaddr *) addr; + struct s_smc *smc = dev->priv; + struct sockaddr *p_sockaddr = addr; skfddi_priv *bp = (skfddi_priv *) & smc->os; unsigned long Flags; @@ -1373,7 +1372,7 @@ } bp->QueueSkb--; skb_queue_tail(&bp->SendSkbQueue, skb); - send_queued_packets((struct s_smc *) dev->priv); + send_queued_packets(dev->priv); if (bp->QueueSkb == 0) { netif_stop_queue(dev); } @@ -2616,7 +2615,7 @@ struct net_device *next = NULL; if (p->priv) { /* Private areas allocated? */ - struct s_smc *lp = (struct s_smc *) p->priv; + struct s_smc *lp = p->priv; next = lp->os.next_module; diff -urN --exclude-from=/home/davej/.exclude linux/drivers/net/slhc.c linux-dj/drivers/net/slhc.c --- linux/drivers/net/slhc.c Mon Mar 19 09:16:25 2001 +++ linux-dj/drivers/net/slhc.c Mon Mar 19 09:29:19 2001 @@ -97,15 +97,14 @@ struct slcompress *comp; MOD_INC_USE_COUNT; - comp = (struct slcompress *)kmalloc(sizeof(struct slcompress), - GFP_KERNEL); + comp = kmalloc(sizeof(struct slcompress), GFP_KERNEL); if (! comp) goto out_fail; memset(comp, 0, sizeof(struct slcompress)); if ( rslots > 0 && rslots < 256 ) { size_t rsize = rslots * sizeof(struct cstate); - comp->rstate = (struct cstate *) kmalloc(rsize, GFP_KERNEL); + comp->rstate = kmalloc(rsize, GFP_KERNEL); if (! comp->rstate) goto out_free; memset(comp->rstate, 0, rsize); @@ -114,7 +113,7 @@ if ( tslots > 0 && tslots < 256 ) { size_t tsize = tslots * sizeof(struct cstate); - comp->tstate = (struct cstate *) kmalloc(tsize, GFP_KERNEL); + comp->tstate = kmalloc(tsize, GFP_KERNEL); if (! comp->tstate) goto out_free2; memset(comp->tstate, 0, tsize); diff -urN --exclude-from=/home/davej/.exclude linux/drivers/net/slip.c linux-dj/drivers/net/slip.c --- linux/drivers/net/slip.c Tue Feb 13 21:15:05 2001 +++ linux-dj/drivers/net/slip.c Mon Mar 19 09:29:19 2001 @@ -468,12 +468,12 @@ static void sl_tx_timeout(struct net_device *dev) { - struct slip *sl = (struct slip*)(dev->priv); + struct slip *sl = dev->priv; spin_lock(&sl->lock); if (netif_queue_stopped(dev)) { - struct slip *sl = (struct slip*)(dev->priv); + struct slip *sl = dev->priv; if (!netif_running(dev)) goto out; @@ -504,7 +504,7 @@ static int sl_xmit(struct sk_buff *skb, struct net_device *dev) { - struct slip *sl = (struct slip*)(dev->priv); + struct slip *sl = dev->priv; spin_lock(&sl->lock); if (!netif_running(dev)) { @@ -538,7 +538,7 @@ static int sl_close(struct net_device *dev) { - struct slip *sl = (struct slip*)(dev->priv); + struct slip *sl = dev->priv; spin_lock_bh(&sl->lock); if (sl->tty) { @@ -557,7 +557,7 @@ static int sl_open(struct net_device *dev) { - struct slip *sl = (struct slip*)(dev->priv); + struct slip *sl = dev->priv; if (sl->tty==NULL) return -ENODEV; @@ -571,7 +571,7 @@ static int sl_change_mtu(struct net_device *dev, int new_mtu) { - struct slip *sl = (struct slip*)(dev->priv); + struct slip *sl = dev->priv; if (new_mtu < 68 || new_mtu > 65534) return -EINVAL; @@ -587,7 +587,7 @@ sl_get_stats(struct net_device *dev) { static struct net_device_stats stats; - struct slip *sl = (struct slip*)(dev->priv); + struct slip *sl = dev->priv; #ifdef SL_INCLUDE_CSLIP struct slcompress *comp; #endif @@ -622,7 +622,7 @@ static int sl_init(struct net_device *dev) { - struct slip *sl = (struct slip*)(dev->priv); + struct slip *sl = dev->priv; /* * Finish setting up the DEVICE info. @@ -1246,7 +1246,7 @@ static int sl_ioctl(struct net_device *dev,struct ifreq *rq,int cmd) { - struct slip *sl = (struct slip*)(dev->priv); + struct slip *sl = dev->priv; if (sl == NULL) /* Allocation failed ?? */ return -ENODEV; diff -urN --exclude-from=/home/davej/.exclude linux/drivers/net/smc9194.c linux-dj/drivers/net/smc9194.c --- linux/drivers/net/smc9194.c Mon Mar 19 09:16:25 2001 +++ linux-dj/drivers/net/smc9194.c Mon Mar 19 09:29:21 2001 @@ -492,7 +492,7 @@ */ static int smc_wait_to_send_packet( struct sk_buff * skb, struct net_device * dev ) { - struct smc_local *lp = (struct smc_local *)dev->priv; + struct smc_local *lp = dev->priv; unsigned short ioaddr = dev->base_addr; word length; unsigned short numPages; @@ -595,7 +595,7 @@ */ static void smc_hardware_send_packet( struct net_device * dev ) { - struct smc_local *lp = (struct smc_local *)dev->priv; + struct smc_local *lp = dev->priv; byte packet_no; struct sk_buff * skb = lp->saved_skb; word length; @@ -1170,7 +1170,7 @@ { struct net_device *dev = dev_id; int ioaddr = dev->base_addr; - struct smc_local *lp = (struct smc_local *)dev->priv; + struct smc_local *lp = dev->priv; byte status; word card_stats; @@ -1292,7 +1292,7 @@ */ static void smc_rcv(struct net_device *dev) { - struct smc_local *lp = (struct smc_local *)dev->priv; + struct smc_local *lp = dev->priv; int ioaddr = dev->base_addr; int packet_number; word status; @@ -1424,7 +1424,7 @@ static void smc_tx( struct net_device * dev ) { int ioaddr = dev->base_addr; - struct smc_local *lp = (struct smc_local *)dev->priv; + struct smc_local *lp = dev->priv; byte saved_packet; byte packet_no; word tx_status; @@ -1497,7 +1497,7 @@ . This may be called with the card open or closed. .-------------------------------------------------------------*/ static struct net_device_stats* smc_query_statistics(struct net_device *dev) { - struct smc_local *lp = (struct smc_local *)dev->priv; + struct smc_local *lp = dev->priv; return &lp->stats; } diff -urN --exclude-from=/home/davej/.exclude linux/drivers/net/sonic.c linux-dj/drivers/net/sonic.c --- linux/drivers/net/sonic.c Tue Feb 13 21:15:05 2001 +++ linux-dj/drivers/net/sonic.c Mon Mar 19 09:29:15 2001 @@ -95,7 +95,7 @@ */ static int sonic_send_packet(struct sk_buff *skb, struct net_device *dev) { - struct sonic_local *lp = (struct sonic_local *)dev->priv; + struct sonic_local *lp = dev->priv; unsigned int base_addr = dev->base_addr; unsigned int laddr; int entry,length; @@ -183,7 +183,7 @@ static void sonic_interrupt(int irq, void *dev_id, struct pt_regs * regs) { - struct net_device *dev = (struct net_device *)dev_id; + struct net_device *dev = dev_id; unsigned int base_addr = dev->base_addr; struct sonic_local *lp; int status; @@ -193,7 +193,7 @@ return; } dev->interrupt = 1; - lp = (struct sonic_local *)dev->priv; + lp = dev->priv; status = SONIC_READ(SONIC_ISR); SONIC_WRITE(SONIC_ISR,0x7fff); /* clear all bits */ @@ -304,7 +304,7 @@ sonic_rx(struct net_device *dev) { unsigned int base_addr = dev->base_addr; - struct sonic_local *lp = (struct sonic_local *)dev->priv; + struct sonic_local *lp = dev->priv; sonic_rd_t *rd = &lp->rda[lp->cur_rx & SONIC_RDS_MASK]; int status; @@ -381,7 +381,7 @@ static struct net_device_stats * sonic_get_stats(struct net_device *dev) { - struct sonic_local *lp = (struct sonic_local *)dev->priv; + struct sonic_local *lp = dev->priv; unsigned int base_addr = dev->base_addr; /* read the tally counter from the SONIC and reset them */ @@ -402,7 +402,7 @@ static void sonic_multicast_list(struct net_device *dev) { - struct sonic_local *lp = (struct sonic_local *)dev->priv; + struct sonic_local *lp = dev->priv; unsigned int base_addr = dev->base_addr; unsigned int rcr; struct dev_mc_list *dmi = dev->mc_list; @@ -450,7 +450,7 @@ { unsigned int base_addr = dev->base_addr; unsigned int cmd; - struct sonic_local *lp = (struct sonic_local *)dev->priv; + struct sonic_local *lp = dev->priv; unsigned int rra_start; unsigned int rra_end; int i; diff -urN --exclude-from=/home/davej/.exclude linux/drivers/net/strip.c linux-dj/drivers/net/strip.c --- linux/drivers/net/strip.c Sun Feb 4 18:05:30 2001 +++ linux-dj/drivers/net/strip.c Mon Mar 19 23:26:50 2001 @@ -1638,7 +1638,7 @@ /* Encapsulate a datagram and kick it into a TTY queue. */ static int strip_xmit(struct sk_buff *skb, struct net_device *dev) { - struct strip *strip_info = (struct strip *)(dev->priv); + struct strip *strip_info = dev->priv; if (!netif_running(dev)) { @@ -1713,7 +1713,7 @@ static int strip_header(struct sk_buff *skb, struct net_device *dev, unsigned short type, void *daddr, void *saddr, unsigned len) { - struct strip *strip_info = (struct strip *)(dev->priv); + struct strip *strip_info = dev->priv; STRIP_Header *header = (STRIP_Header *)skb_push(skb, sizeof(STRIP_Header)); /*printk(KERN_INFO "%s: strip_header 0x%04X %s\n", dev->name, type, @@ -1722,7 +1722,7 @@ header->src_addr = strip_info->true_dev_addr; header->protocol = htons(type); - /*HexDump("strip_header", (struct strip *)(dev->priv), skb->data, skb->data + skb->len);*/ + /*HexDump("strip_header", dev->priv, skb->data, skb->data + skb->len);*/ if (!daddr) return(-dev->hard_header_len); @@ -2420,7 +2420,7 @@ static int dev_set_mac_address(struct net_device *dev, void *addr) { - struct strip *strip_info = (struct strip *)(dev->priv); + struct strip *strip_info = dev->priv; struct sockaddr *sa = addr; printk(KERN_INFO "%s: strip_set_dev_mac_address called\n", dev->name); set_mac_address(strip_info, (MetricomAddress *)sa->sa_data); @@ -2430,7 +2430,7 @@ static struct net_device_stats *strip_get_stats(struct net_device *dev) { static struct net_device_stats stats; - struct strip *strip_info = (struct strip *)(dev->priv); + struct strip *strip_info = dev->priv; memset(&stats, 0, sizeof(struct net_device_stats)); @@ -2474,7 +2474,7 @@ static int strip_open_low(struct net_device *dev) { - struct strip *strip_info = (struct strip *)(dev->priv); + struct strip *strip_info = dev->priv; #if 0 struct in_device *in_dev = dev->ip_ptr; #endif @@ -2520,7 +2520,7 @@ static int strip_close_low(struct net_device *dev) { - struct strip *strip_info = (struct strip *)(dev->priv); + struct strip *strip_info = dev->priv; if (strip_info->tty == NULL) return -EBUSY; @@ -2612,7 +2612,7 @@ { int channel_id = 0; struct strip **s = &struct_strip_list; - struct strip *strip_info = (struct strip *) + struct strip *strip_info = kmalloc(sizeof(struct strip), GFP_KERNEL); if (!strip_info) diff -urN --exclude-from=/home/davej/.exclude linux/drivers/net/sun3lance.c linux-dj/drivers/net/sun3lance.c --- linux/drivers/net/sun3lance.c Mon Mar 19 09:16:25 2001 +++ linux-dj/drivers/net/sun3lance.c Mon Mar 19 09:29:17 2001 @@ -308,7 +308,7 @@ if (!dev->priv) return 0; } - lp = (struct lance_private *)dev->priv; + lp = dev->priv; MEM = (struct lance_memory *)sun3_dvma_malloc(sizeof(struct lance_memory)); lp->iobase = (volatile unsigned short *)ioaddr; @@ -377,7 +377,7 @@ static int lance_open( struct net_device *dev ) { - struct lance_private *lp = (struct lance_private *)dev->priv; + struct lance_private *lp = dev->priv; int i; DPRINTK( 2, ( "%s: lance_open()\n", dev->name )); @@ -423,7 +423,7 @@ static void lance_init_ring( struct net_device *dev ) { - struct lance_private *lp = (struct lance_private *)dev->priv; + struct lance_private *lp = dev->priv; int i; lp->lock = 0; @@ -454,7 +454,7 @@ static int lance_start_xmit( struct sk_buff *skb, struct net_device *dev ) { - struct lance_private *lp = (struct lance_private *)dev->priv; + struct lance_private *lp = dev->priv; int entry, len; struct lance_tx_head *head; unsigned long flags; @@ -708,7 +708,7 @@ /* get packet, toss into skbuff */ static int lance_rx( struct net_device *dev ) { - struct lance_private *lp = (struct lance_private *)dev->priv; + struct lance_private *lp = dev->priv; int entry = lp->new_rx; /* If we own the next entry, it's a new packet. Send it up. */ @@ -806,7 +806,7 @@ static int lance_close( struct net_device *dev ) { - struct lance_private *lp = (struct lance_private *)dev->priv; + struct lance_private *lp = dev->priv; netif_stop_queue(dev); @@ -826,7 +826,7 @@ static struct net_device_stats *lance_get_stats( struct net_device *dev ) { - struct lance_private *lp = (struct lance_private *)dev->priv; + struct lance_private *lp = dev->priv; return &lp->stats; } @@ -842,7 +842,7 @@ /* completely untested on a sun3 */ static void set_multicast_list( struct net_device *dev ) { - struct lance_private *lp = (struct lance_private *)dev->priv; + struct lance_private *lp = dev->priv; if(netif_queue_stopped(dev)) /* Only possible if board is already started */ diff -urN --exclude-from=/home/davej/.exclude linux/drivers/net/sunbmac.c linux-dj/drivers/net/sunbmac.c --- linux/drivers/net/sunbmac.c Mon Mar 19 09:16:25 2001 +++ linux-dj/drivers/net/sunbmac.c Mon Mar 19 09:29:11 2001 @@ -878,7 +878,7 @@ static void bigmac_interrupt(int irq, void *dev_id, struct pt_regs *regs) { - struct bigmac *bp = (struct bigmac *) dev_id; + struct bigmac *bp = dev_id; u32 qec_status, bmac_status; DIRQ(("bigmac_interrupt: ")); @@ -901,7 +901,7 @@ static int bigmac_open(struct net_device *dev) { - struct bigmac *bp = (struct bigmac *) dev->priv; + struct bigmac *bp = dev->priv; int ret; ret = request_irq(dev->irq, &bigmac_interrupt, SA_SHIRQ, dev->name, bp); @@ -915,7 +915,7 @@ static int bigmac_close(struct net_device *dev) { - struct bigmac *bp = (struct bigmac *) dev->priv; + struct bigmac *bp = dev->priv; del_timer(&bp->bigmac_timer); bp->timer_state = asleep; @@ -929,7 +929,7 @@ static void bigmac_tx_timeout(struct net_device *dev) { - struct bigmac *bp = (struct bigmac *) dev->priv; + struct bigmac *bp = dev->priv; bigmac_init(bp, 0); netif_wake_queue(dev); @@ -938,7 +938,7 @@ /* Put a packet on the wire. */ static int bigmac_start_xmit(struct sk_buff *skb, struct net_device *dev) { - struct bigmac *bp = (struct bigmac *) dev->priv; + struct bigmac *bp = dev->priv; int len, entry; u32 mapping; @@ -970,7 +970,7 @@ static struct net_device_stats *bigmac_get_stats(struct net_device *dev) { - struct bigmac *bp = (struct bigmac *) dev->priv; + struct bigmac *bp = dev->priv; bigmac_get_counters(bp, bp->bregs); return &bp->enet_stats; @@ -981,7 +981,7 @@ static void bigmac_set_multicast(struct net_device *dev) { - struct bigmac *bp = (struct bigmac *) dev->priv; + struct bigmac *bp = dev->priv; unsigned long bregs = bp->bregs; struct dev_mc_list *dmi = dev->mc_list; char *addrs; diff -urN --exclude-from=/home/davej/.exclude linux/drivers/net/sunhme.c linux-dj/drivers/net/sunhme.c --- linux/drivers/net/sunhme.c Mon Mar 19 09:16:25 2001 +++ linux-dj/drivers/net/sunhme.c Mon Mar 19 23:27:36 2001 @@ -2133,8 +2133,8 @@ static void happy_meal_interrupt(int irq, void *dev_id, struct pt_regs *regs) { - struct net_device *dev = (struct net_device *) dev_id; - struct happy_meal *hp = (struct happy_meal *) dev->priv; + struct net_device *dev = dev_id; + struct happy_meal *hp = dev->priv; u32 happy_status = hme_read32(hp, hp->gregs + GREG_STAT); HMD(("happy_meal_interrupt: status=%08x ", happy_status)); @@ -2171,7 +2171,7 @@ for (i = 0; i < 4; i++) { struct net_device *dev = qp->happy_meals[i]; - struct happy_meal *hp = (struct happy_meal *) dev->priv; + struct happy_meal *hp = dev->priv; u32 happy_status = hme_read32(hp, hp->gregs + GREG_STAT); HMD(("quattro_interrupt: status=%08x ", happy_status)); @@ -2209,7 +2209,7 @@ static int happy_meal_open(struct net_device *dev) { - struct happy_meal *hp = (struct happy_meal *) dev->priv; + struct happy_meal *hp = dev->priv; HMD(("happy_meal_open: ")); @@ -2238,7 +2238,7 @@ static int happy_meal_close(struct net_device *dev) { - struct happy_meal *hp = (struct happy_meal *) dev->priv; + struct happy_meal *hp = dev->priv; happy_meal_stop(hp, hp->gregs); happy_meal_clean_rings(hp); @@ -2265,7 +2265,7 @@ #ifdef CONFIG_SBUS static void happy_meal_tx_timeout(struct net_device *dev) { - struct happy_meal *hp = (struct happy_meal *) dev->priv; + struct happy_meal *hp = dev->priv; printk (KERN_ERR "%s: transmit timed out, resetting\n", dev->name); tx_dump_log(); @@ -2280,7 +2280,7 @@ static int happy_meal_start_xmit(struct sk_buff *skb, struct net_device *dev) { - struct happy_meal *hp = (struct happy_meal *) dev->priv; + struct happy_meal *hp = dev->priv; int entry; u32 tx_flags; @@ -2369,7 +2369,7 @@ static struct net_device_stats *happy_meal_get_stats(struct net_device *dev) { - struct happy_meal *hp = (struct happy_meal *) dev->priv; + struct happy_meal *hp = dev->priv; happy_meal_get_counters(hp, hp->bigmacregs); return &hp->net_stats; @@ -2377,7 +2377,7 @@ static void happy_meal_set_multicast(struct net_device *dev) { - struct happy_meal *hp = (struct happy_meal *) dev->priv; + struct happy_meal *hp = dev->priv; unsigned long bregs = hp->bigmacregs; struct dev_mc_list *dmi = dev->mc_list; char *addrs; @@ -2436,7 +2436,7 @@ static int happy_meal_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) { - struct happy_meal *hp = (struct happy_meal *) dev->priv; + struct happy_meal *hp = dev->priv; struct ethtool_cmd *ep_user = (struct ethtool_cmd *) rq->ifr_data; struct ethtool_cmd ecmd; @@ -2720,7 +2720,7 @@ dev->dev_addr[i], i == 5 ? ' ' : ':'); printk("\n"); - hp = (struct happy_meal *) dev->priv; + hp = dev->priv; memset(hp, 0, sizeof(*hp)); hp->happy_dev = sdev; @@ -2926,7 +2926,7 @@ dev->base_addr = (long) pdev; - hp = (struct happy_meal *)dev->priv; + hp = dev->priv; memset(hp, 0, sizeof(*hp)); hp->happy_dev = pdev; diff -urN --exclude-from=/home/davej/.exclude linux/drivers/net/sunlance.c linux-dj/drivers/net/sunlance.c --- linux/drivers/net/sunlance.c Mon Mar 19 09:16:25 2001 +++ linux-dj/drivers/net/sunlance.c Mon Mar 19 09:29:20 2001 @@ -317,7 +317,7 @@ /* Setup the Lance Rx and Tx rings */ static void lance_init_ring_dvma(struct net_device *dev) { - struct lance_private *lp = (struct lance_private *) dev->priv; + struct lance_private *lp = dev->priv; volatile struct lance_init_block *ib = lp->init_block; __u32 aib = lp->init_block_dvma; __u32 leptr; @@ -374,7 +374,7 @@ static void lance_init_ring_pio(struct net_device *dev) { - struct lance_private *lp = (struct lance_private *) dev->priv; + struct lance_private *lp = dev->priv; volatile struct lance_init_block *ib = lp->init_block; u32 leptr; int i; @@ -504,7 +504,7 @@ static void lance_rx_dvma(struct net_device *dev) { - struct lance_private *lp = (struct lance_private *) dev->priv; + struct lance_private *lp = dev->priv; volatile struct lance_init_block *ib = lp->init_block; volatile struct lance_rx_desc *rd; u8 bits; @@ -567,7 +567,7 @@ static void lance_tx_dvma(struct net_device *dev) { - struct lance_private *lp = (struct lance_private *) dev->priv; + struct lance_private *lp = dev->priv; volatile struct lance_init_block *ib = lp->init_block; int i, j; @@ -677,7 +677,7 @@ static void lance_rx_pio(struct net_device *dev) { - struct lance_private *lp = (struct lance_private *) dev->priv; + struct lance_private *lp = dev->priv; volatile struct lance_init_block *ib = lp->init_block; volatile struct lance_rx_desc *rd; unsigned char bits; @@ -739,7 +739,7 @@ static void lance_tx_pio(struct net_device *dev) { - struct lance_private *lp = (struct lance_private *) dev->priv; + struct lance_private *lp = dev->priv; volatile struct lance_init_block *ib = lp->init_block; int i, j; @@ -819,8 +819,8 @@ static void lance_interrupt(int irq, void *dev_id, struct pt_regs *regs) { - struct net_device *dev = (struct net_device *)dev_id; - struct lance_private *lp = (struct lance_private *)dev->priv; + struct net_device *dev = dev_id; + struct lance_private *lp = dev->priv; int csr0; sbus_writew(LE_CSR0, lp->lregs + RAP); @@ -917,7 +917,7 @@ static int lance_open(struct net_device *dev) { - struct lance_private *lp = (struct lance_private *)dev->priv; + struct lance_private *lp = dev->priv; volatile struct lance_init_block *ib = lp->init_block; int status = 0; @@ -970,7 +970,7 @@ static int lance_close(struct net_device *dev) { - struct lance_private *lp = (struct lance_private *) dev->priv; + struct lance_private *lp = dev->priv; netif_stop_queue(dev); del_timer_sync(&lp->multicast_timer); @@ -983,7 +983,7 @@ static int lance_reset(struct net_device *dev) { - struct lance_private *lp = (struct lance_private *) dev->priv; + struct lance_private *lp = dev->priv; int status; STOP_LANCE(lp); @@ -1104,7 +1104,7 @@ static void lance_tx_timeout(struct net_device *dev) { - struct lance_private *lp = (struct lance_private *) dev->priv; + struct lance_private *lp = dev->priv; printk(KERN_ERR "%s: transmit timed out, status %04x, reset\n", dev->name, sbus_readw(lp->lregs + RDP)); @@ -1114,7 +1114,7 @@ static int lance_start_xmit(struct sk_buff *skb, struct net_device *dev) { - struct lance_private *lp = (struct lance_private *) dev->priv; + struct lance_private *lp = dev->priv; volatile struct lance_init_block *ib = lp->init_block; int entry, skblen, len; @@ -1167,7 +1167,7 @@ static struct net_device_stats *lance_get_stats(struct net_device *dev) { - struct lance_private *lp = (struct lance_private *) dev->priv; + struct lance_private *lp = dev->priv; return &lp->stats; } @@ -1175,7 +1175,7 @@ /* taken from the depca driver */ static void lance_load_multicast(struct net_device *dev) { - struct lance_private *lp = (struct lance_private *) dev->priv; + struct lance_private *lp = dev->priv; volatile struct lance_init_block *ib = lp->init_block; volatile u16 *mcast_table = (u16 *) &ib->filter; struct dev_mc_list *dmi = dev->mc_list; @@ -1237,7 +1237,7 @@ static void lance_set_multicast(struct net_device *dev) { - struct lance_private *lp = (struct lance_private *) dev->priv; + struct lance_private *lp = dev->priv; volatile struct lance_init_block *ib = lp->init_block; u16 mode; @@ -1327,7 +1327,7 @@ /* Make certain the data structures used by the LANCE are aligned. */ dev->priv = (void *)(((unsigned long)dev->priv + 7) & ~7); - lp = (struct lance_private *) dev->priv; + lp = dev->priv; spin_lock_init(&lp->lock); /* Copy the IDPROM ethernet address to the device structure, later we diff -urN --exclude-from=/home/davej/.exclude linux/drivers/net/sunqe.c linux-dj/drivers/net/sunqe.c --- linux/drivers/net/sunqe.c Mon Mar 19 09:16:25 2001 +++ linux-dj/drivers/net/sunqe.c Mon Mar 19 09:29:17 2001 @@ -462,7 +462,7 @@ */ static void qec_interrupt(int irq, void *dev_id, struct pt_regs *regs) { - struct sunqec *qecp = (struct sunqec *) dev_id; + struct sunqec *qecp = dev_id; u32 qec_status; int channel = 0; @@ -502,7 +502,7 @@ static int qe_open(struct net_device *dev) { - struct sunqe *qep = (struct sunqe *) dev->priv; + struct sunqe *qep = dev->priv; qep->mconfig = (MREGS_MCONFIG_TXENAB | MREGS_MCONFIG_RXENAB | @@ -512,7 +512,7 @@ static int qe_close(struct net_device *dev) { - struct sunqe *qep = (struct sunqe *) dev->priv; + struct sunqe *qep = dev->priv; qe_stop(qep); return 0; @@ -538,7 +538,7 @@ static void qe_tx_timeout(struct net_device *dev) { - struct sunqe *qep = (struct sunqe *) dev->priv; + struct sunqe *qep = dev->priv; int tx_full; spin_lock_irq(&qep->lock); @@ -564,7 +564,7 @@ /* Get a packet queued to go onto the wire. */ static int qe_start_xmit(struct sk_buff *skb, struct net_device *dev) { - struct sunqe *qep = (struct sunqe *) dev->priv; + struct sunqe *qep = dev->priv; struct sunqe_buffers *qbufs = qep->buffers; __u32 txbuf_dvma, qbufs_dvma = qep->buffers_dvma; unsigned char *txbuf; @@ -616,7 +616,7 @@ static struct net_device_stats *qe_get_stats(struct net_device *dev) { - struct sunqe *qep = (struct sunqe *) dev->priv; + struct sunqe *qep = dev->priv; return &qep->net_stats; } @@ -626,7 +626,7 @@ static void qe_set_multicast(struct net_device *dev) { - struct sunqe *qep = (struct sunqe *) dev->priv; + struct sunqe *qep = dev->priv; struct dev_mc_list *dmi = dev->mc_list; u8 new_mconfig = qep->mconfig; char *addrs; @@ -743,7 +743,7 @@ dev = init_etherdev(0, sizeof(struct sunqe)); qe_devs[0] = dev; - qeps[0] = (struct sunqe *) dev->priv; + qeps[0] = dev->priv; qeps[0]->channel = 0; spin_lock_init(&qeps[0]->lock); for (j = 0; j < 6; j++) diff -urN --exclude-from=/home/davej/.exclude linux/drivers/net/tlan.c linux-dj/drivers/net/tlan.c --- linux/drivers/net/tlan.c Mon Mar 19 09:16:25 2001 +++ linux-dj/drivers/net/tlan.c Mon Mar 19 09:29:19 2001 @@ -347,7 +347,7 @@ static inline void TLan_SetTimer( struct net_device *dev, u32 ticks, u32 type ) { - TLanPrivateInfo *priv = (TLanPrivateInfo *) dev->priv; + TLanPrivateInfo *priv = dev->priv; unsigned long flags = 0; if (!in_irq()) @@ -403,7 +403,7 @@ static void __devexit tlan_remove_one( struct pci_dev *pdev) { struct net_device *dev = pci_get_drvdata( pdev ); - TLanPrivateInfo *priv = (TLanPrivateInfo *) dev->priv; + TLanPrivateInfo *priv = dev->priv; unregister_netdev( dev ); @@ -622,7 +622,7 @@ while( tlan_have_eisa ) { dev = TLan_Eisa_Devices; - priv = (TLanPrivateInfo *) dev->priv; + priv = dev->priv; if (priv->dmaStorage) { kfree(priv->dmaStorage); } @@ -776,7 +776,7 @@ int i; TLanPrivateInfo *priv; - priv = (TLanPrivateInfo *) dev->priv; + priv = dev->priv; if (!priv->is_eisa) /* EISA devices have already requested IO */ if (!request_region( dev->base_addr, 0x10, TLanSignature )) { @@ -859,7 +859,7 @@ static int TLan_Open( struct net_device *dev ) { - TLanPrivateInfo *priv = (TLanPrivateInfo *) dev->priv; + TLanPrivateInfo *priv = dev->priv; int err; priv->tlanRev = TLan_DioRead8( dev->base_addr, TLAN_DEF_REVISION ); @@ -905,7 +905,7 @@ static int TLan_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) { - TLanPrivateInfo *priv = (TLanPrivateInfo *) dev->priv; + TLanPrivateInfo *priv = dev->priv; u16 *data = (u16 *)&rq->ifr_data; u32 phy = priv->phy[priv->phyNum]; @@ -982,7 +982,7 @@ static int TLan_StartTx( struct sk_buff *skb, struct net_device *dev ) { - TLanPrivateInfo *priv = (TLanPrivateInfo *) dev->priv; + TLanPrivateInfo *priv = dev->priv; TLanList *tail_list; u8 *tail_buffer; int pad; @@ -1087,8 +1087,8 @@ int type; TLanPrivateInfo *priv; - dev = (struct net_device *) dev_id; - priv = (TLanPrivateInfo *) dev->priv; + dev = dev_id; + priv = dev->priv; spin_lock(&priv->lock); @@ -1128,7 +1128,7 @@ static int TLan_Close(struct net_device *dev) { - TLanPrivateInfo *priv = (TLanPrivateInfo *) dev->priv; + TLanPrivateInfo *priv = dev->priv; netif_stop_queue(dev); priv->neg_be_verbose = 0; @@ -1168,7 +1168,7 @@ static struct net_device_stats *TLan_GetStats( struct net_device *dev ) { - TLanPrivateInfo *priv = (TLanPrivateInfo *) dev->priv; + TLanPrivateInfo *priv = dev->priv; int i; /* Should only read stats if open ? */ @@ -1322,7 +1322,7 @@ u32 TLan_HandleTxEOF( struct net_device *dev, u16 host_int ) { - TLanPrivateInfo *priv = (TLanPrivateInfo *) dev->priv; + TLanPrivateInfo *priv = dev->priv; int eoc = 0; TLanList *head_list; u32 ack = 0; @@ -1439,7 +1439,7 @@ u32 TLan_HandleRxEOF( struct net_device *dev, u16 host_int ) { - TLanPrivateInfo *priv = (TLanPrivateInfo *) dev->priv; + TLanPrivateInfo *priv = dev->priv; u32 ack = 0; int eoc = 0; u8 *head_buffer; @@ -1603,7 +1603,7 @@ u32 TLan_HandleTxEOC( struct net_device *dev, u16 host_int ) { - TLanPrivateInfo *priv = (TLanPrivateInfo *) dev->priv; + TLanPrivateInfo *priv = dev->priv; TLanList *head_list; u32 ack = 1; @@ -1649,7 +1649,7 @@ u32 TLan_HandleStatusCheck( struct net_device *dev, u16 host_int ) { - TLanPrivateInfo *priv = (TLanPrivateInfo *) dev->priv; + TLanPrivateInfo *priv = dev->priv; u32 ack; u32 error; u8 net_sts; @@ -1725,7 +1725,7 @@ u32 TLan_HandleRxEOC( struct net_device *dev, u16 host_int ) { - TLanPrivateInfo *priv = (TLanPrivateInfo *) dev->priv; + TLanPrivateInfo *priv = dev->priv; TLanList *head_list; u32 ack = 1; @@ -1786,7 +1786,7 @@ void TLan_Timer( unsigned long data ) { struct net_device *dev = (struct net_device *) data; - TLanPrivateInfo *priv = (TLanPrivateInfo *) dev->priv; + TLanPrivateInfo *priv = dev->priv; u32 elapsed; unsigned long flags = 0; @@ -1866,7 +1866,7 @@ void TLan_ResetLists( struct net_device *dev ) { - TLanPrivateInfo *priv = (TLanPrivateInfo *) dev->priv; + TLanPrivateInfo *priv = dev->priv; int i; TLanList *list; struct sk_buff *skb; @@ -1923,7 +1923,7 @@ void TLan_FreeLists( struct net_device *dev ) { - TLanPrivateInfo *priv = (TLanPrivateInfo *) dev->priv; + TLanPrivateInfo *priv = dev->priv; int i; TLanList *list; struct sk_buff *skb; @@ -2040,7 +2040,7 @@ void TLan_ReadAndClearStats( struct net_device *dev, int record ) { - TLanPrivateInfo *priv = (TLanPrivateInfo *) dev->priv; + TLanPrivateInfo *priv = dev->priv; u32 tx_good, tx_under; u32 rx_good, rx_over; u32 def_tx, crc, code; @@ -2116,7 +2116,7 @@ void TLan_ResetAdapter( struct net_device *dev ) { - TLanPrivateInfo *priv = (TLanPrivateInfo *) dev->priv; + TLanPrivateInfo *priv = dev->priv; int i; u32 addr; u32 data; @@ -2200,7 +2200,7 @@ void TLan_FinishReset( struct net_device *dev ) { - TLanPrivateInfo *priv = (TLanPrivateInfo *) dev->priv; + TLanPrivateInfo *priv = dev->priv; u8 data; u32 phy; u8 sio; @@ -2363,7 +2363,7 @@ void TLan_PhyPrint( struct net_device *dev ) { - TLanPrivateInfo *priv = (TLanPrivateInfo *) dev->priv; + TLanPrivateInfo *priv = dev->priv; u16 i, data0, data1, data2, data3, phy; phy = priv->phy[priv->phyNum]; @@ -2412,7 +2412,7 @@ void TLan_PhyDetect( struct net_device *dev ) { - TLanPrivateInfo *priv = (TLanPrivateInfo *) dev->priv; + TLanPrivateInfo *priv = dev->priv; u16 control; u16 hi; u16 lo; @@ -2459,7 +2459,7 @@ void TLan_PhyPowerDown( struct net_device *dev ) { - TLanPrivateInfo *priv = (TLanPrivateInfo *) dev->priv; + TLanPrivateInfo *priv = dev->priv; u16 value; TLAN_DBG( TLAN_DEBUG_GNRL, "%s: Powering down PHY(s).\n", dev->name ); @@ -2484,7 +2484,7 @@ void TLan_PhyPowerUp( struct net_device *dev ) { - TLanPrivateInfo *priv = (TLanPrivateInfo *) dev->priv; + TLanPrivateInfo *priv = dev->priv; u16 value; TLAN_DBG( TLAN_DEBUG_GNRL, "%s: Powering up PHY.\n", dev->name ); @@ -2505,7 +2505,7 @@ void TLan_PhyReset( struct net_device *dev ) { - TLanPrivateInfo *priv = (TLanPrivateInfo *) dev->priv; + TLanPrivateInfo *priv = dev->priv; u16 phy; u16 value; @@ -2533,7 +2533,7 @@ void TLan_PhyStartLink( struct net_device *dev ) { - TLanPrivateInfo *priv = (TLanPrivateInfo *) dev->priv; + TLanPrivateInfo *priv = dev->priv; u16 ability; u16 control; u16 data; @@ -2620,7 +2620,7 @@ void TLan_PhyFinishAutoNeg( struct net_device *dev ) { - TLanPrivateInfo *priv = (TLanPrivateInfo *) dev->priv; + TLanPrivateInfo *priv = dev->priv; u16 an_adv; u16 an_lpa; u16 data; @@ -2704,7 +2704,7 @@ void TLan_PhyMonitor( struct net_device *dev ) { - TLanPrivateInfo *priv = (TLanPrivateInfo *) dev->priv; + TLanPrivateInfo *priv = dev->priv; u16 phy; u16 phy_status; @@ -2781,7 +2781,7 @@ u32 i; int err; int minten; - TLanPrivateInfo *priv = (TLanPrivateInfo *) dev->priv; + TLanPrivateInfo *priv = dev->priv; unsigned long flags = 0; err = FALSE; @@ -2950,7 +2950,7 @@ u16 sio; int minten; unsigned long flags = 0; - TLanPrivateInfo *priv = (TLanPrivateInfo *) dev->priv; + TLanPrivateInfo *priv = dev->priv; outw(TLAN_NET_SIO, dev->base_addr + TLAN_DIO_ADR); sio = dev->base_addr + TLAN_DIO_DATA + TLAN_NET_SIO; @@ -3177,7 +3177,7 @@ int TLan_EeReadByte( struct net_device *dev, u8 ee_addr, u8 *data ) { int err; - TLanPrivateInfo *priv = (TLanPrivateInfo *) dev->priv; + TLanPrivateInfo *priv = dev->priv; unsigned long flags = 0; int ret=0; diff -urN --exclude-from=/home/davej/.exclude linux/drivers/net/tokenring/lanstreamer.c linux-dj/drivers/net/tokenring/lanstreamer.c --- linux/drivers/net/tokenring/lanstreamer.c Mon Mar 19 09:16:25 2001 +++ linux-dj/drivers/net/tokenring/lanstreamer.c Mon Mar 19 23:58:45 2001 @@ -386,7 +386,7 @@ struct sk_buff *skb = 0; __u16 misr; - streamer_priv = (struct streamer_private *) dev->priv; + streamer_priv = dev->priv; streamer_mmio = streamer_priv->streamer_mmio; writew(readw(streamer_mmio + BCTL) | BCTL_SOFTRESET, streamer_mmio + BCTL); @@ -522,7 +522,7 @@ static int streamer_open(struct net_device *dev) { - struct streamer_private *streamer_priv = (struct streamer_private *) dev->priv; + struct streamer_private *streamer_priv = dev->priv; __u8 *streamer_mmio = streamer_priv->streamer_mmio; unsigned long flags; char open_error[255]; @@ -823,8 +823,7 @@ */ static void streamer_rx(struct net_device *dev) { - struct streamer_private *streamer_priv = - (struct streamer_private *) dev->priv; + struct streamer_private *streamer_priv = dev->priv; __u8 *streamer_mmio = streamer_priv->streamer_mmio; struct streamer_rx_desc *rx_desc; int rx_ring_last_received, length, frame_length, buffer_cnt = 0; @@ -935,9 +934,8 @@ static void streamer_interrupt(int irq, void *dev_id, struct pt_regs *regs) { - struct net_device *dev = (struct net_device *) dev_id; - struct streamer_private *streamer_priv = - (struct streamer_private *) dev->priv; + struct net_device *dev = dev_id; + struct streamer_private *streamer_priv = dev->priv; __u8 *streamer_mmio = streamer_priv->streamer_mmio; __u16 sisr; __u16 misr; @@ -1038,8 +1036,7 @@ static int streamer_xmit(struct sk_buff *skb, struct net_device *dev) { - struct streamer_private *streamer_priv = - (struct streamer_private *) dev->priv; + struct streamer_private *streamer_priv = dev->priv; __u8 *streamer_mmio = streamer_priv->streamer_mmio; unsigned long flags ; @@ -1081,8 +1078,7 @@ static int streamer_close(struct net_device *dev) { - struct streamer_private *streamer_priv = - (struct streamer_private *) dev->priv; + struct streamer_private *streamer_priv = dev->priv; __u8 *streamer_mmio = streamer_priv->streamer_mmio; unsigned long flags; int i; @@ -1146,8 +1142,7 @@ static void streamer_set_rx_mode(struct net_device *dev) { - struct streamer_private *streamer_priv = - (struct streamer_private *) dev->priv; + struct streamer_private *streamer_priv = dev->priv; __u8 *streamer_mmio = streamer_priv->streamer_mmio; __u8 options = 0; struct dev_mc_list *dmi; @@ -1206,7 +1201,7 @@ static void streamer_srb_bh(struct net_device *dev) { - struct streamer_private *streamer_priv = (struct streamer_private *) dev->priv; + struct streamer_private *streamer_priv = dev->priv; __u8 *streamer_mmio = streamer_priv->streamer_mmio; __u16 srb_word; @@ -1371,14 +1366,14 @@ static struct net_device_stats *streamer_get_stats(struct net_device *dev) { struct streamer_private *streamer_priv; - streamer_priv = (struct streamer_private *) dev->priv; + streamer_priv = dev->priv; return (struct net_device_stats *) &streamer_priv->streamer_stats; } static int streamer_set_mac_address(struct net_device *dev, void *addr) { struct sockaddr *saddr = addr; - struct streamer_private *streamer_priv = (struct streamer_private *) dev->priv; + struct streamer_private *streamer_priv = dev->priv; if (netif_running(dev)) { @@ -1402,8 +1397,7 @@ static void streamer_arb_cmd(struct net_device *dev) { - struct streamer_private *streamer_priv = - (struct streamer_private *) dev->priv; + struct streamer_private *streamer_priv = dev->priv; __u8 *streamer_mmio = streamer_priv->streamer_mmio; __u8 header_len; __u16 frame_len, buffer_len; @@ -1619,8 +1613,7 @@ static void streamer_asb_bh(struct net_device *dev) { - struct streamer_private *streamer_priv = - (struct streamer_private *) dev->priv; + struct streamer_private *streamer_priv = dev->priv; __u8 *streamer_mmio = streamer_priv->streamer_mmio; if (streamer_priv->asb_queued == 1) @@ -1663,8 +1656,7 @@ static int streamer_change_mtu(struct net_device *dev, int mtu) { - struct streamer_private *streamer_priv = - (struct streamer_private *) dev->priv; + struct streamer_private *streamer_priv = dev->priv; __u16 max_mtu; if (streamer_priv->streamer_ring_speed == 4) @@ -1727,8 +1719,7 @@ static int sprintf_info(char *buffer, struct net_device *dev) { - struct streamer_private *streamer_priv = - (struct streamer_private *) dev->priv; + struct streamer_private *streamer_priv = dev->priv; __u8 *streamer_mmio = streamer_priv->streamer_mmio; struct streamer_adapter_addr_table sat; struct streamer_parameters_table spt; diff -urN --exclude-from=/home/davej/.exclude linux/drivers/net/tokenring/madgemc.c linux-dj/drivers/net/tokenring/madgemc.c --- linux/drivers/net/tokenring/madgemc.c Sat Feb 17 00:02:36 2001 +++ linux-dj/drivers/net/tokenring/madgemc.c Mon Mar 19 23:32:12 2001 @@ -354,7 +354,7 @@ dev->name); return -1; } - tp = (struct net_local *)dev->priv; + tp = dev->priv; /* * The MC16 is physically a 32bit card. However, Madge @@ -452,7 +452,7 @@ return; } - dev = (struct net_device *)dev_id; + dev = dev_id; /* Make sure its really us. -- the Madge way */ pending = inb(dev->base_addr + MC_CONTROL_REG0); @@ -499,7 +499,7 @@ unsigned short madgemc_setnselout_pins(struct net_device *dev) { unsigned char reg1; - struct net_local *tp = (struct net_local *)dev->priv; + struct net_local *tp = dev->priv; reg1 = inb(dev->base_addr + MC_CONTROL_REG1); @@ -728,7 +728,7 @@ } len += sprintf(buf+len, "-------\n"); if (curcard) { - struct net_local *tp = (struct net_local *)dev->priv; + struct net_local *tp = dev->priv; int i; len += sprintf(buf+len, "Card Revision: %d\n", curcard->cardrev); diff -urN --exclude-from=/home/davej/.exclude linux/drivers/net/tokenring/olympic.c linux-dj/drivers/net/tokenring/olympic.c --- linux/drivers/net/tokenring/olympic.c Mon Mar 19 09:16:25 2001 +++ linux-dj/drivers/net/tokenring/olympic.c Mon Mar 19 23:59:11 2001 @@ -217,7 +217,7 @@ #ifndef MODULE dev=init_trdev(dev, 0); #endif - dev->priv=(void *)olympic_priv; + dev->priv=olympic_priv; #if OLYMPIC_DEBUG printk("pci_device: %p, dev:%p, dev->priv: %p\n", pci_device, dev, dev->priv); #endif @@ -261,12 +261,12 @@ static int __init olympic_init(struct net_device *dev) { - struct olympic_private *olympic_priv; + struct olympic_private *olympic_priv; __u8 *olympic_mmio, *init_srb,*adapter_addr; unsigned long t; unsigned int uaa_addr; - olympic_priv=(struct olympic_private *)dev->priv; + olympic_priv=dev->priv; olympic_mmio=olympic_priv->olympic_mmio; printk("%s \n", version); @@ -390,7 +390,7 @@ static int olympic_open(struct net_device *dev) { - struct olympic_private *olympic_priv=(struct olympic_private *)dev->priv; + struct olympic_private *olympic_priv=dev->priv; __u8 *olympic_mmio=olympic_priv->olympic_mmio,*init_srb; unsigned long flags; char open_error[255] ; @@ -678,7 +678,7 @@ */ static void olympic_rx(struct net_device *dev) { - struct olympic_private *olympic_priv=(struct olympic_private *)dev->priv; + struct olympic_private *olympic_priv=dev->priv; __u8 *olympic_mmio=olympic_priv->olympic_mmio; struct olympic_rx_status *rx_status; struct olympic_rx_desc *rx_desc ; @@ -792,8 +792,8 @@ static void olympic_interrupt(int irq, void *dev_id, struct pt_regs *regs) { - struct net_device *dev= (struct net_device *)dev_id; - struct olympic_private *olympic_priv=(struct olympic_private *)dev->priv; + struct net_device *dev= dev_id; + struct olympic_private *olympic_priv=dev->priv; __u8 *olympic_mmio=olympic_priv->olympic_mmio; __u32 sisr; __u8 *adapter_check_area ; @@ -877,7 +877,7 @@ static int olympic_xmit(struct sk_buff *skb, struct net_device *dev) { - struct olympic_private *olympic_priv=(struct olympic_private *)dev->priv; + struct olympic_private *olympic_priv=dev->priv; __u8 *olympic_mmio=olympic_priv->olympic_mmio; unsigned long flags ; @@ -910,8 +910,8 @@ static int olympic_close(struct net_device *dev) { - struct olympic_private *olympic_priv=(struct olympic_private *)dev->priv; - __u8 *olympic_mmio=olympic_priv->olympic_mmio,*srb; + struct olympic_private *olympic_priv=dev->priv; + __u8 *olympic_mmio=olympic_priv->olympic_mmio,*srb; unsigned long flags; int i; @@ -975,7 +975,7 @@ static void olympic_set_rx_mode(struct net_device *dev) { - struct olympic_private *olympic_priv = (struct olympic_private *) dev->priv ; + struct olympic_private *olympic_priv = dev->priv ; __u8 *olympic_mmio = olympic_priv->olympic_mmio ; __u8 options = 0; __u8 *srb; @@ -1043,7 +1043,7 @@ static void olympic_srb_bh(struct net_device *dev) { - struct olympic_private *olympic_priv = (struct olympic_private *) dev->priv ; + struct olympic_private *olympic_priv = dev->priv ; __u8 *olympic_mmio = olympic_priv->olympic_mmio ; __u8 *srb; @@ -1189,14 +1189,14 @@ static struct net_device_stats * olympic_get_stats(struct net_device *dev) { struct olympic_private *olympic_priv ; - olympic_priv=(struct olympic_private *) dev->priv; + olympic_priv=dev->priv; return (struct net_device_stats *) &olympic_priv->olympic_stats; } static int olympic_set_mac_address (struct net_device *dev, void *addr) { struct sockaddr *saddr = addr ; - struct olympic_private *olympic_priv = (struct olympic_private *)dev->priv ; + struct olympic_private *olympic_priv = dev->priv ; if (netif_running(dev)) { printk(KERN_WARNING "%s: Cannot set mac/laa address while card is open\n", dev->name) ; @@ -1217,8 +1217,8 @@ static void olympic_arb_cmd(struct net_device *dev) { - struct olympic_private *olympic_priv = (struct olympic_private *) dev->priv; - __u8 *olympic_mmio=olympic_priv->olympic_mmio; + struct olympic_private *olympic_priv = dev->priv; + __u8 *olympic_mmio=olympic_priv->olympic_mmio; __u8 *arb_block, *asb_block, *srb ; __u8 header_len ; __u16 frame_len, buffer_len ; @@ -1415,7 +1415,7 @@ static void olympic_asb_bh(struct net_device *dev) { - struct olympic_private *olympic_priv = (struct olympic_private *) dev->priv ; + struct olympic_private *olympic_priv = dev->priv ; __u8 *arb_block, *asb_block ; arb_block = (__u8 *)(olympic_priv->olympic_lap + olympic_priv->arb) ; @@ -1455,7 +1455,7 @@ static int olympic_change_mtu(struct net_device *dev, int mtu) { - struct olympic_private *olympic_priv = (struct olympic_private *) dev->priv; + struct olympic_private *olympic_priv = dev->priv; __u16 max_mtu ; if (olympic_priv->olympic_ring_speed == 4) @@ -1523,7 +1523,7 @@ static int sprintf_info(char *buffer, struct net_device *dev) { - struct olympic_private *olympic_priv=(struct olympic_private *)dev->priv; + struct olympic_private *olympic_priv=dev->priv; __u8 *oat = (__u8 *)(olympic_priv->olympic_lap + olympic_priv->olympic_addr_table_addr) ; __u8 *opt = (__u8 *)(olympic_priv->olympic_lap + olympic_priv->olympic_parms_addr) ; int size = 0 ; diff -urN --exclude-from=/home/davej/.exclude linux/drivers/net/tokenring/smctr.c linux-dj/drivers/net/tokenring/smctr.c --- linux/drivers/net/tokenring/smctr.c Mon Mar 19 09:16:25 2001 +++ linux-dj/drivers/net/tokenring/smctr.c Mon Mar 19 23:39:04 2001 @@ -334,7 +334,7 @@ */ static int smctr_alloc_shared_memory(struct net_device *dev) { - struct net_local *tp = (struct net_local *)dev->priv; + struct net_local *tp = dev->priv; if(smctr_debug > 10) printk("%s: smctr_alloc_shared_memory\n", dev->name); @@ -462,7 +462,7 @@ static int smctr_checksum_firmware(struct net_device *dev) { - struct net_local *tp = (struct net_local *)dev->priv; + struct net_local *tp = dev->priv; __u16 i, checksum = 0; if(smctr_debug > 10) @@ -488,7 +488,7 @@ static int smctr_chk_mca(struct net_device *dev) { #ifdef CONFIG_MCA - struct net_local *tp = (struct net_local *)dev->priv; + struct net_local *tp = dev->priv; int current_slot; __u8 r1, r2, r3, r4, r5; @@ -648,7 +648,7 @@ static int smctr_chg_rx_mask(struct net_device *dev) { - struct net_local *tp = (struct net_local *)dev->priv; + struct net_local *tp = dev->priv; int err = 0; if(smctr_debug > 10) @@ -711,7 +711,7 @@ static int smctr_clear_int(struct net_device *dev) { - struct net_local *tp = (struct net_local *)dev->priv; + struct net_local *tp = dev->priv; outb((tp->trc_mask | CSR_CLRTINT), dev->base_addr + CSR); @@ -733,7 +733,7 @@ */ static int smctr_close(struct net_device *dev) { - struct net_local *tp = (struct net_local *)dev->priv; + struct net_local *tp = dev->priv; struct sk_buff *skb; int err; @@ -773,7 +773,7 @@ static int smctr_decode_firmware(struct net_device *dev) { - struct net_local *tp = (struct net_local *)dev->priv; + struct net_local *tp = dev->priv; short bit = 0x80, shift = 12; DECODE_TREE_NODE *tree; short branch, tsize; @@ -844,7 +844,7 @@ */ static int smctr_disable_adapter_ctrl_store(struct net_device *dev) { - struct net_local *tp = (struct net_local *)dev->priv; + struct net_local *tp = dev->priv; int ioaddr = dev->base_addr; if(smctr_debug > 10) @@ -858,7 +858,7 @@ static int smctr_disable_bic_int(struct net_device *dev) { - struct net_local *tp = (struct net_local *)dev->priv; + struct net_local *tp = dev->priv; int ioaddr = dev->base_addr; tp->trc_mask = CSR_MSK_ALL | CSR_MSKCBUSY @@ -870,7 +870,7 @@ static int smctr_enable_16bit(struct net_device *dev) { - struct net_local *tp = (struct net_local *)dev->priv; + struct net_local *tp = dev->priv; __u8 r; if(tp->adapter_bus == BUS_ISA16_TYPE) @@ -890,7 +890,7 @@ */ static int smctr_enable_adapter_ctrl_store(struct net_device *dev) { - struct net_local *tp = (struct net_local *)dev->priv; + struct net_local *tp = dev->priv; int ioaddr = dev->base_addr; if(smctr_debug > 10) @@ -921,7 +921,7 @@ static int smctr_enable_bic_int(struct net_device *dev) { - struct net_local *tp = (struct net_local *)dev->priv; + struct net_local *tp = dev->priv; int ioaddr = dev->base_addr; __u8 r; @@ -947,7 +947,7 @@ static int __init smctr_chk_isa(struct net_device *dev) { - struct net_local *tp = (struct net_local *)dev->priv; + struct net_local *tp = dev->priv; int ioaddr = dev->base_addr; __u8 r1, r2, b, chksum = 0; __u16 r; @@ -1166,7 +1166,7 @@ static int __init smctr_get_boardid(struct net_device *dev, int mca) { - struct net_local *tp = (struct net_local *)dev->priv; + struct net_local *tp = dev->priv; int ioaddr = dev->base_addr; __u8 r, r1, IdByte; __u16 BoardIdMask; @@ -1284,7 +1284,7 @@ */ static unsigned int smctr_get_num_rx_bdbs(struct net_device *dev) { - struct net_local *tp = (struct net_local *)dev->priv; + struct net_local *tp = dev->priv; unsigned int mem_used = 0; /* Allocate System Control Blocks. */ @@ -1369,7 +1369,7 @@ static __u8 * smctr_get_rx_pointer(struct net_device *dev, short queue) { - struct net_local *tp = (struct net_local *)dev->priv; + struct net_local *tp = dev->priv; BDBlock *bdb; bdb = (BDBlock *)((__u32)tp->ram_access @@ -1393,7 +1393,7 @@ */ static struct net_device_stats *smctr_get_stats(struct net_device *dev) { - struct net_local *tp = (struct net_local *)dev->priv; + struct net_local *tp = dev->priv; return ((struct net_device_stats *)&tp->MacStat); } @@ -1401,7 +1401,7 @@ static FCBlock *smctr_get_tx_fcb(struct net_device *dev, __u16 queue, __u16 bytes_count) { - struct net_local *tp = (struct net_local *)dev->priv; + struct net_local *tp = dev->priv; FCBlock *pFCB; BDBlock *pbdb; unsigned short alloc_size; @@ -1524,7 +1524,7 @@ static int smctr_init_acbs(struct net_device *dev) { - struct net_local *tp = (struct net_local *)dev->priv; + struct net_local *tp = dev->priv; unsigned int i; ACBlock *acb; @@ -1568,7 +1568,7 @@ static int smctr_init_adapter(struct net_device *dev) { - struct net_local *tp = (struct net_local *)dev->priv; + struct net_local *tp = dev->priv; int err; if(smctr_debug > 10) @@ -1660,7 +1660,7 @@ static int smctr_init_card_real(struct net_device *dev) { - struct net_local *tp = (struct net_local *)dev->priv; + struct net_local *tp = dev->priv; int err = 0; if(smctr_debug > 10) @@ -1736,7 +1736,7 @@ static int smctr_init_rx_bdbs(struct net_device *dev) { - struct net_local *tp = (struct net_local *)dev->priv; + struct net_local *tp = dev->priv; unsigned int i, j; BDBlock *bdb; __u16 *buf; @@ -1788,7 +1788,7 @@ static int smctr_init_rx_fcbs(struct net_device *dev) { - struct net_local *tp = (struct net_local *)dev->priv; + struct net_local *tp = dev->priv; unsigned int i, j; FCBlock *fcb; @@ -1838,7 +1838,7 @@ static int smctr_init_shared_memory(struct net_device *dev) { - struct net_local *tp = (struct net_local *)dev->priv; + struct net_local *tp = dev->priv; unsigned int i; __u32 *iscpb; @@ -1896,7 +1896,7 @@ static int smctr_init_tx_bdbs(struct net_device *dev) { - struct net_local *tp = (struct net_local *)dev->priv; + struct net_local *tp = dev->priv; unsigned int i, j; BDBlock *bdb; @@ -1926,7 +1926,7 @@ static int smctr_init_tx_fcbs(struct net_device *dev) { - struct net_local *tp = (struct net_local *)dev->priv; + struct net_local *tp = dev->priv; unsigned int i, j; FCBlock *fcb; @@ -1965,7 +1965,7 @@ static int smctr_internal_self_test(struct net_device *dev) { - struct net_local *tp = (struct net_local *)dev->priv; + struct net_local *tp = dev->priv; int err; if((err = smctr_issue_test_internal_rom_cmd(dev))) @@ -2018,7 +2018,7 @@ } ioaddr = dev->base_addr; - tp = (struct net_local *)dev->priv; + tp = dev->priv; if(tp->status == NOT_INITIALIZED) return; @@ -2522,7 +2522,7 @@ static int smctr_issue_enable_int_cmd(struct net_device *dev, __u16 interrupt_enable_mask) { - struct net_local *tp = (struct net_local *)dev->priv; + struct net_local *tp = dev->priv; int err; if((err = smctr_wait_while_cbusy(dev))) @@ -2540,7 +2540,7 @@ static int smctr_issue_int_ack(struct net_device *dev, __u16 iack_code, __u16 ibits) { - struct net_local *tp = (struct net_local *)dev->priv; + struct net_local *tp = dev->priv; if(smctr_wait_while_cbusy(dev)) return (-1); @@ -2558,7 +2558,7 @@ static int smctr_issue_init_timers_cmd(struct net_device *dev) { - struct net_local *tp = (struct net_local *)dev->priv; + struct net_local *tp = dev->priv; unsigned int i; int err; __u16 *pTimer_Struc = (__u16 *)tp->misc_command_data; @@ -2715,7 +2715,7 @@ static int smctr_issue_init_txrx_cmd(struct net_device *dev) { - struct net_local *tp = (struct net_local *)dev->priv; + struct net_local *tp = dev->priv; unsigned int i; int err; void **txrx_ptrs = (void *)tp->misc_command_data; @@ -2803,7 +2803,7 @@ static int smctr_issue_remove_cmd(struct net_device *dev) { - struct net_local *tp = (struct net_local *)dev->priv; + struct net_local *tp = dev->priv; int err; if((err = smctr_wait_while_cbusy(dev))) @@ -2819,7 +2819,7 @@ static int smctr_issue_resume_acb_cmd(struct net_device *dev) { - struct net_local *tp = (struct net_local *)dev->priv; + struct net_local *tp = dev->priv; int err; if((err = smctr_wait_while_cbusy(dev))) @@ -2837,7 +2837,7 @@ static int smctr_issue_resume_rx_bdb_cmd(struct net_device *dev, __u16 queue) { - struct net_local *tp = (struct net_local *)dev->priv; + struct net_local *tp = dev->priv; int err; if((err = smctr_wait_while_cbusy(dev))) @@ -2857,7 +2857,7 @@ static int smctr_issue_resume_rx_fcb_cmd(struct net_device *dev, __u16 queue) { - struct net_local *tp = (struct net_local *)dev->priv; + struct net_local *tp = dev->priv; if(smctr_debug > 10) printk("%s: smctr_issue_resume_rx_fcb_cmd\n", dev->name); @@ -2879,7 +2879,7 @@ static int smctr_issue_resume_tx_fcb_cmd(struct net_device *dev, __u16 queue) { - struct net_local *tp = (struct net_local *)dev->priv; + struct net_local *tp = dev->priv; if(smctr_debug > 10) printk("%s: smctr_issue_resume_tx_fcb_cmd\n", dev->name); @@ -2948,7 +2948,7 @@ static int smctr_issue_write_byte_cmd(struct net_device *dev, short aword_cnt, void *byte) { - struct net_local *tp = (struct net_local *)dev->priv; + struct net_local *tp = dev->priv; unsigned int iword, ibyte; int err; @@ -2972,7 +2972,7 @@ static int smctr_issue_write_word_cmd(struct net_device *dev, short aword_cnt, void *word) { - struct net_local *tp = (struct net_local *)dev->priv; + struct net_local *tp = dev->priv; unsigned int i, err; if((err = smctr_wait_while_cbusy(dev))) @@ -3002,7 +3002,7 @@ static int smctr_link_tx_fcbs_to_bdbs(struct net_device *dev) { - struct net_local *tp = (struct net_local *)dev->priv; + struct net_local *tp = dev->priv; unsigned int i, j; FCBlock *fcb; BDBlock *bdb; @@ -3026,7 +3026,7 @@ static int smctr_load_firmware(struct net_device *dev) { - struct net_local *tp = (struct net_local *)dev->priv; + struct net_local *tp = dev->priv; __u16 i, checksum = 0; int err = 0; @@ -3142,7 +3142,7 @@ */ static int smctr_lobe_media_test(struct net_device *dev) { - struct net_local *tp = (struct net_local *)dev->priv; + struct net_local *tp = dev->priv; unsigned int i, perror = 0; unsigned short saved_rcv_mask; @@ -3217,7 +3217,7 @@ static int smctr_lobe_media_test_cmd(struct net_device *dev) { - struct net_local *tp = (struct net_local *)dev->priv; + struct net_local *tp = dev->priv; int err; if(smctr_debug > 10) @@ -3301,7 +3301,7 @@ static int smctr_make_access_pri(struct net_device *dev, MAC_SUB_VECTOR *tsv) { - struct net_local *tp = (struct net_local *)dev->priv; + struct net_local *tp = dev->priv; tsv->svi = AUTHORIZED_ACCESS_PRIORITY; tsv->svl = S_AUTHORIZED_ACCESS_PRIORITY; @@ -3326,7 +3326,7 @@ static int smctr_make_auth_funct_class(struct net_device *dev, MAC_SUB_VECTOR *tsv) { - struct net_local *tp = (struct net_local *)dev->priv; + struct net_local *tp = dev->priv; tsv->svi = AUTHORIZED_FUNCTION_CLASS; tsv->svl = S_AUTHORIZED_FUNCTION_CLASS; @@ -3351,7 +3351,7 @@ static int smctr_make_funct_addr(struct net_device *dev, MAC_SUB_VECTOR *tsv) { - struct net_local *tp = (struct net_local *)dev->priv; + struct net_local *tp = dev->priv; smctr_get_functional_address(dev); @@ -3369,7 +3369,7 @@ static int smctr_make_group_addr(struct net_device *dev, MAC_SUB_VECTOR *tsv) { - struct net_local *tp = (struct net_local *)dev->priv; + struct net_local *tp = dev->priv; smctr_get_group_address(dev); @@ -3395,7 +3395,7 @@ static int smctr_make_phy_drop_num(struct net_device *dev, MAC_SUB_VECTOR *tsv) { - struct net_local *tp = (struct net_local *)dev->priv; + struct net_local *tp = dev->priv; smctr_get_physical_drop_number(dev); @@ -3426,7 +3426,7 @@ static int smctr_make_station_id(struct net_device *dev, MAC_SUB_VECTOR *tsv) { - struct net_local *tp = (struct net_local *)dev->priv; + struct net_local *tp = dev->priv; smctr_get_station_id(dev); @@ -3464,7 +3464,7 @@ static int smctr_make_ring_station_version(struct net_device *dev, MAC_SUB_VECTOR *tsv) { - struct net_local *tp = (struct net_local *)dev->priv; + struct net_local *tp = dev->priv; tsv->svi = RING_STATION_VERSION_NUMBER; tsv->svl = S_RING_STATION_VERSION_NUMBER; @@ -3504,7 +3504,7 @@ static int smctr_make_upstream_neighbor_addr(struct net_device *dev, MAC_SUB_VECTOR *tsv) { - struct net_local *tp = (struct net_local *)dev->priv; + struct net_local *tp = dev->priv; smctr_get_upstream_neighbor_addr(dev); @@ -3560,7 +3560,7 @@ /* Interrupt driven open of Token card. */ static int smctr_open_tr(struct net_device *dev) { - struct net_local *tp = (struct net_local *)dev->priv; + struct net_local *tp = dev->priv; unsigned long flags; int err; @@ -3693,8 +3693,7 @@ #endif /* Setup this devices private information structure */ - tp = (struct net_local *)kmalloc(sizeof(struct net_local), - GFP_KERNEL); + tp = kmalloc(sizeof(struct net_local), GFP_KERNEL); if(tp == NULL) { err = -ENOMEM; goto out; @@ -3713,7 +3712,7 @@ } } - tp = (struct net_local *)dev->priv; + tp = dev->priv; dev->rmem_start = dev->mem_start = tp->ram_base; dev->rmem_end = dev->mem_end = dev->mem_start + 0x10000; ram = (__u32 *)phys_to_virt(dev->mem_start); @@ -3759,7 +3758,7 @@ static int smctr_process_rx_packet(MAC_HEADER *rmf, __u16 size, struct net_device *dev, __u16 rx_status) { - struct net_local *tp = (struct net_local *)dev->priv; + struct net_local *tp = dev->priv; struct sk_buff *skb; __u16 rcode, correlator; int err = 0; @@ -3981,7 +3980,7 @@ /* Adapter RAM test. Incremental word ODD boundry data test. */ static int smctr_ram_memory_test(struct net_device *dev) { - struct net_local *tp = (struct net_local *)dev->priv; + struct net_local *tp = dev->priv; __u16 page, pages_of_ram, start_pattern = 0, word_pattern = 0, word_read = 0, err_word = 0, err_pattern = 0; unsigned int err_offset; @@ -4374,7 +4373,7 @@ */ static int smctr_reset_adapter(struct net_device *dev) { - struct net_local *tp = (struct net_local *)dev->priv; + struct net_local *tp = dev->priv; int ioaddr = dev->base_addr; /* Reseting the NIC will put it in a halted and un-initialized state. */ smctr_set_trc_reset(ioaddr); @@ -4393,7 +4392,7 @@ static int smctr_restart_tx_chain(struct net_device *dev, short queue) { - struct net_local *tp = (struct net_local *)dev->priv; + struct net_local *tp = dev->priv; int err = 0; if(smctr_debug > 10) @@ -4411,7 +4410,7 @@ static int smctr_ring_status_chg(struct net_device *dev) { - struct net_local *tp = (struct net_local *)dev->priv; + struct net_local *tp = dev->priv; if(smctr_debug > 10) printk("%s: smctr_ring_status_chg\n", dev->name); @@ -4513,7 +4512,7 @@ static int smctr_rx_frame(struct net_device *dev) { - struct net_local *tp = (struct net_local *)dev->priv; + struct net_local *tp = dev->priv; __u16 queue, status, rx_size, err = 0; __u8 *pbuff; @@ -4579,7 +4578,7 @@ static int smctr_send_dat(struct net_device *dev) { - struct net_local *tp = (struct net_local *)dev->priv; + struct net_local *tp = dev->priv; unsigned int i, err; MAC_HEADER *tmf; FCBlock *fcb; @@ -4659,7 +4658,7 @@ */ static int smctr_send_packet(struct sk_buff *skb, struct net_device *dev) { - struct net_local *tp = (struct net_local *)dev->priv; + struct net_local *tp = dev->priv; if(smctr_debug > 10) printk("%s: smctr_send_packet\n", dev->name); @@ -4684,10 +4683,10 @@ static int smctr_send_lobe_media_test(struct net_device *dev) { - struct net_local *tp = (struct net_local *)dev->priv; + struct net_local *tp = dev->priv; MAC_SUB_VECTOR *tsv; MAC_HEADER *tmf; - FCBlock *fcb; + FCBlock *fcb; __u32 i; int err; @@ -4980,7 +4979,7 @@ static int smctr_send_rq_init(struct net_device *dev) { - struct net_local *tp = (struct net_local *)dev->priv; + struct net_local *tp = dev->priv; MAC_HEADER *tmf; MAC_SUB_VECTOR *tsv; FCBlock *fcb; @@ -5064,7 +5063,7 @@ static int smctr_send_tx_forward(struct net_device *dev, MAC_HEADER *rmf, __u16 *tx_fstatus) { - struct net_local *tp = (struct net_local *)dev->priv; + struct net_local *tp = dev->priv; FCBlock *fcb; unsigned int i; int err; @@ -5128,7 +5127,7 @@ static int smctr_set_auth_access_pri(struct net_device *dev, MAC_SUB_VECTOR *rsv) { - struct net_local *tp = (struct net_local *)dev->priv; + struct net_local *tp = dev->priv; if(rsv->svl != S_AUTHORIZED_ACCESS_PRIORITY) return (E_SUB_VECTOR_LENGTH_ERROR); @@ -5141,7 +5140,7 @@ static int smctr_set_auth_funct_class(struct net_device *dev, MAC_SUB_VECTOR *rsv) { - struct net_local *tp = (struct net_local *)dev->priv; + struct net_local *tp = dev->priv; if(rsv->svl != S_AUTHORIZED_FUNCTION_CLASS) return (E_SUB_VECTOR_LENGTH_ERROR); @@ -5202,7 +5201,7 @@ static int smctr_set_local_ring_num(struct net_device *dev, MAC_SUB_VECTOR *rsv) { - struct net_local *tp = (struct net_local *)dev->priv; + struct net_local *tp = dev->priv; if(rsv->svl != S_LOCAL_RING_NUMBER) return (E_SUB_VECTOR_LENGTH_ERROR); @@ -5216,7 +5215,7 @@ static unsigned short smctr_set_ctrl_attention(struct net_device *dev) { - struct net_local *tp = (struct net_local *)dev->priv; + struct net_local *tp = dev->priv; int ioaddr = dev->base_addr; if(tp->bic_type == BIC_585_CHIP) @@ -5240,7 +5239,7 @@ static int smctr_set_page(struct net_device *dev, __u8 *buf) { - struct net_local *tp = (struct net_local *)dev->priv; + struct net_local *tp = dev->priv; __u8 amask; __u32 tptr; @@ -5270,7 +5269,7 @@ */ static int smctr_set_ring_speed(struct net_device *dev) { - struct net_local *tp = (struct net_local *)dev->priv; + struct net_local *tp = dev->priv; int err; if(tp->media_type == MEDIA_UTP_16) @@ -5298,7 +5297,7 @@ static int smctr_set_rx_look_ahead(struct net_device *dev) { - struct net_local *tp = (struct net_local *)dev->priv; + struct net_local *tp = dev->priv; __u16 sword, rword; if(smctr_debug > 10) @@ -5341,7 +5340,7 @@ static int smctr_setup_single_cmd(struct net_device *dev, __u16 command, __u16 subcommand) { - struct net_local *tp = (struct net_local *)dev->priv; + struct net_local *tp = dev->priv; unsigned int err; if(smctr_debug > 10) @@ -5368,7 +5367,7 @@ static int smctr_setup_single_cmd_w_data(struct net_device *dev, __u16 command, __u16 subcommand) { - struct net_local *tp = (struct net_local *)dev->priv; + struct net_local *tp = dev->priv; tp->acb_head->cmd_done_status = ACB_COMMAND_NOT_DONE; tp->acb_head->cmd = command; @@ -5381,7 +5380,7 @@ static char *smctr_malloc(struct net_device *dev, __u16 size) { - struct net_local *tp = (struct net_local *)dev->priv; + struct net_local *tp = dev->priv; char *m; m = (char *)(tp->ram_access + tp->sh_mem_used); @@ -5392,7 +5391,7 @@ static int smctr_status_chg(struct net_device *dev) { - struct net_local *tp = (struct net_local *)dev->priv; + struct net_local *tp = dev->priv; if(smctr_debug > 10) printk("%s: smctr_status_chg\n", dev->name); @@ -5428,7 +5427,7 @@ static int smctr_trc_send_packet(struct net_device *dev, FCBlock *fcb, __u16 queue) { - struct net_local *tp = (struct net_local *)dev->priv; + struct net_local *tp = dev->priv; int err = 0; if(smctr_debug > 10) @@ -5449,7 +5448,7 @@ static __u16 smctr_tx_complete(struct net_device *dev, __u16 queue) { - struct net_local *tp = (struct net_local *)dev->priv; + struct net_local *tp = dev->priv; __u16 status, err = 0; int cstatus; @@ -5504,7 +5503,7 @@ static unsigned short smctr_tx_move_frame(struct net_device *dev, struct sk_buff *skb, __u8 *pbuff, unsigned int bytes) { - struct net_local *tp = (struct net_local *)dev->priv; + struct net_local *tp = dev->priv; unsigned int ram_usable; __u32 flen, len, offset = 0; __u8 *frag, *page; @@ -5545,7 +5544,7 @@ /* Update the error statistic counters for this adapter. */ static int smctr_update_err_stats(struct net_device *dev) { - struct net_local *tp = (struct net_local *)dev->priv; + struct net_local *tp = dev->priv; struct tr_statistics *tstat = &tp->MacStat; if(tstat->internal_errors) @@ -5587,7 +5586,7 @@ static int smctr_update_rx_chain(struct net_device *dev, __u16 queue) { - struct net_local *tp = (struct net_local *)dev->priv; + struct net_local *tp = dev->priv; FCBlock *fcb; BDBlock *bdb; __u16 size, len; @@ -5625,7 +5624,7 @@ static int smctr_update_tx_chain(struct net_device *dev, FCBlock *fcb, __u16 queue) { - struct net_local *tp = (struct net_local *)dev->priv; + struct net_local *tp = dev->priv; if(smctr_debug > 20) printk("smctr_update_tx_chain\n"); @@ -5661,7 +5660,7 @@ static int smctr_wait_cmd(struct net_device *dev) { - struct net_local *tp = (struct net_local *)dev->priv; + struct net_local *tp = dev->priv; unsigned int loop_count = 0x20000; if(smctr_debug > 10) @@ -5686,7 +5685,7 @@ static int smctr_wait_while_cbusy(struct net_device *dev) { - struct net_local *tp = (struct net_local *)dev->priv; + struct net_local *tp = dev->priv; unsigned int timeout = 0x20000; int ioaddr = dev->base_addr; __u8 r; @@ -5775,8 +5774,7 @@ if(dev_smctr[i]) { #ifdef CONFIG_MCA - struct net_local *tp - = (struct net_local *)dev_smctr[i]->priv; + struct net_local *tp = dev_smctr[i]->priv; if(tp->slot_num) mca_mark_as_unused(tp->slot_num); #endif diff -urN --exclude-from=/home/davej/.exclude linux/drivers/net/tokenring/tms380tr.c linux-dj/drivers/net/tokenring/tms380tr.c --- linux/drivers/net/tokenring/tms380tr.c Mon Mar 19 09:16:25 2001 +++ linux-dj/drivers/net/tokenring/tms380tr.c Tue Mar 20 00:00:06 2001 @@ -252,7 +252,7 @@ */ int tms380tr_open(struct net_device *dev) { - struct net_local *tp = (struct net_local *)dev->priv; + struct net_local *tp = dev->priv; int err; /* Reset the hardware here. Don't forget to set the station address. */ @@ -319,7 +319,7 @@ static void tms380tr_timer_end_wait(unsigned long data) { struct net_device *dev = (struct net_device*)data; - struct net_local *tp = (struct net_local *)dev->priv; + struct net_local *tp = dev->priv; if(tp->Sleeping) { @@ -335,7 +335,7 @@ */ static int tms380tr_chipset_init(struct net_device *dev) { - struct net_local *tp = (struct net_local *)dev->priv; + struct net_local *tp = dev->priv; int err; tms380tr_init_ipb(tp); @@ -370,7 +370,7 @@ */ static void tms380tr_init_net_local(struct net_device *dev) { - struct net_local *tp = (struct net_local *)dev->priv; + struct net_local *tp = dev->priv; int i; dma_addr_t dmabuf; @@ -501,7 +501,7 @@ unsigned short BufferSize = BUFFER_SIZE; int i; - tp = (struct net_local *)dev->priv; + tp = dev->priv; tp->ocpl.OPENOptions = 0; tp->ocpl.OPENOptions |= ENABLE_FULL_DUPLEX_SELECTION; @@ -540,7 +540,7 @@ */ static void tms380tr_open_adapter(struct net_device *dev) { - struct net_local *tp = (struct net_local *)dev->priv; + struct net_local *tp = dev->priv; if(tp->OpenCommandIssued) return; @@ -578,7 +578,7 @@ */ static void tms380tr_exec_cmd(struct net_device *dev, unsigned short Command) { - struct net_local *tp = (struct net_local *)dev->priv; + struct net_local *tp = dev->priv; tp->CMDqueue |= Command; tms380tr_chk_outstanding_cmds(dev); @@ -605,7 +605,7 @@ */ static int tms380tr_send_packet(struct sk_buff *skb, struct net_device *dev) { - struct net_local *tp = (struct net_local *)dev->priv; + struct net_local *tp = dev->priv; /* * Block transmits from overlapping. @@ -742,7 +742,7 @@ static void tms380tr_timer_chk(unsigned long data) { struct net_device *dev = (struct net_device*)data; - struct net_local *tp = (struct net_local*)dev->priv; + struct net_local *tp = dev->priv; if(tp->HaltInProgress) return; @@ -781,7 +781,7 @@ return; } - tp = (struct net_local *)dev->priv; + tp = dev->priv; irq_type = SIFREADW(SIFSTS); @@ -868,7 +868,7 @@ */ static void tms380tr_reset_interrupt(struct net_device *dev) { - struct net_local *tp = (struct net_local *)dev->priv; + struct net_local *tp = dev->priv; SSB *ssb = &tp->ssb; /* @@ -954,7 +954,7 @@ */ static void tms380tr_cmd_status_irq(struct net_device *dev) { - struct net_local *tp = (struct net_local *)dev->priv; + struct net_local *tp = dev->priv; unsigned short ssb_cmd, ssb_parm_0; unsigned short ssb_parm_1; char *open_err = "Open error -"; @@ -1151,7 +1151,7 @@ */ int tms380tr_close(struct net_device *dev) { - struct net_local *tp = (struct net_local *)dev->priv; + struct net_local *tp = dev->priv; netif_stop_queue(dev); del_timer(&tp->timer); @@ -1197,7 +1197,7 @@ */ static struct net_device_stats *tms380tr_get_stats(struct net_device *dev) { - struct net_local *tp = (struct net_local *)dev->priv; + struct net_local *tp = dev->priv; return ((struct net_device_stats *)&tp->MacStat); } @@ -1207,7 +1207,7 @@ */ static void tms380tr_set_multicast_list(struct net_device *dev) { - struct net_local *tp = (struct net_local *)dev->priv; + struct net_local *tp = dev->priv; unsigned int OpenOptions; OpenOptions = tp->ocpl.OPENOptions & @@ -1300,7 +1300,7 @@ */ static int tms380tr_reset_adapter(struct net_device *dev) { - struct net_local *tp = (struct net_local *)dev->priv; + struct net_local *tp = dev->priv; unsigned short *fw_ptr = (unsigned short *)&tms380tr_code; unsigned short count, c; @@ -1429,7 +1429,7 @@ */ static int tms380tr_init_adapter(struct net_device *dev) { - struct net_local *tp = (struct net_local *)dev->priv; + struct net_local *tp = dev->priv; const unsigned char SCB_Test[6] = {0x00, 0x00, 0xC1, 0xE2, 0xD4, 0x8B}; const unsigned char SSB_Test[8] = {0xFF, 0xFF, 0xD1, 0xD7, @@ -1542,7 +1542,7 @@ */ static void tms380tr_chk_outstanding_cmds(struct net_device *dev) { - struct net_local *tp = (struct net_local *)dev->priv; + struct net_local *tp = dev->priv; unsigned long Addr = 0; if(tp->CMDqueue == 0) @@ -1714,7 +1714,7 @@ */ static void tms380tr_ring_status_irq(struct net_device *dev) { - struct net_local *tp = (struct net_local *)dev->priv; + struct net_local *tp = dev->priv; tp->CurrentRingStatus = be16_to_cpu((unsigned short)tp->ssb.Parm[0]); @@ -1786,7 +1786,7 @@ { int i; unsigned short AdapterCheckBlock[4]; - struct net_local *tp = (struct net_local *)dev->priv; + struct net_local *tp = dev->priv; tp->AdapterOpenFlag = 0; /* Adapter closed now */ @@ -1942,7 +1942,7 @@ */ static int tms380tr_read_ptr(struct net_device *dev) { - struct net_local *tp = (struct net_local *)dev->priv; + struct net_local *tp = dev->priv; unsigned short adapterram; tms380tr_read_ram(dev, (unsigned char *)&tp->intptrs.BurnedInAddrPtr, @@ -2042,7 +2042,7 @@ */ static void tms380tr_tx_status_irq(struct net_device *dev) { - struct net_local *tp = (struct net_local *)dev->priv; + struct net_local *tp = dev->priv; unsigned char HighByte, HighAc, LowAc; TPL *tpl; @@ -2114,7 +2114,7 @@ */ static void tms380tr_rcv_status_irq(struct net_device *dev) { - struct net_local *tp = (struct net_local *)dev->priv; + struct net_local *tp = dev->priv; unsigned char *ReceiveDataPtr; struct sk_buff *skb; unsigned int Length, Length2; @@ -2305,7 +2305,7 @@ static int tms380tr_set_mac_address(struct net_device *dev, void *addr) { - struct net_local *tp = (struct net_local *)dev->priv; + struct net_local *tp = dev->priv; struct sockaddr *saddr = addr; if (tp->AdapterOpenFlag || tp->AdapterVirtOpenFlag) { @@ -2339,7 +2339,7 @@ { struct net_local *tp; - tp = (struct net_local *) dev->priv; + tp = dev->priv; pci_unmap_single(tp->pdev, tp->dmabuffer, sizeof(struct net_local), PCI_DMA_BIDIRECTIONAL); kfree(dev->priv); @@ -2361,7 +2361,7 @@ return -ENOMEM; } memset(dev->priv, 0, sizeof(struct net_local)); - tms_local = (struct net_local *)dev->priv; + tms_local = dev->priv; init_waitqueue_head(&tms_local->wait_for_tok_int); tms_local->dmalimit = dmalimit; tms_local->pdev = pdev; diff -urN --exclude-from=/home/davej/.exclude linux/drivers/net/tun.c linux-dj/drivers/net/tun.c --- linux/drivers/net/tun.c Tue Feb 13 21:15:05 2001 +++ linux-dj/drivers/net/tun.c Mon Mar 19 09:29:11 2001 @@ -57,7 +57,7 @@ static int tun_net_open(struct net_device *dev) { #ifdef TUN_DEBUG - struct tun_struct *tun = (struct tun_struct *)dev->priv; + struct tun_struct *tun = dev->priv; DBG(KERN_INFO "%s: tun_net_open\n", tun->name); #endif @@ -71,7 +71,7 @@ static int tun_net_close(struct net_device *dev) { #ifdef TUN_DEBUG - struct tun_struct *tun = (struct tun_struct *)dev->priv; + struct tun_struct *tun = dev->priv; DBG(KERN_INFO "%s: tun_net_close\n", tun->name); #endif @@ -84,7 +84,7 @@ /* Net device start xmit */ static int tun_net_xmit(struct sk_buff *skb, struct net_device *dev) { - struct tun_struct *tun = (struct tun_struct *)dev->priv; + struct tun_struct *tun = dev->priv; DBG(KERN_INFO "%s: tun_net_xmit %d\n", tun->name, skb->len); @@ -105,7 +105,7 @@ static void tun_net_mclist(struct net_device *dev) { #ifdef TUN_DEBUG - struct tun_struct *tun = (struct tun_struct *)dev->priv; + struct tun_struct *tun = dev->priv; DBG(KERN_INFO "%s: tun_net_mclist\n", tun->name); #endif @@ -118,7 +118,7 @@ static struct net_device_stats *tun_net_stats(struct net_device *dev) { - struct tun_struct *tun = (struct tun_struct *)dev->priv; + struct tun_struct *tun = dev->priv; return &tun->stats; } @@ -126,7 +126,7 @@ /* Initialize net device. */ int tun_net_init(struct net_device *dev) { - struct tun_struct *tun = (struct tun_struct *)dev->priv; + struct tun_struct *tun = dev->priv; DBG(KERN_INFO "%s: tun_net_init\n", tun->name); @@ -171,7 +171,7 @@ /* Poll */ static unsigned int tun_chr_poll(struct file *file, poll_table * wait) { - struct tun_struct *tun = (struct tun_struct *)file->private_data; + struct tun_struct *tun = file->private_data; DBG(KERN_INFO "%s: tun_chr_poll\n", tun->name); @@ -237,7 +237,7 @@ static ssize_t tun_chr_write(struct file * file, const char * buf, size_t count, loff_t *pos) { - struct tun_struct *tun = (struct tun_struct *)file->private_data; + struct tun_struct *tun = file->private_data; DBG(KERN_INFO "%s: tun_chr_write %d\n", tun->name, count); @@ -288,7 +288,7 @@ static ssize_t tun_chr_read(struct file * file, char * buf, size_t count, loff_t *pos) { - struct tun_struct *tun = (struct tun_struct *)file->private_data; + struct tun_struct *tun = file->private_data; DECLARE_WAITQUEUE(wait, current); struct sk_buff *skb; ssize_t ret = 0; @@ -385,7 +385,7 @@ static int tun_chr_ioctl(struct inode *inode, struct file *file, unsigned int cmd, unsigned long arg) { - struct tun_struct *tun = (struct tun_struct *)file->private_data; + struct tun_struct *tun = file->private_data; DBG(KERN_INFO "%s: tun_chr_ioctl\n", tun->name); @@ -419,7 +419,7 @@ static int tun_chr_fasync(int fd, struct file *file, int on) { - struct tun_struct *tun = (struct tun_struct *)file->private_data; + struct tun_struct *tun = file->private_data; int ret; DBG(KERN_INFO "%s: tun_chr_fasync %d\n", tun->name, on); @@ -461,7 +461,7 @@ static int tun_chr_close(struct inode *inode, struct file *file) { - struct tun_struct *tun = (struct tun_struct *)file->private_data; + struct tun_struct *tun = file->private_data; DBG(KERN_INFO "%s: tun_chr_close\n", tun->name); diff -urN --exclude-from=/home/davej/.exclude linux/drivers/net/via-rhine.c linux-dj/drivers/net/via-rhine.c --- linux/drivers/net/via-rhine.c Mon Mar 19 09:16:26 2001 +++ linux-dj/drivers/net/via-rhine.c Mon Mar 19 09:29:18 2001 @@ -1064,7 +1064,7 @@ after the Tx thread. */ static void via_rhine_interrupt(int irq, void *dev_instance, struct pt_regs *rgs) { - struct net_device *dev = (struct net_device *)dev_instance; + struct net_device *dev = dev_instance; long ioaddr; u32 intr_status; int boguscnt = max_interrupt_work; @@ -1466,7 +1466,7 @@ static void __devexit via_rhine_remove_one (struct pci_dev *pdev) { struct net_device *dev = pci_get_drvdata(pdev); - struct netdev_private *np = (struct netdev_private *)(dev->priv); + struct netdev_private *np = dev->priv; unregister_netdev(dev); diff -urN --exclude-from=/home/davej/.exclude linux/drivers/net/wan/comx-hw-mixcom.c linux-dj/drivers/net/wan/comx-hw-mixcom.c --- linux/drivers/net/wan/comx-hw-mixcom.c Mon Dec 11 21:38:29 2000 +++ linux-dj/drivers/net/wan/comx-hw-mixcom.c Mon Mar 19 23:42:27 2001 @@ -413,7 +413,7 @@ static void MIXCOM_interrupt(int irq, void *dev_id, struct pt_regs *regs) { unsigned long flags; - struct net_device *dev = (struct net_device *)dev_id; + struct net_device *dev = dev_id; struct comx_channel *ch, *twin_ch; struct mixcom_privdata *hw, *twin_hw; register unsigned char ista; diff -urN --exclude-from=/home/davej/.exclude linux/drivers/net/wan/sbni.c linux-dj/drivers/net/wan/sbni.c --- linux/drivers/net/wan/sbni.c Mon Mar 19 09:16:26 2001 +++ linux-dj/drivers/net/wan/sbni.c Mon Mar 19 23:44:42 2001 @@ -530,7 +530,7 @@ static int sbni_open(struct net_device *dev) { - struct net_local* lp = (struct net_local*)dev->priv; + struct net_local* lp = dev->priv; struct timer_list* watchdog = &lp->watchdog; unsigned long flags; @@ -559,7 +559,7 @@ static int sbni_close(struct net_device *dev) { int ioaddr = dev->base_addr; - struct net_local* lp = (struct net_local*) dev->priv; + struct net_local* lp = dev->priv; struct timer_list* watchdog = &lp->watchdog; unsigned long flags; @@ -580,7 +580,7 @@ static int sbni_start_xmit(struct sk_buff *skb, struct net_device *dev) { - struct net_local *lp = (struct net_local*)dev->priv; + struct net_local *lp = dev->priv; struct sbni_hard_header *hh=(struct sbni_hard_header *)skb->data; unsigned long flags; @@ -650,7 +650,7 @@ static void card_start(struct net_device *dev) { - struct net_local *lp = (struct net_local*)dev->priv; + struct net_local *lp = dev->priv; DP( printk("%s: card_start\n",dev->name); ) lp->wait_frame_number = 0; @@ -677,7 +677,7 @@ static inline unsigned short sbni_recv(struct net_device *dev) { - struct net_local *lp = (struct net_local*)dev->priv; + struct net_local *lp = dev->priv; unsigned long crc; unsigned short packetlen = 0; unsigned short packetinf, packetfirst, receiveframeresend; @@ -826,7 +826,7 @@ void change_level(struct net_device *dev) { - struct net_local *lp = (struct net_local*)dev->priv; + struct net_local *lp = dev->priv; lp->in_stats.bad_rx_number++; lp->stats.tx_errors++; @@ -861,7 +861,7 @@ static inline void sbni_xmit(struct net_device *dev) { - struct net_local* lp = (struct net_local *)dev->priv; + struct net_local* lp = dev->priv; struct sk_buff *skb; skb=lp->currframe; @@ -955,13 +955,13 @@ static struct net_device_stats *sbni_get_stats(struct net_device *dev) { - struct net_local *lp = (struct net_local *)dev->priv; + struct net_local *lp = dev->priv; return &lp->stats; } static inline void sbni_get_packet(struct net_device* dev) { - struct net_local* lp = (struct net_local*)dev->priv; + struct net_local* lp = dev->priv; struct sk_buff* skb; unsigned char *rawp; @@ -1025,7 +1025,7 @@ static void sbni_watchdog(unsigned long arg) { struct net_device* dev = (struct net_device*)arg; - struct net_local* lp = (struct net_local *)dev->priv; + struct net_local* lp = dev->priv; u_char csr0; @@ -1097,7 +1097,7 @@ static void sbni_drop_tx_queue(struct net_device *dev) { - struct net_local* lp = (struct net_local *)dev->priv,*nl; + struct net_local* lp = dev->priv,*nl; struct sk_buff *tmp; /* first of all, we should try to gift our packets to another interface */ @@ -1171,7 +1171,7 @@ static int sbni_set_mac_address(struct net_device *dev, void *addr) { - /* struct net_local *lp = (struct net_local *)dev->priv; */ + /* struct net_local *lp = dev->priv; */ struct sockaddr *saddr = addr; if(netif_running(dev)) @@ -1185,7 +1185,7 @@ static int sbni_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd) { - struct net_local* lp = (struct net_local *)dev->priv,*tlp; + struct net_local* lp = dev->priv,*tlp; struct net_device *slave; int error = 0; char tmpstr[6]; @@ -1282,7 +1282,7 @@ while(lp->next_lp) //tail it after last slave lp=lp->next_lp; lp->next_lp=slave->priv; - lp=(struct net_local *)dev->priv; + lp=dev->priv; dev->flags |= IFF_MASTER; } else diff -urN --exclude-from=/home/davej/.exclude linux/drivers/net/wavelan.c linux-dj/drivers/net/wavelan.c --- linux/drivers/net/wavelan.c Mon Mar 19 09:16:26 2001 +++ linux-dj/drivers/net/wavelan.c Mon Mar 19 23:45:07 2001 @@ -177,7 +177,7 @@ */ static inline void wv_ints_off(device * dev) { - net_local *lp = (net_local *) dev->priv; + net_local *lp = dev->priv; unsigned long ioaddr = dev->base_addr; lp->hacr &= ~HACR_INTRON; @@ -191,7 +191,7 @@ */ static inline void wv_ints_on(device * dev) { - net_local *lp = (net_local *) dev->priv; + net_local *lp = dev->priv; unsigned long ioaddr = dev->base_addr; lp->hacr |= HACR_INTRON; @@ -564,7 +564,7 @@ */ static void wv_ack(device * dev) { - net_local *lp = (net_local *) dev->priv; + net_local *lp = dev->priv; unsigned long ioaddr = dev->base_addr; u16 scb_cs; int i; @@ -606,7 +606,7 @@ */ static inline int wv_synchronous_cmd(device * dev, const char *str) { - net_local *lp = (net_local *) dev->priv; + net_local *lp = dev->priv; unsigned long ioaddr = dev->base_addr; u16 scb_cmd; ach_t cb; @@ -862,7 +862,7 @@ */ static inline void wv_82586_reconfig(device * dev) { - net_local *lp = (net_local *) dev->priv; + net_local *lp = dev->priv; unsigned long flags; /* Arm the flag, will be cleard in wv_82586_config() */ @@ -972,7 +972,7 @@ static void wv_mmc_show(device * dev) { unsigned long ioaddr = dev->base_addr; - net_local *lp = (net_local *) dev->priv; + net_local *lp = dev->priv; mmr_t m; /* Basic check */ @@ -1154,7 +1154,7 @@ */ static void wv_ru_show(device * dev) { - /* net_local *lp = (net_local *) dev->priv; */ + /* net_local *lp = dev->priv; */ printk(KERN_DEBUG "##### WaveLAN i82586 receiver unit status: #####\n"); @@ -1200,7 +1200,7 @@ */ static void wv_cu_show(device * dev) { - net_local *lp = (net_local *) dev->priv; + net_local *lp = dev->priv; unsigned int i; u16 p; @@ -1242,7 +1242,7 @@ { net_local *lp; - lp = (net_local *) dev->priv; + lp = dev->priv; printk(KERN_DEBUG "local:"); printk(" tx_n_in_use=%d,", lp->tx_n_in_use); @@ -1303,7 +1303,7 @@ static inline void wv_init_info(device * dev) { short ioaddr = dev->base_addr; - net_local *lp = (net_local *) dev->priv; + net_local *lp = dev->priv; psa_t psa; int i; @@ -1429,7 +1429,7 @@ */ static void wavelan_set_multicast_list(device * dev) { - net_local *lp = (net_local *) dev->priv; + net_local *lp = dev->priv; #ifdef DEBUG_IOCTL_TRACE printk(KERN_DEBUG "%s: ->wavelan_set_multicast_list()\n", @@ -1742,7 +1742,7 @@ static inline void wl_spy_gather(device * dev, u8 * mac, /* MAC address */ u8 * stats) { /* Statistics to gather */ - net_local *lp = (net_local *) dev->priv; + net_local *lp = dev->priv; int i; /* Check all addresses. */ @@ -1770,7 +1770,7 @@ */ static inline void wl_his_gather(device * dev, u8 * stats) { /* Statistics to gather */ - net_local *lp = (net_local *) dev->priv; + net_local *lp = dev->priv; u8 level = stats[0] & MMR_SIGNAL_LVL; int i; @@ -1794,7 +1794,7 @@ int cmd) { /* ioctl number */ unsigned long ioaddr = dev->base_addr; - net_local *lp = (net_local *) dev->priv; /* lp is not unused */ + net_local *lp = dev->priv; /* lp is not unused */ struct iwreq *wrq = (struct iwreq *) rq; psa_t psa; mm_t m; @@ -2315,7 +2315,7 @@ static iw_stats *wavelan_get_wireless_stats(device * dev) { unsigned long ioaddr = dev->base_addr; - net_local *lp = (net_local *) dev->priv; + net_local *lp = dev->priv; mmr_t m; iw_stats *wstats; unsigned long flags; @@ -2391,7 +2391,7 @@ static inline void wv_packet_read(device * dev, u16 buf_off, int sksize) { - net_local *lp = (net_local *) dev->priv; + net_local *lp = dev->priv; unsigned long ioaddr = dev->base_addr; struct sk_buff *skb; @@ -2487,7 +2487,7 @@ static inline void wv_receive(device * dev) { unsigned long ioaddr = dev->base_addr; - net_local *lp = (net_local *) dev->priv; + net_local *lp = dev->priv; fd_t fd; rbd_t rbd; int nreaped = 0; @@ -2669,7 +2669,7 @@ */ static inline int wv_packet_write(device * dev, void *buf, short length) { - net_local *lp = (net_local *) dev->priv; + net_local *lp = dev->priv; unsigned long ioaddr = dev->base_addr; unsigned short txblock; unsigned short txpred; @@ -2801,7 +2801,7 @@ */ static int wavelan_packet_xmit(struct sk_buff *skb, device * dev) { - net_local *lp = (net_local *) dev->priv; + net_local *lp = dev->priv; unsigned long flags; #ifdef DEBUG_TX_TRACE @@ -2856,7 +2856,7 @@ static inline int wv_mmc_init(device * dev) { unsigned long ioaddr = dev->base_addr; - net_local *lp = (net_local *) dev->priv; + net_local *lp = dev->priv; psa_t psa; mmw_t m; int configured; @@ -3027,7 +3027,7 @@ */ static inline int wv_ru_start(device * dev) { - net_local *lp = (net_local *) dev->priv; + net_local *lp = dev->priv; unsigned long ioaddr = dev->base_addr; u16 scb_cs; fd_t fd; @@ -3119,7 +3119,7 @@ */ static inline int wv_cu_start(device * dev) { - net_local *lp = (net_local *) dev->priv; + net_local *lp = dev->priv; unsigned long ioaddr = dev->base_addr; int i; u16 txblock; @@ -3220,7 +3220,7 @@ */ static inline int wv_82586_start(device * dev) { - net_local *lp = (net_local *) dev->priv; + net_local *lp = dev->priv; unsigned long ioaddr = dev->base_addr; scp_t scp; /* system configuration pointer */ iscp_t iscp; /* intermediate scp */ @@ -3352,7 +3352,7 @@ */ static void wv_82586_config(device * dev) { - net_local *lp = (net_local *) dev->priv; + net_local *lp = dev->priv; unsigned long ioaddr = dev->base_addr; unsigned short txblock; unsigned short txpred; @@ -3532,7 +3532,7 @@ */ static inline void wv_82586_stop(device * dev) { - net_local *lp = (net_local *) dev->priv; + net_local *lp = dev->priv; unsigned long ioaddr = dev->base_addr; u16 scb_cmd; @@ -3569,7 +3569,7 @@ */ static int wv_hw_reset(device * dev) { - net_local *lp = (net_local *) dev->priv; + net_local *lp = dev->priv; unsigned long ioaddr = dev->base_addr; #ifdef DEBUG_CONFIG_TRACE @@ -3668,7 +3668,7 @@ printk(KERN_DEBUG "%s: ->wavelan_interrupt()\n", dev->name); #endif - lp = (net_local *) dev->priv; + lp = dev->priv; ioaddr = dev->base_addr; #ifdef DEBUG_INTERRUPT_INFO @@ -3790,7 +3790,7 @@ */ static void wavelan_watchdog(device * dev) { - net_local * lp = (net_local *)dev->priv; + net_local * lp = dev->priv; u_long ioaddr = dev->base_addr; unsigned long flags; unsigned int nreaped; @@ -3870,7 +3870,7 @@ */ static int wavelan_open(device * dev) { - net_local * lp = (net_local *)dev->priv; + net_local * lp = dev->priv; unsigned long flags; #ifdef DEBUG_CALLBACK_TRACE @@ -3925,7 +3925,7 @@ */ static int wavelan_close(device * dev) { - net_local *lp = (net_local *) dev->priv; + net_local *lp = dev->priv; unsigned long flags; #ifdef DEBUG_CALLBACK_TRACE @@ -4019,7 +4019,7 @@ return -ENOMEM; } memset(dev->priv, 0x00, sizeof(net_local)); - lp = (net_local *) dev->priv; + lp = dev->priv; /* Back link to the device structure. */ lp->dev = dev; diff -urN --exclude-from=/home/davej/.exclude linux/drivers/net/yellowfin.c linux-dj/drivers/net/yellowfin.c --- linux/drivers/net/yellowfin.c Mon Mar 19 09:16:26 2001 +++ linux-dj/drivers/net/yellowfin.c Mon Mar 19 09:29:20 2001 @@ -549,7 +549,7 @@ static int yellowfin_open(struct net_device *dev) { - struct yellowfin_private *yp = (struct yellowfin_private *)dev->priv; + struct yellowfin_private *yp = dev->priv; long ioaddr = dev->base_addr; int i; @@ -631,7 +631,7 @@ static void yellowfin_timer(unsigned long data) { struct net_device *dev = (struct net_device *)data; - struct yellowfin_private *yp = (struct yellowfin_private *)dev->priv; + struct yellowfin_private *yp = dev->priv; long ioaddr = dev->base_addr; int next_tick = 60*HZ; @@ -668,7 +668,7 @@ static void yellowfin_tx_timeout(struct net_device *dev) { - struct yellowfin_private *yp = (struct yellowfin_private *)dev->priv; + struct yellowfin_private *yp = dev->priv; long ioaddr = dev->base_addr; printk(KERN_WARNING "%s: Yellowfin transmit timed out at %d/%d Tx " @@ -705,7 +705,7 @@ /* Initialize the Rx and Tx rings, along with various 'dev' bits. */ static void yellowfin_init_ring(struct net_device *dev) { - struct yellowfin_private *yp = (struct yellowfin_private *)dev->priv; + struct yellowfin_private *yp = dev->priv; int i; yp->tx_full = 0; @@ -777,7 +777,7 @@ static int yellowfin_start_xmit(struct sk_buff *skb, struct net_device *dev) { - struct yellowfin_private *yp = (struct yellowfin_private *)dev->priv; + struct yellowfin_private *yp = dev->priv; unsigned entry; netif_stop_queue (dev); @@ -850,7 +850,7 @@ after the Tx thread. */ static void yellowfin_interrupt(int irq, void *dev_instance, struct pt_regs *regs) { - struct net_device *dev = (struct net_device *)dev_instance; + struct net_device *dev = dev_instance; struct yellowfin_private *yp; long ioaddr; int boguscnt = max_interrupt_work; @@ -863,7 +863,7 @@ #endif ioaddr = dev->base_addr; - yp = (struct yellowfin_private *)dev->priv; + yp = dev->priv; spin_lock (&yp->lock); @@ -1001,7 +1001,7 @@ for clarity and better register allocation. */ static int yellowfin_rx(struct net_device *dev) { - struct yellowfin_private *yp = (struct yellowfin_private *)dev->priv; + struct yellowfin_private *yp = dev->priv; int entry = yp->cur_rx % RX_RING_SIZE; int boguscnt = yp->dirty_rx + RX_RING_SIZE - yp->cur_rx; @@ -1140,7 +1140,7 @@ static void yellowfin_error(struct net_device *dev, int intr_status) { - struct yellowfin_private *yp = (struct yellowfin_private *)dev->priv; + struct yellowfin_private *yp = dev->priv; printk(KERN_ERR "%s: Something Wicked happened! %4.4x.\n", dev->name, intr_status); @@ -1154,7 +1154,7 @@ static int yellowfin_close(struct net_device *dev) { long ioaddr = dev->base_addr; - struct yellowfin_private *yp = (struct yellowfin_private *)dev->priv; + struct yellowfin_private *yp = dev->priv; int i; netif_stop_queue (dev); @@ -1241,7 +1241,7 @@ static struct net_device_stats *yellowfin_get_stats(struct net_device *dev) { - struct yellowfin_private *yp = (struct yellowfin_private *)dev->priv; + struct yellowfin_private *yp = dev->priv; return &yp->stats; } @@ -1272,7 +1272,7 @@ static void set_rx_mode(struct net_device *dev) { - struct yellowfin_private *yp = (struct yellowfin_private *)dev->priv; + struct yellowfin_private *yp = dev->priv; long ioaddr = dev->base_addr; u16 cfg_value = inw(ioaddr + Cnfg); @@ -1318,7 +1318,7 @@ static int mii_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) { - struct yellowfin_private *np = (void *)dev->priv; + struct yellowfin_private *np = dev->priv; long ioaddr = dev->base_addr; u16 *data = (u16 *)&rq->ifr_data; diff -urN --exclude-from=/home/davej/.exclude linux/drivers/net/znet.c linux-dj/drivers/net/znet.c --- linux/drivers/net/znet.c Tue Feb 13 21:15:05 2001 +++ linux-dj/drivers/net/znet.c Mon Mar 19 09:29:20 2001 @@ -246,7 +246,7 @@ if (znet_debug > 0) printk("%s%s", KERN_INFO, version); - dev->priv = (void *) &zn; + dev->priv = &zn; zn.rx_dma = netinfo->dma1; zn.tx_dma = netinfo->dma2; zn.lock = SPIN_LOCK_UNLOCKED; @@ -346,7 +346,7 @@ static int znet_send_packet(struct sk_buff *skb, struct net_device *dev) { int ioaddr = dev->base_addr; - struct net_local *lp = (struct net_local *)dev->priv; + struct net_local *lp = dev->priv; unsigned long flags; if (znet_debug > 4) @@ -417,7 +417,7 @@ static void znet_interrupt(int irq, void *dev_id, struct pt_regs * regs) { struct net_device *dev = dev_id; - struct net_local *lp = (struct net_local *)dev->priv; + struct net_local *lp = dev->priv; int ioaddr; int boguscnt = 20; @@ -482,7 +482,7 @@ static void znet_rx(struct net_device *dev) { - struct net_local *lp = (struct net_local *)dev->priv; + struct net_local *lp = dev->priv; int ioaddr = dev->base_addr; int boguscount = 1; short next_frame_end_offset = 0; /* Offset of next frame start. */ @@ -635,7 +635,7 @@ closed. */ static struct net_device_stats *net_get_stats(struct net_device *dev) { - struct net_local *lp = (struct net_local *)dev->priv; + struct net_local *lp = dev->priv; return &lp->stats; }