X-Git-Url: http://pilppa.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=drivers%2Fnet%2Fdeclance.c;h=00e2a8a134d7a2993530e29f97ac86d4458bf924;hb=cde49b058474ab3f7ff830283e5b538e8fbeefe5;hp=6ad5796121c82b2a327a29baac07c31ac597ac59;hpb=887e5d5fcc96e3a7c91e19d9bb419c10196ffdc1;p=linux-2.6-omap-h63xx.git diff --git a/drivers/net/declance.c b/drivers/net/declance.c index 6ad5796121c..00e2a8a134d 100644 --- a/drivers/net/declance.c +++ b/drivers/net/declance.c @@ -1,4 +1,4 @@ -/* +/* * Lance ethernet driver for the MIPS processor based * DECstation family * @@ -158,9 +158,9 @@ MODULE_LICENSE("GPL"); /* The DS2000/3000 have a linear 64 KB buffer. - * The PMAD-AA has 128 kb buffer on-board. + * The PMAD-AA has 128 kb buffer on-board. * - * The IOASIC LANCE devices use a shared memory region. This region as seen + * The IOASIC LANCE devices use a shared memory region. This region as seen * from the CPU is (max) 128 KB long and has to be on an 128 KB boundary. * The LANCE sees this as a 64 KB long continuous memory region. * @@ -694,19 +694,17 @@ out: spin_unlock(&lp->lock); } -static irqreturn_t lance_dma_merr_int(const int irq, void *dev_id, - struct pt_regs *regs) +static irqreturn_t lance_dma_merr_int(const int irq, void *dev_id) { - struct net_device *dev = (struct net_device *) dev_id; + struct net_device *dev = dev_id; printk("%s: DMA error\n", dev->name); return IRQ_HANDLED; } -static irqreturn_t lance_interrupt(const int irq, void *dev_id, - struct pt_regs *regs) +static irqreturn_t lance_interrupt(const int irq, void *dev_id) { - struct net_device *dev = (struct net_device *) dev_id; + struct net_device *dev = dev_id; struct lance_private *lp = netdev_priv(dev); volatile struct lance_regs *ll = lp->ll; int csr0; @@ -882,7 +880,7 @@ static int lance_start_xmit(struct sk_buff *skb, struct net_device *dev) skblen = skb->len; len = skblen; - + if (len < ETH_ZLEN) { if (skb_padto(skb, ETH_ZLEN)) return 0;