From 02ff82cac7ee7351d2649c4a3568f12e4e0fe534 Mon Sep 17 00:00:00 2001 From: Tony Jones Date: Tue, 25 Sep 2007 02:03:03 +0200 Subject: cosa: Convert from class_device to device for cosa sync driver struct class_device is going away, this converts the code to use struct device instead. Signed-off-by: Tony Jones Cc: Jan "Yenya" Kasprzak Cc: Kay Sievers Signed-off-by: Greg Kroah-Hartman --- drivers/net/wan/cosa.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'drivers/net/wan') diff --git a/drivers/net/wan/cosa.c b/drivers/net/wan/cosa.c index ff37bf437a99..1d706eae3052 100644 --- a/drivers/net/wan/cosa.c +++ b/drivers/net/wan/cosa.c @@ -395,8 +395,7 @@ static int __init cosa_init(void) goto out_chrdev; } for (i=0; i Date: Mon, 29 Oct 2007 05:46:16 -0400 Subject: [netdrvr] irq handler minor cleanups in several drivers * use irq_handler_t where appropriate * no need to use 'irq' function arg, its already stored in a data struct * rename irq handler 'irq' argument to 'dummy', where the function has been analyzed and proven not to use its first argument. * remove always-false "dev_id == NULL" test from irq handlers * remove pointless casts from void* * declance: irq argument is not const * add KERN_xxx printk prefix * fix minor whitespace weirdness Signed-off-by: Jeff Garzik --- arch/ia64/hp/sim/simeth.c | 5 ----- arch/ppc/8260_io/enet.c | 4 ++-- arch/ppc/8260_io/fcc_enet.c | 4 ++-- drivers/net/cpmac.c | 3 --- drivers/net/declance.c | 6 +++--- drivers/net/eexpress.c | 11 ++++++----- drivers/net/ibmlana.c | 4 ++-- drivers/net/irda/irport.h | 2 +- drivers/net/irda/smsc-ircc2.c | 17 ++++------------- drivers/net/irda/via-ircc.c | 12 +++--------- drivers/net/ixgbe/ixgbe_main.c | 2 +- drivers/net/lp486e.c | 9 ++++----- drivers/net/pcmcia/fmvj18x_cs.c | 7 +------ drivers/net/ucc_geth.c | 3 --- drivers/net/wan/farsync.c | 11 +++-------- drivers/net/wan/sdla.c | 5 +++-- drivers/net/wireless/airo.c | 5 +++-- drivers/net/wireless/hostap/hostap_hw.c | 2 +- drivers/net/wireless/libertas/if_cs.c | 2 +- 19 files changed, 40 insertions(+), 74 deletions(-) (limited to 'drivers/net/wan') diff --git a/arch/ia64/hp/sim/simeth.c b/arch/ia64/hp/sim/simeth.c index 08b117e2c54b..9898febf609a 100644 --- a/arch/ia64/hp/sim/simeth.c +++ b/arch/ia64/hp/sim/simeth.c @@ -497,11 +497,6 @@ simeth_interrupt(int irq, void *dev_id) { struct net_device *dev = dev_id; - if ( dev == NULL ) { - printk(KERN_WARNING "simeth: irq %d for unknown device\n", irq); - return IRQ_NONE; - } - /* * very simple loop because we get interrupts only when receiving */ diff --git a/arch/ppc/8260_io/enet.c b/arch/ppc/8260_io/enet.c index 615b6583d9b0..06bb5b77ea62 100644 --- a/arch/ppc/8260_io/enet.c +++ b/arch/ppc/8260_io/enet.c @@ -272,7 +272,7 @@ scc_enet_timeout(struct net_device *dev) * This is called from the CPM handler, not the MPC core interrupt. */ static irqreturn_t -scc_enet_interrupt(int irq, void * dev_id) +scc_enet_interrupt(int irq, void *dev_id) { struct net_device *dev = dev_id; volatile struct scc_enet_private *cep; @@ -280,7 +280,7 @@ scc_enet_interrupt(int irq, void * dev_id) ushort int_events; int must_restart; - cep = (struct scc_enet_private *)dev->priv; + cep = dev->priv; /* Get the interrupt events that caused us to be here. */ diff --git a/arch/ppc/8260_io/fcc_enet.c b/arch/ppc/8260_io/fcc_enet.c index 6f3ed6a72e0b..a3a27dafff1f 100644 --- a/arch/ppc/8260_io/fcc_enet.c +++ b/arch/ppc/8260_io/fcc_enet.c @@ -524,7 +524,7 @@ fcc_enet_timeout(struct net_device *dev) /* The interrupt handler. */ static irqreturn_t -fcc_enet_interrupt(int irq, void * dev_id) +fcc_enet_interrupt(int irq, void *dev_id) { struct net_device *dev = dev_id; volatile struct fcc_enet_private *cep; @@ -532,7 +532,7 @@ fcc_enet_interrupt(int irq, void * dev_id) ushort int_events; int must_restart; - cep = (struct fcc_enet_private *)dev->priv; + cep = dev->priv; /* Get the interrupt events that caused us to be here. */ diff --git a/drivers/net/cpmac.c b/drivers/net/cpmac.c index 6e12d48351b8..6ccebb830ff9 100644 --- a/drivers/net/cpmac.c +++ b/drivers/net/cpmac.c @@ -661,9 +661,6 @@ static irqreturn_t cpmac_irq(int irq, void *dev_id) int queue; u32 status; - if (!dev) - return IRQ_NONE; - priv = netdev_priv(dev); status = cpmac_read(priv->regs, CPMAC_MAC_INT_VECTOR); diff --git a/drivers/net/declance.c b/drivers/net/declance.c index 00e0194bfef0..6b1e77cc069e 100644 --- a/drivers/net/declance.c +++ b/drivers/net/declance.c @@ -719,15 +719,15 @@ out: spin_unlock(&lp->lock); } -static irqreturn_t lance_dma_merr_int(const int irq, void *dev_id) +static irqreturn_t lance_dma_merr_int(int irq, void *dev_id) { struct net_device *dev = dev_id; - printk("%s: DMA error\n", dev->name); + printk(KERN_ERR "%s: DMA error\n", dev->name); return IRQ_HANDLED; } -static irqreturn_t lance_interrupt(const int irq, void *dev_id) +static irqreturn_t lance_interrupt(int irq, void *dev_id) { struct net_device *dev = dev_id; struct lance_private *lp = netdev_priv(dev); diff --git a/drivers/net/eexpress.c b/drivers/net/eexpress.c index 70509ed6c11d..8969c3b6d443 100644 --- a/drivers/net/eexpress.c +++ b/drivers/net/eexpress.c @@ -456,8 +456,9 @@ static int eexp_open(struct net_device *dev) if (!dev->irq || !irqrmap[dev->irq]) return -ENXIO; - ret = request_irq(dev->irq,&eexp_irq,0,dev->name,dev); - if (ret) return ret; + ret = request_irq(dev->irq, &eexp_irq, 0, dev->name, dev); + if (ret) + return ret; if (!request_region(ioaddr, EEXP_IO_EXTENT, "EtherExpress")) { printk(KERN_WARNING "EtherExpress io port %x, is busy.\n" @@ -768,7 +769,7 @@ static void eexp_cmd_clear(struct net_device *dev) } } -static irqreturn_t eexp_irq(int irq, void *dev_info) +static irqreturn_t eexp_irq(int dummy, void *dev_info) { struct net_device *dev = dev_info; struct net_local *lp; @@ -783,7 +784,7 @@ static irqreturn_t eexp_irq(int irq, void *dev_info) old_read_ptr = inw(ioaddr+READ_PTR); old_write_ptr = inw(ioaddr+WRITE_PTR); - outb(SIRQ_dis|irqrmap[irq],ioaddr+SET_IRQ); + outb(SIRQ_dis|irqrmap[dev->irq],ioaddr+SET_IRQ); status = scb_status(dev); @@ -851,7 +852,7 @@ static irqreturn_t eexp_irq(int irq, void *dev_info) eexp_cmd_clear(dev); - outb(SIRQ_en|irqrmap[irq],ioaddr+SET_IRQ); + outb(SIRQ_en|irqrmap[dev->irq],ioaddr+SET_IRQ); #if NET_DEBUG > 6 printk("%s: leaving eexp_irq()\n", dev->name); diff --git a/drivers/net/ibmlana.c b/drivers/net/ibmlana.c index 91d83aca6bc7..65626d61de46 100644 --- a/drivers/net/ibmlana.c +++ b/drivers/net/ibmlana.c @@ -704,9 +704,9 @@ static void irqtxerr_handler(struct net_device *dev) /* general interrupt entry */ -static irqreturn_t irq_handler(int irq, void *device) +static irqreturn_t irq_handler(int dummy, void *device) { - struct net_device *dev = (struct net_device *) device; + struct net_device *dev = device; u16 ival; /* in case we're not meant... */ diff --git a/drivers/net/irda/irport.h b/drivers/net/irda/irport.h index 66fc2433e97d..39829cffba13 100644 --- a/drivers/net/irda/irport.h +++ b/drivers/net/irda/irport.h @@ -74,7 +74,7 @@ struct irport_cb { /* For piggyback drivers */ void *priv; void (*change_speed)(void *priv, __u32 speed); - irqreturn_t (*interrupt)(int irq, void *dev_id); + irq_handler_t interrupt; }; #endif /* IRPORT_H */ diff --git a/drivers/net/irda/smsc-ircc2.c b/drivers/net/irda/smsc-ircc2.c index 7e7b5828214a..1f26da761e9f 100644 --- a/drivers/net/irda/smsc-ircc2.c +++ b/drivers/net/irda/smsc-ircc2.c @@ -1505,22 +1505,13 @@ static void smsc_ircc_sir_receive(struct smsc_ircc_cb *self) * An interrupt from the chip has arrived. Time to do some work * */ -static irqreturn_t smsc_ircc_interrupt(int irq, void *dev_id) +static irqreturn_t smsc_ircc_interrupt(int dummy, void *dev_id) { - struct net_device *dev = (struct net_device *) dev_id; - struct smsc_ircc_cb *self; + struct net_device *dev = dev_id; + struct smsc_ircc_cb *self = netdev_priv(dev); int iobase, iir, lcra, lsr; irqreturn_t ret = IRQ_NONE; - if (dev == NULL) { - printk(KERN_WARNING "%s: irq %d for unknown device.\n", - driver_name, irq); - goto irq_ret; - } - - self = netdev_priv(dev); - IRDA_ASSERT(self != NULL, return IRQ_NONE;); - /* Serialise the interrupt handler in various CPUs, stop Tx path */ spin_lock(&self->lock); @@ -1565,7 +1556,7 @@ static irqreturn_t smsc_ircc_interrupt(int irq, void *dev_id) irq_ret_unlock: spin_unlock(&self->lock); - irq_ret: + return ret; } diff --git a/drivers/net/irda/via-ircc.c b/drivers/net/irda/via-ircc.c index 126ec7c8680e..58e128784585 100644 --- a/drivers/net/irda/via-ircc.c +++ b/drivers/net/irda/via-ircc.c @@ -1346,19 +1346,13 @@ static int RxTimerHandler(struct via_ircc_cb *self, int iobase) * An interrupt from the chip has arrived. Time to do some work * */ -static irqreturn_t via_ircc_interrupt(int irq, void *dev_id) +static irqreturn_t via_ircc_interrupt(int dummy, void *dev_id) { - struct net_device *dev = (struct net_device *) dev_id; - struct via_ircc_cb *self; + struct net_device *dev = dev_id; + struct via_ircc_cb *self = dev->priv; int iobase; u8 iHostIntType, iRxIntType, iTxIntType; - if (!dev) { - IRDA_WARNING("%s: irq %d for unknown device.\n", driver_name, - irq); - return IRQ_NONE; - } - self = (struct via_ircc_cb *) dev->priv; iobase = self->io.fir_base; spin_lock(&self->lock); iHostIntType = GetHostStatus(iobase); diff --git a/drivers/net/ixgbe/ixgbe_main.c b/drivers/net/ixgbe/ixgbe_main.c index a4265bc1cebb..88341bfb5634 100644 --- a/drivers/net/ixgbe/ixgbe_main.c +++ b/drivers/net/ixgbe/ixgbe_main.c @@ -734,7 +734,7 @@ static int ixgbe_request_irq(struct ixgbe_adapter *adapter, u32 *num_rx_queues) { struct net_device *netdev = adapter->netdev; int flags, err; - irqreturn_t(*handler) (int, void *) = &ixgbe_intr; + irq_handler_t handler = ixgbe_intr; flags = IRQF_SHARED; diff --git a/drivers/net/lp486e.c b/drivers/net/lp486e.c index c5095ecd8b11..0eff1a00c43c 100644 --- a/drivers/net/lp486e.c +++ b/drivers/net/lp486e.c @@ -1144,14 +1144,13 @@ i596_handle_CU_completion(struct net_device *dev, } static irqreturn_t -i596_interrupt (int irq, void *dev_instance) { - struct net_device *dev = (struct net_device *) dev_instance; - struct i596_private *lp; +i596_interrupt (int irq, void *dev_instance) +{ + struct net_device *dev = dev_instance; + struct i596_private *lp = dev->priv; unsigned short status, ack_cmd = 0; int frames_in = 0; - lp = (struct i596_private *) dev->priv; - /* * The 82596 examines the command, performs the required action, * and then clears the SCB command word. diff --git a/drivers/net/pcmcia/fmvj18x_cs.c b/drivers/net/pcmcia/fmvj18x_cs.c index 8c719b4df544..949c6df74c97 100644 --- a/drivers/net/pcmcia/fmvj18x_cs.c +++ b/drivers/net/pcmcia/fmvj18x_cs.c @@ -731,18 +731,13 @@ module_exit(exit_fmvj18x_cs); /*====================================================================*/ -static irqreturn_t fjn_interrupt(int irq, void *dev_id) +static irqreturn_t fjn_interrupt(int dummy, void *dev_id) { struct net_device *dev = dev_id; local_info_t *lp = netdev_priv(dev); kio_addr_t ioaddr; unsigned short tx_stat, rx_stat; - if (lp == NULL) { - printk(KERN_NOTICE "fjn_interrupt(): irq %d for " - "unknown device.\n", irq); - return IRQ_NONE; - } ioaddr = dev->base_addr; /* avoid multiple interrupts */ diff --git a/drivers/net/ucc_geth.c b/drivers/net/ucc_geth.c index abac7db3819e..73d6ac9406b3 100644 --- a/drivers/net/ucc_geth.c +++ b/drivers/net/ucc_geth.c @@ -3614,9 +3614,6 @@ static irqreturn_t ucc_geth_irq_handler(int irq, void *info) ugeth_vdbg("%s: IN", __FUNCTION__); - if (!ugeth) - return IRQ_NONE; - uccf = ugeth->uccf; ug_info = ugeth->ug_info; diff --git a/drivers/net/wan/farsync.c b/drivers/net/wan/farsync.c index 12dae8e24844..cf27bf40d36e 100644 --- a/drivers/net/wan/farsync.c +++ b/drivers/net/wan/farsync.c @@ -1498,9 +1498,9 @@ do_bottom_half_rx(struct fst_card_info *card) * Dev_id is our fst_card_info pointer */ static irqreturn_t -fst_intr(int irq, void *dev_id) +fst_intr(int dummy, void *dev_id) { - struct fst_card_info *card; + struct fst_card_info *card = dev_id; struct fst_port_info *port; int rdidx; /* Event buffer indices */ int wridx; @@ -1509,17 +1509,12 @@ fst_intr(int irq, void *dev_id) unsigned int do_card_interrupt; unsigned int int_retry_count; - if ((card = dev_id) == NULL) { - dbg(DBG_INTR, "intr: spurious %d\n", irq); - return IRQ_NONE; - } - /* * Check to see if the interrupt was for this card * return if not * Note that the call to clear the interrupt is important */ - dbg(DBG_INTR, "intr: %d %p\n", irq, card); + dbg(DBG_INTR, "intr: %d %p\n", card->irq, card); if (card->state != FST_RUNNING) { printk_err ("Interrupt received for card %d in a non running state (%d)\n", diff --git a/drivers/net/wan/sdla.c b/drivers/net/wan/sdla.c index 05df0a345b60..73e2f2780932 100644 --- a/drivers/net/wan/sdla.c +++ b/drivers/net/wan/sdla.c @@ -867,7 +867,7 @@ static void sdla_receive(struct net_device *dev) spin_unlock_irqrestore(&sdla_lock, flags); } -static irqreturn_t sdla_isr(int irq, void *dev_id) +static irqreturn_t sdla_isr(int dummy, void *dev_id) { struct net_device *dev; struct frad_local *flp; @@ -879,7 +879,8 @@ static irqreturn_t sdla_isr(int irq, void *dev_id) if (!flp->initialized) { - printk(KERN_WARNING "%s: irq %d for uninitialized device.\n", dev->name, irq); + printk(KERN_WARNING "%s: irq %d for uninitialized device.\n", + dev->name, dev->irq); return IRQ_NONE; } diff --git a/drivers/net/wireless/airo.c b/drivers/net/wireless/airo.c index e3eca6d047c7..d8948bf8a275 100644 --- a/drivers/net/wireless/airo.c +++ b/drivers/net/wireless/airo.c @@ -3177,8 +3177,9 @@ static int airo_thread(void *data) { return 0; } -static irqreturn_t airo_interrupt ( int irq, void* dev_id) { - struct net_device *dev = (struct net_device *)dev_id; +static irqreturn_t airo_interrupt(int irq, void *dev_id) +{ + struct net_device *dev = dev_id; u16 status; u16 fid; struct airo_info *apriv = dev->priv; diff --git a/drivers/net/wireless/hostap/hostap_hw.c b/drivers/net/wireless/hostap/hostap_hw.c index c592641e914e..286b46c516ce 100644 --- a/drivers/net/wireless/hostap/hostap_hw.c +++ b/drivers/net/wireless/hostap/hostap_hw.c @@ -2624,7 +2624,7 @@ static void prism2_check_magic(local_info_t *local) /* Called only from hardware IRQ */ static irqreturn_t prism2_interrupt(int irq, void *dev_id) { - struct net_device *dev = (struct net_device *) dev_id; + struct net_device *dev = dev_id; struct hostap_interface *iface; local_info_t *local; int events = 0; diff --git a/drivers/net/wireless/libertas/if_cs.c b/drivers/net/wireless/libertas/if_cs.c index ba4fc2b3bf0a..d383c0f9fe3e 100644 --- a/drivers/net/wireless/libertas/if_cs.c +++ b/drivers/net/wireless/libertas/if_cs.c @@ -243,7 +243,7 @@ static inline void if_cs_disable_ints(struct if_cs_card *card) static irqreturn_t if_cs_interrupt(int irq, void *data) { - struct if_cs_card *card = (struct if_cs_card *)data; + struct if_cs_card *card = data; u16 int_cause; lbs_deb_enter(LBS_DEB_CS); -- cgit v1.2.3-59-g8ed1b From 93ab8e84dec242b868ec2e2ae42cb55a46b8c598 Mon Sep 17 00:00:00 2001 From: Joe Perches Date: Mon, 19 Nov 2007 17:48:26 -0800 Subject: drivers/net/wan: Add missing "space" Signed-off-by: Joe Perches Signed-off-by: Jeff Garzik --- drivers/net/wan/wanxl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'drivers/net/wan') diff --git a/drivers/net/wan/wanxl.c b/drivers/net/wan/wanxl.c index 8e320b76ae0e..ad8c8651d298 100644 --- a/drivers/net/wan/wanxl.c +++ b/drivers/net/wan/wanxl.c @@ -743,7 +743,7 @@ static int __devinit wanxl_pci_init_one(struct pci_dev *pdev, }while (time_after(timeout, jiffies)); if (!stat) { - printk(KERN_WARNING "wanXL %s: timeout while initializing card" + printk(KERN_WARNING "wanXL %s: timeout while initializing card " "firmware\n", pci_name(pdev)); wanxl_pci_remove_one(pdev); return -ENODEV; -- cgit v1.2.3-59-g8ed1b From 79ea13ce07c951bb4d95471e7300baa0f1be9e78 Mon Sep 17 00:00:00 2001 From: Al Viro Date: Thu, 24 Jan 2008 02:06:46 -0800 Subject: NULL noise in drivers/net Signed-off-by: Al Viro Signed-off-by: Jeff Garzik Signed-off-by: David S. Miller --- drivers/net/3c515.c | 2 +- drivers/net/7990.c | 8 +++----- drivers/net/a2065.c | 10 ++++------ drivers/net/bnx2.c | 4 ++-- drivers/net/cassini.c | 2 +- drivers/net/eepro100.c | 2 +- drivers/net/hamradio/6pack.c | 2 +- drivers/net/hamradio/mkiss.c | 2 +- drivers/net/hp100.c | 2 +- drivers/net/mac89x0.c | 2 +- drivers/net/mace.c | 10 +++++----- drivers/net/netxen/netxen_nic_main.c | 6 +++--- drivers/net/skfp/hwmtm.c | 4 ++-- drivers/net/skfp/smt.c | 2 +- drivers/net/sungem.c | 2 +- drivers/net/sunhme.c | 2 +- drivers/net/tg3.c | 2 +- drivers/net/tokenring/smctr.c | 4 ++-- drivers/net/wan/lmc/lmc_main.c | 6 +++--- drivers/net/wan/lmc/lmc_media.c | 8 ++------ drivers/net/wan/pc300_drv.c | 8 ++++---- drivers/net/wan/pc300_tty.c | 12 ++++++------ drivers/net/wireless/airo.c | 2 +- drivers/net/xen-netfront.c | 2 +- 24 files changed, 49 insertions(+), 57 deletions(-) (limited to 'drivers/net/wan') diff --git a/drivers/net/3c515.c b/drivers/net/3c515.c index 684bab781015..6ab84b661d70 100644 --- a/drivers/net/3c515.c +++ b/drivers/net/3c515.c @@ -1361,7 +1361,7 @@ static int boomerang_rx(struct net_device *dev) /* Check if the packet is long enough to just accept without copying to a properly sized skbuff. */ if (pkt_len < rx_copybreak - && (skb = dev_alloc_skb(pkt_len + 4)) != 0) { + && (skb = dev_alloc_skb(pkt_len + 4)) != NULL) { skb_reserve(skb, 2); /* Align IP on 16 byte boundaries */ /* 'skb_put()' points to the start of sk_buff data area. */ memcpy(skb_put(skb, pkt_len), diff --git a/drivers/net/7990.c b/drivers/net/7990.c index 224e0bff1ae0..750a46f4bc58 100644 --- a/drivers/net/7990.c +++ b/drivers/net/7990.c @@ -277,8 +277,6 @@ static int lance_rx (struct net_device *dev) volatile struct lance_init_block *ib = lp->init_block; volatile struct lance_rx_desc *rd; unsigned char bits; - int len = 0; /* XXX shut up gcc warnings */ - struct sk_buff *skb = 0; /* XXX shut up gcc warnings */ #ifdef TEST_HITS int i; #endif @@ -318,10 +316,10 @@ static int lance_rx (struct net_device *dev) if (bits & LE_R1_FRA) dev->stats.rx_frame_errors++; if (bits & LE_R1_EOP) dev->stats.rx_errors++; } else { - len = (rd->mblength & 0xfff) - 4; - skb = dev_alloc_skb (len+2); + int len = (rd->mblength & 0xfff) - 4; + struct sk_buff *skb = dev_alloc_skb (len+2); - if (skb == 0) { + if (!skb) { printk ("%s: Memory squeeze, deferring packet.\n", dev->name); dev->stats.rx_dropped++; diff --git a/drivers/net/a2065.c b/drivers/net/a2065.c index 18f7f815f66e..6c5719ae8cca 100644 --- a/drivers/net/a2065.c +++ b/drivers/net/a2065.c @@ -269,8 +269,6 @@ static int lance_rx (struct net_device *dev) volatile struct lance_regs *ll = lp->ll; volatile struct lance_rx_desc *rd; unsigned char bits; - int len = 0; /* XXX shut up gcc warnings */ - struct sk_buff *skb = 0; /* XXX shut up gcc warnings */ #ifdef TEST_HITS int i; @@ -306,10 +304,10 @@ static int lance_rx (struct net_device *dev) if (bits & LE_R1_FRA) dev->stats.rx_frame_errors++; if (bits & LE_R1_EOP) dev->stats.rx_errors++; } else { - len = (rd->mblength & 0xfff) - 4; - skb = dev_alloc_skb (len+2); + int len = (rd->mblength & 0xfff) - 4; + struct sk_buff *skb = dev_alloc_skb (len+2); - if (skb == 0) { + if (!skb) { printk(KERN_WARNING "%s: Memory squeeze, " "deferring packet.\n", dev->name); dev->stats.rx_dropped++; @@ -477,7 +475,7 @@ static irqreturn_t lance_interrupt (int irq, void *dev_id) return IRQ_HANDLED; } -struct net_device *last_dev = 0; +struct net_device *last_dev; static int lance_open (struct net_device *dev) { diff --git a/drivers/net/bnx2.c b/drivers/net/bnx2.c index 94d1857d2c5d..3bb69d538ef0 100644 --- a/drivers/net/bnx2.c +++ b/drivers/net/bnx2.c @@ -2757,7 +2757,7 @@ bnx2_rx_int(struct bnx2 *bp, struct bnx2_napi *bnapi, int budget) } #ifdef BCM_VLAN - if ((status & L2_FHDR_STATUS_L2_VLAN_TAG) && (bp->vlgrp != 0)) { + if ((status & L2_FHDR_STATUS_L2_VLAN_TAG) && bp->vlgrp) { vlan_hwaccel_receive_skb(skb, bp->vlgrp, rx_hdr->l2_fhdr_vlan_tag); } @@ -5660,7 +5660,7 @@ bnx2_start_xmit(struct sk_buff *skb, struct net_device *dev) vlan_tag_flags |= TX_BD_FLAGS_TCP_UDP_CKSUM; } - if (bp->vlgrp != 0 && vlan_tx_tag_present(skb)) { + if (bp->vlgrp && vlan_tx_tag_present(skb)) { vlan_tag_flags |= (TX_BD_FLAGS_VLAN_TAG | (vlan_tx_tag_get(skb) << 16)); } diff --git a/drivers/net/cassini.c b/drivers/net/cassini.c index 2bacb5e4604d..14299f8063af 100644 --- a/drivers/net/cassini.c +++ b/drivers/net/cassini.c @@ -5085,7 +5085,7 @@ static int __devinit cas_init_one(struct pci_dev *pdev, /* give us access to cassini registers */ cp->regs = pci_iomap(pdev, 0, casreg_len); - if (cp->regs == 0UL) { + if (!cp->regs) { dev_err(&pdev->dev, "Cannot map device registers, aborting.\n"); goto err_out_free_res; } diff --git a/drivers/net/eepro100.c b/drivers/net/eepro100.c index 1548a80f917d..3003e9276976 100644 --- a/drivers/net/eepro100.c +++ b/drivers/net/eepro100.c @@ -1788,7 +1788,7 @@ speedo_rx(struct net_device *dev) /* Check if the packet is long enough to just accept without copying to a properly sized skbuff. */ if (pkt_len < rx_copybreak - && (skb = dev_alloc_skb(pkt_len + 2)) != 0) { + && (skb = dev_alloc_skb(pkt_len + 2)) != NULL) { skb_reserve(skb, 2); /* Align IP on 16 byte boundaries */ /* 'skb_put()' points to the start of sk_buff data area. */ pci_dma_sync_single_for_cpu(sp->pdev, sp->rx_ring_dma[entry], diff --git a/drivers/net/hamradio/6pack.c b/drivers/net/hamradio/6pack.c index 580cb4ab2af1..0a9b75139e0f 100644 --- a/drivers/net/hamradio/6pack.c +++ b/drivers/net/hamradio/6pack.c @@ -701,7 +701,7 @@ static void sixpack_close(struct tty_struct *tty) sp = tty->disc_data; tty->disc_data = NULL; write_unlock(&disc_data_lock); - if (sp == 0) + if (!sp) return; /* diff --git a/drivers/net/hamradio/mkiss.c b/drivers/net/hamradio/mkiss.c index 803a3bdea0af..cfcd15af501e 100644 --- a/drivers/net/hamradio/mkiss.c +++ b/drivers/net/hamradio/mkiss.c @@ -821,7 +821,7 @@ static void mkiss_close(struct tty_struct *tty) tty->disc_data = NULL; write_unlock(&disc_data_lock); - if (ax == 0) + if (!ax) return; /* diff --git a/drivers/net/hp100.c b/drivers/net/hp100.c index 49421d1cd3a5..571dd80fb850 100644 --- a/drivers/net/hp100.c +++ b/drivers/net/hp100.c @@ -1153,7 +1153,7 @@ static void hp100_init_pdls(struct net_device *dev) printk("hp100: %s: init pdls\n", dev->name); #endif - if (0 == lp->page_vaddr_algn) + if (!lp->page_vaddr_algn) printk("hp100: %s: Warning: lp->page_vaddr_algn not initialised!\n", dev->name); else { /* pageptr shall point into the DMA accessible memory region */ diff --git a/drivers/net/mac89x0.c b/drivers/net/mac89x0.c index a19b5958cee9..2a66e5b7cebc 100644 --- a/drivers/net/mac89x0.c +++ b/drivers/net/mac89x0.c @@ -289,7 +289,7 @@ struct net_device * __init mac89x0_probe(int unit) err = register_netdev(dev); if (err) goto out1; - return 0; + return NULL; out1: nubus_writew(0, dev->base_addr + ADD_PORT); out: diff --git a/drivers/net/mace.c b/drivers/net/mace.c index 95ebe72f320f..451acdca2a21 100644 --- a/drivers/net/mace.c +++ b/drivers/net/mace.c @@ -409,7 +409,7 @@ static inline void mace_clean_rings(struct mace_data *mp) /* free some skb's */ for (i = 0; i < N_RX_RING; ++i) { - if (mp->rx_bufs[i] != 0) { + if (mp->rx_bufs[i] != NULL) { dev_kfree_skb(mp->rx_bufs[i]); mp->rx_bufs[i] = NULL; } @@ -441,7 +441,7 @@ static int mace_open(struct net_device *dev) cp = mp->rx_cmds; for (i = 0; i < N_RX_RING - 1; ++i) { skb = dev_alloc_skb(RX_BUFLEN + 2); - if (skb == 0) { + if (!skb) { data = dummy_buf; } else { skb_reserve(skb, 2); /* so IP header lands on 4-byte bdry */ @@ -903,7 +903,7 @@ static irqreturn_t mace_rxdma_intr(int irq, void *dev_id) out_le16(&cp->command, DBDMA_STOP); /* got a packet, have a look at it */ skb = mp->rx_bufs[i]; - if (skb == 0) { + if (!skb) { ++dev->stats.rx_dropped; } else if (nb > 8) { data = skb->data; @@ -953,9 +953,9 @@ static irqreturn_t mace_rxdma_intr(int irq, void *dev_id) break; cp = mp->rx_cmds + i; skb = mp->rx_bufs[i]; - if (skb == 0) { + if (!skb) { skb = dev_alloc_skb(RX_BUFLEN + 2); - if (skb != 0) { + if (skb) { skb_reserve(skb, 2); mp->rx_bufs[i] = skb; } diff --git a/drivers/net/netxen/netxen_nic_main.c b/drivers/net/netxen/netxen_nic_main.c index 97ba14b759b4..2341b89abc4d 100644 --- a/drivers/net/netxen/netxen_nic_main.c +++ b/drivers/net/netxen/netxen_nic_main.c @@ -354,8 +354,8 @@ netxen_nic_probe(struct pci_dev *pdev, const struct pci_device_id *ent) goto err_out_free_netdev; } - if (((mem_ptr0 == 0UL) && (mem_len == NETXEN_PCI_128MB_SIZE)) || - (mem_ptr1 == 0UL) || (mem_ptr2 == 0UL)) { + if ((!mem_ptr0 && mem_len == NETXEN_PCI_128MB_SIZE) || + !mem_ptr1 || !mem_ptr2) { DPRINTK(ERR, "Cannot remap adapter memory aborting.:" "0 -> %p, 1 -> %p, 2 -> %p\n", @@ -1337,7 +1337,7 @@ static struct pci_driver netxen_driver = { static int __init netxen_init_module(void) { - if ((netxen_workq = create_singlethread_workqueue("netxen")) == 0) + if ((netxen_workq = create_singlethread_workqueue("netxen")) == NULL) return -ENOMEM; return pci_register_driver(&netxen_driver); diff --git a/drivers/net/skfp/hwmtm.c b/drivers/net/skfp/hwmtm.c index 438f424e6361..8a430a366547 100644 --- a/drivers/net/skfp/hwmtm.c +++ b/drivers/net/skfp/hwmtm.c @@ -1746,7 +1746,7 @@ static void queue_llc_rx(struct s_smc *smc, SMbuf *mb) DB_GEN("queue_llc_rx: mb = %x",(void *)mb,0,4) ; smc->os.hwm.queued_rx_frames++ ; mb->sm_next = (SMbuf *)NULL ; - if (smc->os.hwm.llc_rx_pipe == 0) { + if (smc->os.hwm.llc_rx_pipe == NULL) { smc->os.hwm.llc_rx_pipe = mb ; } else { @@ -1786,7 +1786,7 @@ static void queue_txd_mb(struct s_smc *smc, SMbuf *mb) DB_GEN("_rx: queue_txd_mb = %x",(void *)mb,0,4) ; smc->os.hwm.queued_txd_mb++ ; mb->sm_next = (SMbuf *)NULL ; - if (smc->os.hwm.txd_tx_pipe == 0) { + if (smc->os.hwm.txd_tx_pipe == NULL) { smc->os.hwm.txd_tx_pipe = mb ; } else { diff --git a/drivers/net/skfp/smt.c b/drivers/net/skfp/smt.c index ced2c8f76be7..ffbfb1b79f97 100644 --- a/drivers/net/skfp/smt.c +++ b/drivers/net/skfp/smt.c @@ -712,7 +712,7 @@ void smt_received_pack(struct s_smc *smc, SMbuf *mb, int fs) smc->mib.priv.fddiPRIVECF_Reply_Rx++ ; DB_SMT("SMT: received ECF reply from %s\n", addr_to_string(&sm->smt_source),0) ; - if (sm_to_para(smc,sm,SMT_P_ECHODATA) == 0) { + if (sm_to_para(smc,sm,SMT_P_ECHODATA) == NULL) { DB_SMT("SMT: ECHODATA missing\n",0,0) ; break ; } diff --git a/drivers/net/sungem.c b/drivers/net/sungem.c index 467d80dc3b33..97212799c513 100644 --- a/drivers/net/sungem.c +++ b/drivers/net/sungem.c @@ -3056,7 +3056,7 @@ static int __devinit gem_init_one(struct pci_dev *pdev, netif_carrier_off(dev); gp->regs = ioremap(gemreg_base, gemreg_len); - if (gp->regs == 0UL) { + if (!gp->regs) { printk(KERN_ERR PFX "Cannot map device registers, " "aborting.\n"); err = -EIO; diff --git a/drivers/net/sunhme.c b/drivers/net/sunhme.c index 25ce26a882d1..b4e7f30ea4e8 100644 --- a/drivers/net/sunhme.c +++ b/drivers/net/sunhme.c @@ -3060,7 +3060,7 @@ static int __devinit happy_meal_pci_probe(struct pci_dev *pdev, goto err_out_clear_quattro; } - if ((hpreg_base = ioremap(hpreg_res, 0x8000)) == 0) { + if ((hpreg_base = ioremap(hpreg_res, 0x8000)) == NULL) { printk(KERN_ERR "happymeal(PCI): Unable to remap card memory.\n"); goto err_out_free_res; } diff --git a/drivers/net/tg3.c b/drivers/net/tg3.c index a9f1640884b1..db606b603884 100644 --- a/drivers/net/tg3.c +++ b/drivers/net/tg3.c @@ -12675,7 +12675,7 @@ static int __devinit tg3_init_one(struct pci_dev *pdev, tg3reg_len = pci_resource_len(pdev, 2); tp->aperegs = ioremap_nocache(tg3reg_base, tg3reg_len); - if (tp->aperegs == 0UL) { + if (!tp->aperegs) { printk(KERN_ERR PFX "Cannot map APE registers, " "aborting.\n"); err = -ENOMEM; diff --git a/drivers/net/tokenring/smctr.c b/drivers/net/tokenring/smctr.c index 93da3a36cde8..8909050b8ea7 100644 --- a/drivers/net/tokenring/smctr.c +++ b/drivers/net/tokenring/smctr.c @@ -2310,7 +2310,7 @@ static irqreturn_t smctr_interrupt(int irq, void *dev_id) && (tp->acb_head->subcmd == RW_TRC_STATUS_BLOCK)) { - if(tp->ptr_bcn_type != 0) + if(tp->ptr_bcn_type) { *(tp->ptr_bcn_type) = (__u32)((SBlock *)tp->misc_command_data)->BCN_Type; @@ -2980,7 +2980,7 @@ static int smctr_load_firmware(struct net_device *dev) return (UCODE_PRESENT); /* Verify the firmware exists and is there in the right amount. */ - if((tp->ptr_ucode == 0L) + if (!tp->ptr_ucode || (*(tp->ptr_ucode + UCODE_VERSION_OFFSET) < UCODE_VERSION)) { return (UCODE_NOT_PRESENT); diff --git a/drivers/net/wan/lmc/lmc_main.c b/drivers/net/wan/lmc/lmc_main.c index 37c52e131750..6635ecef36e5 100644 --- a/drivers/net/wan/lmc/lmc_main.c +++ b/drivers/net/wan/lmc/lmc_main.c @@ -491,13 +491,13 @@ int lmc_ioctl (struct net_device *dev, struct ifreq *ifr, int cmd) /*fold00*/ int pos; int timeout = 500000; - if(xc.data == 0x0){ + if (!xc.data) { ret = -EINVAL; break; } data = kmalloc(xc.len, GFP_KERNEL); - if(data == 0x0){ + if (!data) { printk(KERN_WARNING "%s: Failed to allocate memory for copy\n", dev->name); ret = -ENOMEM; break; @@ -1643,7 +1643,7 @@ static int lmc_rx (struct net_device *dev) /*fold00*/ * just allocate an skb buff and continue. */ - if(skb == 0x0){ + if (!skb) { nsb = dev_alloc_skb (LMC_PKT_BUF_SZ + 2); if (nsb) { sc->lmc_rxq[i] = nsb; diff --git a/drivers/net/wan/lmc/lmc_media.c b/drivers/net/wan/lmc/lmc_media.c index c9c878cd5c72..8aa461c941ce 100644 --- a/drivers/net/wan/lmc/lmc_media.c +++ b/drivers/net/wan/lmc/lmc_media.c @@ -1219,10 +1219,6 @@ lmc_t1_watchdog (lmc_softc_t * const sc) static void lmc_set_protocol (lmc_softc_t * const sc, lmc_ctl_t * ctl) { - if (ctl == 0) - { - sc->ictl.keepalive_onoff = LMC_CTL_ON; - - return; - } + if (!ctl) + sc->ictl.keepalive_onoff = LMC_CTL_ON; } diff --git a/drivers/net/wan/pc300_drv.c b/drivers/net/wan/pc300_drv.c index 99fee2f1d019..57914fbd41d3 100644 --- a/drivers/net/wan/pc300_drv.c +++ b/drivers/net/wan/pc300_drv.c @@ -2365,17 +2365,17 @@ static void falc_intr(pc300_t * card) static irqreturn_t cpc_intr(int irq, void *dev_id) { - pc300_t *card; + pc300_t *card = dev_id; volatile ucchar plx_status; - if ((card = (pc300_t *) dev_id) == 0) { + if (!card) { #ifdef PC300_DEBUG_INTR printk("cpc_intr: spurious intr %d\n", irq); #endif return IRQ_NONE; /* spurious intr */ } - if (card->hw.rambase == 0) { + if (!card->hw.rambase) { #ifdef PC300_DEBUG_INTR printk("cpc_intr: spurious intr2 %d\n", irq); #endif @@ -3648,7 +3648,7 @@ static void __devexit cpc_remove_one(struct pci_dev *pdev) { pc300_t *card = pci_get_drvdata(pdev); - if (card->hw.rambase != 0) { + if (card->hw.rambase) { int i; /* Disable interrupts on the PCI bridge */ diff --git a/drivers/net/wan/pc300_tty.c b/drivers/net/wan/pc300_tty.c index e24a7b095dd6..63abfd72542d 100644 --- a/drivers/net/wan/pc300_tty.c +++ b/drivers/net/wan/pc300_tty.c @@ -313,7 +313,7 @@ static int cpc_tty_open(struct tty_struct *tty, struct file *flip) if (cpc_tty->num_open == 0) { /* first open of this tty */ if (!cpc_tty_area[port].buf_tx){ cpc_tty_area[port].buf_tx = kmalloc(CPC_TTY_MAX_MTU,GFP_KERNEL); - if (cpc_tty_area[port].buf_tx == 0){ + if (!cpc_tty_area[port].buf_tx) { CPC_TTY_DBG("%s: error in memory allocation\n",cpc_tty->name); return -ENOMEM; } @@ -678,7 +678,7 @@ static void cpc_tty_rx_work(struct work_struct *work) for (j=0; j < CPC_TTY_NPORTS; j++) { cpc_tty = &cpc_tty_area[port]; - if ((buf=cpc_tty->buf_rx.first) != 0) { + if ((buf=cpc_tty->buf_rx.first) != NULL) { if (cpc_tty->tty) { ld = tty_ldisc_ref(cpc_tty->tty); if (ld) { @@ -784,7 +784,7 @@ void cpc_tty_receive(pc300dev_t *pc300dev) } new = kmalloc(rx_len + sizeof(st_cpc_rx_buf), GFP_ATOMIC); - if (new == 0) { + if (!new) { cpc_tty_rx_disc_frame(pc300chan); continue; } @@ -863,7 +863,7 @@ void cpc_tty_receive(pc300dev_t *pc300dev) } new->size = rx_len; new->next = NULL; - if (cpc_tty->buf_rx.first == 0) { + if (cpc_tty->buf_rx.first == NULL) { cpc_tty->buf_rx.first = new; cpc_tty->buf_rx.last = new; } else { @@ -891,7 +891,7 @@ static void cpc_tty_tx_work(struct work_struct *work) CPC_TTY_DBG("%s: cpc_tty_tx_work init\n",cpc_tty->name); - if ((tty = cpc_tty->tty) == 0) { + if ((tty = cpc_tty->tty) == NULL) { CPC_TTY_DBG("%s: the interface is not opened\n",cpc_tty->name); return; } @@ -1027,7 +1027,7 @@ void cpc_tty_unregister_service(pc300dev_t *pc300dev) ulong flags; int res; - if ((cpc_tty= (st_cpc_tty_area *) pc300dev->cpc_tty) == 0) { + if ((cpc_tty= (st_cpc_tty_area *) pc300dev->cpc_tty) == NULL) { CPC_TTY_DBG("%s: interface is not TTY\n", pc300dev->dev->name); return; } diff --git a/drivers/net/wireless/airo.c b/drivers/net/wireless/airo.c index 42670acd144b..be9aa4efeca5 100644 --- a/drivers/net/wireless/airo.c +++ b/drivers/net/wireless/airo.c @@ -2032,7 +2032,7 @@ static int mpi_send_packet (struct net_device *dev) /* get a packet to send */ - if ((skb = skb_dequeue(&ai->txq)) == 0) { + if ((skb = skb_dequeue(&ai->txq)) == NULL) { airo_print_err(dev->name, "%s: Dequeue'd zero in send_packet()", __FUNCTION__); diff --git a/drivers/net/xen-netfront.c b/drivers/net/xen-netfront.c index bca37bf0f545..7483d45bc5bc 100644 --- a/drivers/net/xen-netfront.c +++ b/drivers/net/xen-netfront.c @@ -1073,7 +1073,7 @@ static void xennet_release_rx_bufs(struct netfront_info *np) if (!xen_feature(XENFEAT_auto_translated_physmap)) { /* Do all the remapping work and M2P updates. */ MULTI_mmu_update(mcl, np->rx_mmu, mmu - np->rx_mmu, - 0, DOMID_SELF); + NULL, DOMID_SELF); mcl++; HYPERVISOR_multicall(np->rx_mcl, mcl - np->rx_mcl); } -- cgit v1.2.3-59-g8ed1b From 904584018e9ba30a3e562d86ee7dfb6239105664 Mon Sep 17 00:00:00 2001 From: Al Viro Date: Sat, 22 Dec 2007 17:52:52 +0000 Subject: annotate the rest of drivers/net/wan Signed-off-by: Al Viro Signed-off-by: Jeff Garzik --- drivers/net/wan/hdlc_ppp.c | 2 +- drivers/net/wan/hdlc_raw_eth.c | 2 +- drivers/net/wan/lmc/lmc_proto.c | 2 +- drivers/net/wan/lmc/lmc_proto.h | 2 +- drivers/net/wan/sbni.c | 4 ++-- drivers/net/wan/wanxl.c | 2 +- include/linux/if_frad.h | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) (limited to 'drivers/net/wan') diff --git a/drivers/net/wan/hdlc_ppp.c b/drivers/net/wan/hdlc_ppp.c index 3caeb528eace..519e1550e2e7 100644 --- a/drivers/net/wan/hdlc_ppp.c +++ b/drivers/net/wan/hdlc_ppp.c @@ -42,7 +42,7 @@ static inline struct ppp_state* state(hdlc_device *hdlc) static int ppp_open(struct net_device *dev) { hdlc_device *hdlc = dev_to_hdlc(dev); - void *old_ioctl; + int (*old_ioctl)(struct net_device *, struct ifreq *, int); int result; dev->priv = &state(hdlc)->syncppp_ptr; diff --git a/drivers/net/wan/hdlc_raw_eth.c b/drivers/net/wan/hdlc_raw_eth.c index 1a69a9aaa9b9..8895394e6006 100644 --- a/drivers/net/wan/hdlc_raw_eth.c +++ b/drivers/net/wan/hdlc_raw_eth.c @@ -59,7 +59,7 @@ static int raw_eth_ioctl(struct net_device *dev, struct ifreq *ifr) raw_hdlc_proto new_settings; hdlc_device *hdlc = dev_to_hdlc(dev); int result; - void *old_ch_mtu; + int (*old_ch_mtu)(struct net_device *, int); int old_qlen; switch (ifr->ifr_settings.type) { diff --git a/drivers/net/wan/lmc/lmc_proto.c b/drivers/net/wan/lmc/lmc_proto.c index 426c0678d983..85315758198d 100644 --- a/drivers/net/wan/lmc/lmc_proto.c +++ b/drivers/net/wan/lmc/lmc_proto.c @@ -208,7 +208,7 @@ void lmc_proto_close(lmc_softc_t *sc) /*FOLD00*/ lmc_trace(sc->lmc_device, "lmc_proto_close out"); } -unsigned short lmc_proto_type(lmc_softc_t *sc, struct sk_buff *skb) /*FOLD00*/ +__be16 lmc_proto_type(lmc_softc_t *sc, struct sk_buff *skb) /*FOLD00*/ { lmc_trace(sc->lmc_device, "lmc_proto_type in"); switch(sc->if_type){ diff --git a/drivers/net/wan/lmc/lmc_proto.h b/drivers/net/wan/lmc/lmc_proto.h index 080a55773349..ccaa69e8b3c7 100644 --- a/drivers/net/wan/lmc/lmc_proto.h +++ b/drivers/net/wan/lmc/lmc_proto.h @@ -8,7 +8,7 @@ void lmc_proto_reopen(lmc_softc_t *sc); int lmc_proto_ioctl(lmc_softc_t *sc, struct ifreq *ifr, int cmd); void lmc_proto_open(lmc_softc_t *sc); void lmc_proto_close(lmc_softc_t *sc); -unsigned short lmc_proto_type(lmc_softc_t *sc, struct sk_buff *skb); +__be16 lmc_proto_type(lmc_softc_t *sc, struct sk_buff *skb); void lmc_proto_netif(lmc_softc_t *sc, struct sk_buff *skb); int lmc_skb_rawpackets(char *buf, char **start, off_t offset, int len, int unused); diff --git a/drivers/net/wan/sbni.c b/drivers/net/wan/sbni.c index 2e8b5c2de887..15d5c58e57bc 100644 --- a/drivers/net/wan/sbni.c +++ b/drivers/net/wan/sbni.c @@ -391,8 +391,8 @@ sbni_probe1( struct net_device *dev, unsigned long ioaddr, int irq ) spin_lock_init( &nl->lock ); /* store MAC address (generate if that isn't known) */ - *(u16 *)dev->dev_addr = htons( 0x00ff ); - *(u32 *)(dev->dev_addr + 2) = htonl( 0x01000000 | + *(__be16 *)dev->dev_addr = htons( 0x00ff ); + *(__be32 *)(dev->dev_addr + 2) = htonl( 0x01000000 | ( (mac[num] ? mac[num] : (u32)((long)dev->priv)) & 0x00ffffff) ); /* store link settings (speed, receive level ) */ diff --git a/drivers/net/wan/wanxl.c b/drivers/net/wan/wanxl.c index ad8c8651d298..d4aab8a28b61 100644 --- a/drivers/net/wan/wanxl.c +++ b/drivers/net/wan/wanxl.c @@ -715,7 +715,7 @@ static int __devinit wanxl_pci_init_one(struct pci_dev *pdev, } for (i = 0; i < sizeof(firmware); i += 4) - writel(htonl(*(u32*)(firmware + i)), mem + PDM_OFFSET + i); + writel(ntohl(*(__be32*)(firmware + i)), mem + PDM_OFFSET + i); for (i = 0; i < ports; i++) writel(card->status_address + diff --git a/include/linux/if_frad.h b/include/linux/if_frad.h index f272a80caa3e..5c34240de746 100644 --- a/include/linux/if_frad.h +++ b/include/linux/if_frad.h @@ -137,7 +137,7 @@ struct frhdr unsigned char NLPID; unsigned char OUI[3]; - unsigned short PID; + __be16 PID; #define IP_NLPID pad } __attribute__((packed)); -- cgit v1.2.3-59-g8ed1b