cxgb3: Fix sparse warning and micro-optimize is_pure_response()

[linux-2.6-omap-h63xx.git] / drivers / net / ni52.c

diff --git a/drivers/net/ni52.c b/drivers/net/ni52.c
index a316dcc8a06d5e61576c1ce4b1ba9e8073cb0d76..10cfd0f91fc081e1957f28ec997adf41c57351f2 100644 (file)
--- a/drivers/net/ni52.c
+++ b/drivers/net/ni52.c
@@ -214,7 +214,7 @@ struct priv {
 /* wait for command with timeout: */
 static void wait_for_scb_cmd(struct net_device *dev)
 {
-       struct priv *p = dev->priv;
+       struct priv *p = netdev_priv(dev);
        int i;
        for (i = 0; i < 16384; i++) {
                if (readb(&p->scb->cmd_cuc) == 0)
@@ -233,7 +233,7 @@ static void wait_for_scb_cmd(struct net_device *dev)
 
 static void wait_for_scb_cmd_ruc(struct net_device *dev)
 {
-       struct priv *p = dev->priv;
+       struct priv *p = netdev_priv(dev);
        int i;
        for (i = 0; i < 16384; i++) {
                if (readb(&p->scb->cmd_ruc) == 0)
@@ -298,7 +298,7 @@ static int ni52_open(struct net_device *dev)
 static int check_iscp(struct net_device *dev, void __iomem *addr)
 {
        struct iscp_struct __iomem *iscp = addr;
-       struct priv *p = dev->priv;
+       struct priv *p = netdev_priv(dev);
        memset_io(iscp, 0, sizeof(struct iscp_struct));
 
        writel(make24(iscp), &p->scp->iscp);
@@ -318,7 +318,7 @@ static int check_iscp(struct net_device *dev, void __iomem *addr)
  */
 static int check586(struct net_device *dev, unsigned size)
 {
-       struct priv *p = dev->priv;
+       struct priv *p = netdev_priv(dev);
        int i;
 
        p->mapped = ioremap(dev->mem_start, size);
@@ -354,7 +354,7 @@ Enodev:
  */
 static void alloc586(struct net_device *dev)
 {
-       struct priv *p =        (struct priv *) dev->priv;
+       struct priv *p = netdev_priv(dev);
 
        ni_reset586();
        mdelay(32);
@@ -400,7 +400,7 @@ struct net_device * __init ni52_probe(int unit)
        if (!dev)
                return ERR_PTR(-ENOMEM);
 
-       p = dev->priv;
+       p = netdev_priv(dev);
 
        if (unit >= 0) {
                sprintf(dev->name, "eth%d", unit);
@@ -446,7 +446,7 @@ out:
 static int __init ni52_probe1(struct net_device *dev, int ioaddr)
 {
        int i, size, retval;
-       struct priv *priv = dev->priv;
+       struct priv *priv = netdev_priv(dev);
 
        dev->base_addr = ioaddr;
        dev->irq = irq;
@@ -588,7 +588,7 @@ static int init586(struct net_device *dev)
 {
        void __iomem *ptr;
        int i, result = 0;
-       struct priv *p = (struct priv *)dev->priv;
+       struct priv *p = netdev_priv(dev);
        struct configure_cmd_struct __iomem *cfg_cmd;
        struct iasetup_cmd_struct __iomem *ias_cmd;
        struct tdr_cmd_struct __iomem *tdr_cmd;
@@ -621,7 +621,7 @@ static int init586(struct net_device *dev)
                if (num_addrs > len) {
                        printk(KERN_ERR "%s: switching to promisc. mode\n",
                                dev->name);
-                       dev->flags |= IFF_PROMISC;
+                       writeb(0x01, &cfg_cmd->promisc);
                }
        }
        if (dev->flags & IFF_PROMISC)
@@ -829,7 +829,7 @@ static void __iomem *alloc_rfa(struct net_device *dev, void __iomem *ptr)
        struct rfd_struct __iomem *rfd = ptr;
        struct rbd_struct __iomem *rbd;
        int i;
-       struct priv *p = (struct priv *) dev->priv;
+       struct priv *p = netdev_priv(dev);
 
        memset_io(rfd, 0,
                sizeof(struct rfd_struct) * (p->num_recv_buffs + rfdadd));
@@ -878,7 +878,7 @@ static irqreturn_t ni52_interrupt(int irq, void *dev_id)
        int cnt = 0;
        struct priv *p;
 
-       p = (struct priv *) dev->priv;
+       p = netdev_priv(dev);
 
        if (debuglevel > 1)
                printk("I");
@@ -950,7 +950,7 @@ static void ni52_rcv_int(struct net_device *dev)
        unsigned short totlen;
        struct sk_buff *skb;
        struct rbd_struct __iomem *rbd;
-       struct priv *p = (struct priv *)dev->priv;
+       struct priv *p = netdev_priv(dev);
 
        if (debuglevel > 0)
                printk("R");
@@ -970,7 +970,6 @@ static void ni52_rcv_int(struct net_device *dev)
                                        memcpy_fromio(skb->data, p->base + readl(&rbd->buffer), totlen);
                                        skb->protocol = eth_type_trans(skb, dev);
                                        netif_rx(skb);
-                                       dev->last_rx = jiffies;
                                        p->stats.rx_packets++;
                                        p->stats.rx_bytes += totlen;
                                } else
@@ -1040,7 +1039,7 @@ static void ni52_rcv_int(struct net_device *dev)
 
 static void ni52_rnr_int(struct net_device *dev)
 {
-       struct priv *p = (struct priv *) dev->priv;
+       struct priv *p = netdev_priv(dev);
 
        p->stats.rx_errors++;
 
@@ -1065,7 +1064,7 @@ static void ni52_rnr_int(struct net_device *dev)
 static void ni52_xmt_int(struct net_device *dev)
 {
        int status;
-       struct priv *p = (struct priv *) dev->priv;
+       struct priv *p = netdev_priv(dev);
 
        if (debuglevel > 0)
                printk("X");
@@ -1113,7 +1112,7 @@ static void ni52_xmt_int(struct net_device *dev)
 
 static void startrecv586(struct net_device *dev)
 {
-       struct priv *p = (struct priv *) dev->priv;
+       struct priv *p = netdev_priv(dev);
 
        wait_for_scb_cmd(dev);
        wait_for_scb_cmd_ruc(dev);
@@ -1126,7 +1125,7 @@ static void startrecv586(struct net_device *dev)
 
 static void ni52_timeout(struct net_device *dev)
 {
-       struct priv *p = (struct priv *) dev->priv;
+       struct priv *p = netdev_priv(dev);
 #ifndef NO_NOPCOMMANDS
        if (readb(&p->scb->cus) & CU_ACTIVE) { /* COMMAND-UNIT active? */
                netif_wake_queue(dev);
@@ -1177,7 +1176,7 @@ static int ni52_send_packet(struct sk_buff *skb, struct net_device *dev)
 #ifndef NO_NOPCOMMANDS
        int next_nop;
 #endif
-       struct priv *p = (struct priv *) dev->priv;
+       struct priv *p = netdev_priv(dev);
 
        if (skb->len > XMIT_BUFF_SIZE) {
                printk(KERN_ERR "%s: Sorry, max. framelength is %d bytes. The length of your frame is %d bytes.\n", dev->name, XMIT_BUFF_SIZE, skb->len);
@@ -1274,7 +1273,7 @@ static int ni52_send_packet(struct sk_buff *skb, struct net_device *dev)
 
 static struct net_device_stats *ni52_get_stats(struct net_device *dev)
 {
-       struct priv *p = (struct priv *) dev->priv;
+       struct priv *p = netdev_priv(dev);
        unsigned short crc, aln, rsc, ovrn;
 
        /* Get error-statistics from the ni82586 */
@@ -1337,7 +1336,7 @@ int __init init_module(void)
 
 void __exit cleanup_module(void)
 {
-       struct priv *p = dev_ni52->priv;
+       struct priv *p = netdev_priv(dev_ni52);
        unregister_netdev(dev_ni52);
        iounmap(p->mapped);
        release_region(dev_ni52->base_addr, NI52_TOTAL_SIZE);