net: Remove unused netdev arg from some NAPI interfaces.

[net-next-2.6.git] / drivers / net / tehuti.c

diff --git a/drivers/net/tehuti.c b/drivers/net/tehuti.c
index 91f9054a1d9522b5f60f0347d6264beeba8d4c60..a10a83a11d9fb07a02d10d2f8b1fad1f13c26a71 100644 (file)
--- a/drivers/net/tehuti.c
+++ b/drivers/net/tehuti.c
@@ -251,7 +251,7 @@ static void bdx_isr_extra(struct bdx_priv *priv, u32 isr)
 static irqreturn_t bdx_isr_napi(int irq, void *dev)
 {
        struct net_device *ndev = dev;
-       struct bdx_priv *priv = ndev->priv;
+       struct bdx_priv *priv = netdev_priv(ndev);
        u32 isr;
 
        ENTER;
@@ -265,8 +265,8 @@ static irqreturn_t bdx_isr_napi(int irq, void *dev)
                bdx_isr_extra(priv, isr);
 
        if (isr & (IR_RX_DESC_0 | IR_TX_FREE_0)) {
-               if (likely(netif_rx_schedule_prep(ndev, &priv->napi))) {
-                       __netif_rx_schedule(ndev, &priv->napi);
+               if (likely(netif_rx_schedule_prep(&priv->napi))) {
+                       __netif_rx_schedule(&priv->napi);
                        RET(IRQ_HANDLED);
                } else {
                        /* NOTE: we get here if intr has slipped into window
@@ -289,7 +289,6 @@ static irqreturn_t bdx_isr_napi(int irq, void *dev)
 static int bdx_poll(struct napi_struct *napi, int budget)
 {
        struct bdx_priv *priv = container_of(napi, struct bdx_priv, napi);
-       struct net_device *dev = priv->ndev;
        int work_done;
 
        ENTER;
@@ -303,7 +302,7 @@ static int bdx_poll(struct napi_struct *napi, int budget)
                 * device lock and allow waiting tasks (eg rmmod) to advance) */
                priv->napi_stop = 0;
 
-               netif_rx_complete(dev, napi);
+               netif_rx_complete(napi);
                bdx_enable_interrupts(priv);
        }
        return work_done;
@@ -559,7 +558,7 @@ static int bdx_close(struct net_device *ndev)
        struct bdx_priv *priv = NULL;
 
        ENTER;
-       priv = ndev->priv;
+       priv = netdev_priv(ndev);
 
        napi_disable(&priv->napi);
 
@@ -588,7 +587,7 @@ static int bdx_open(struct net_device *ndev)
        int rc;
 
        ENTER;
-       priv = ndev->priv;
+       priv = netdev_priv(ndev);
        bdx_reset(priv);
        if (netif_running(ndev))
                netif_stop_queue(priv->ndev);
@@ -633,7 +632,7 @@ static int bdx_range_check(struct bdx_priv *priv, u32 offset)
 
 static int bdx_ioctl_priv(struct net_device *ndev, struct ifreq *ifr, int cmd)
 {
-       struct bdx_priv *priv = ndev->priv;
+       struct bdx_priv *priv = netdev_priv(ndev);
        u32 data[3];
        int error;
 
@@ -698,7 +697,7 @@ static int bdx_ioctl(struct net_device *ndev, struct ifreq *ifr, int cmd)
  */
 static void __bdx_vlan_rx_vid(struct net_device *ndev, uint16_t vid, int enable)
 {
-       struct bdx_priv *priv = ndev->priv;
+       struct bdx_priv *priv = netdev_priv(ndev);
        u32 reg, bit, val;
 
        ENTER;
@@ -748,7 +747,7 @@ static void bdx_vlan_rx_kill_vid(struct net_device *ndev, unsigned short vid)
 static void
 bdx_vlan_rx_register(struct net_device *ndev, struct vlan_group *grp)
 {
-       struct bdx_priv *priv = ndev->priv;
+       struct bdx_priv *priv = netdev_priv(ndev);
 
        ENTER;
        DBG("device='%s', group='%p'\n", ndev->name, grp);
@@ -787,7 +786,7 @@ static int bdx_change_mtu(struct net_device *ndev, int new_mtu)
 
 static void bdx_setmulti(struct net_device *ndev)
 {
-       struct bdx_priv *priv = ndev->priv;
+       struct bdx_priv *priv = netdev_priv(ndev);
 
        u32 rxf_val =
            GMAC_RX_FILTER_AM | GMAC_RX_FILTER_AB | GMAC_RX_FILTER_OSEN;
@@ -847,7 +846,7 @@ static void bdx_setmulti(struct net_device *ndev)
 
 static int bdx_set_mac(struct net_device *ndev, void *p)
 {
-       struct bdx_priv *priv = ndev->priv;
+       struct bdx_priv *priv = netdev_priv(ndev);
        struct sockaddr *addr = p;
 
        ENTER;
@@ -929,7 +928,7 @@ static void bdx_update_stats(struct bdx_priv *priv)
 
 static struct net_device_stats *bdx_get_stats(struct net_device *ndev)
 {
-       struct bdx_priv *priv = ndev->priv;
+       struct bdx_priv *priv = netdev_priv(ndev);
        struct net_device_stats *net_stat = &priv->net_stats;
        return net_stat;
 }
@@ -1237,7 +1236,6 @@ static int bdx_rx_receive(struct bdx_priv *priv, struct rxd_fifo *f, int budget)
        ENTER;
        max_done = budget;
 
-       priv->ndev->last_rx = jiffies;
        f->m.wptr = READ_REG(priv, f->m.reg_WPTR) & TXF_WPTR_WR_PTR;
 
        size = f->m.wptr - f->m.rptr;
@@ -1624,7 +1622,7 @@ static inline int bdx_tx_space(struct bdx_priv *priv)
  */
 static int bdx_tx_transmit(struct sk_buff *skb, struct net_device *ndev)
 {
-       struct bdx_priv *priv = ndev->priv;
+       struct bdx_priv *priv = netdev_priv(ndev);
        struct txd_fifo *f = &priv->txd_fifo0;
        int txd_checksum = 7;   /* full checksum */
        int txd_lgsnd = 0;
@@ -1886,6 +1884,21 @@ static void bdx_tx_push_desc_safe(struct bdx_priv *priv, void *data, int size)
        RET();
 }
 
+static const struct net_device_ops bdx_netdev_ops = {
+       .ndo_open               = bdx_open,
+       .ndo_stop               = bdx_close,
+       .ndo_start_xmit         = bdx_tx_transmit,
+       .ndo_validate_addr      = eth_validate_addr,
+       .ndo_do_ioctl           = bdx_ioctl,
+       .ndo_set_multicast_list = bdx_setmulti,
+       .ndo_get_stats          = bdx_get_stats,
+       .ndo_change_mtu         = bdx_change_mtu,
+       .ndo_set_mac_address    = bdx_set_mac,
+       .ndo_vlan_rx_register   = bdx_vlan_rx_register,
+       .ndo_vlan_rx_add_vid    = bdx_vlan_rx_add_vid,
+       .ndo_vlan_rx_kill_vid   = bdx_vlan_rx_kill_vid,
+};
+
 /**
  * bdx_probe - Device Initialization Routine
  * @pdev: PCI device information struct
@@ -1995,18 +2008,8 @@ bdx_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
                        goto err_out_iomap;
                }
 
-               ndev->open = bdx_open;
-               ndev->stop = bdx_close;
-               ndev->hard_start_xmit = bdx_tx_transmit;
-               ndev->do_ioctl = bdx_ioctl;
-               ndev->set_multicast_list = bdx_setmulti;
-               ndev->get_stats = bdx_get_stats;
-               ndev->change_mtu = bdx_change_mtu;
-               ndev->set_mac_address = bdx_set_mac;
+               ndev->netdev_ops = &bdx_netdev_ops;
                ndev->tx_queue_len = BDX_NDEV_TXQ_LEN;
-               ndev->vlan_rx_register = bdx_vlan_rx_register;
-               ndev->vlan_rx_add_vid = bdx_vlan_rx_add_vid;
-               ndev->vlan_rx_kill_vid = bdx_vlan_rx_kill_vid;
 
                bdx_ethtool_ops(ndev);  /* ethtool interface */
 
@@ -2027,7 +2030,7 @@ bdx_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
                        ndev->features |= NETIF_F_HIGHDMA;
 
        /************** priv ****************/
-               priv = nic->priv[port] = ndev->priv;
+               priv = nic->priv[port] = netdev_priv(ndev);
 
                memset(priv, 0, sizeof(struct bdx_priv));
                priv->pBdxRegs = nic->regs + port * 0x8000;
@@ -2150,7 +2153,7 @@ static int bdx_get_settings(struct net_device *netdev, struct ethtool_cmd *ecmd)
 {
        u32 rdintcm;
        u32 tdintcm;
-       struct bdx_priv *priv = netdev->priv;
+       struct bdx_priv *priv = netdev_priv(netdev);
 
        rdintcm = priv->rdintcm;
        tdintcm = priv->tdintcm;
@@ -2181,7 +2184,7 @@ static int bdx_get_settings(struct net_device *netdev, struct ethtool_cmd *ecmd)
 static void
 bdx_get_drvinfo(struct net_device *netdev, struct ethtool_drvinfo *drvinfo)
 {
-       struct bdx_priv *priv = netdev->priv;
+       struct bdx_priv *priv = netdev_priv(netdev);
 
        strlcat(drvinfo->driver, BDX_DRV_NAME, sizeof(drvinfo->driver));
        strlcat(drvinfo->version, BDX_DRV_VERSION, sizeof(drvinfo->version));
@@ -2223,7 +2226,7 @@ bdx_get_coalesce(struct net_device *netdev, struct ethtool_coalesce *ecoal)
 {
        u32 rdintcm;
        u32 tdintcm;
-       struct bdx_priv *priv = netdev->priv;
+       struct bdx_priv *priv = netdev_priv(netdev);
 
        rdintcm = priv->rdintcm;
        tdintcm = priv->tdintcm;
@@ -2252,7 +2255,7 @@ bdx_set_coalesce(struct net_device *netdev, struct ethtool_coalesce *ecoal)
 {
        u32 rdintcm;
        u32 tdintcm;
-       struct bdx_priv *priv = netdev->priv;
+       struct bdx_priv *priv = netdev_priv(netdev);
        int rx_coal;
        int tx_coal;
        int rx_max_coal;
@@ -2310,7 +2313,7 @@ static inline int bdx_tx_fifo_size_to_packets(int tx_size)
 static void
 bdx_get_ringparam(struct net_device *netdev, struct ethtool_ringparam *ring)
 {
-       struct bdx_priv *priv = netdev->priv;
+       struct bdx_priv *priv = netdev_priv(netdev);
 
        /*max_pending - the maximum-sized FIFO we allow */
        ring->rx_max_pending = bdx_rx_fifo_size_to_packets(3);
@@ -2327,7 +2330,7 @@ bdx_get_ringparam(struct net_device *netdev, struct ethtool_ringparam *ring)
 static int
 bdx_set_ringparam(struct net_device *netdev, struct ethtool_ringparam *ring)
 {
-       struct bdx_priv *priv = netdev->priv;
+       struct bdx_priv *priv = netdev_priv(netdev);
        int rx_size = 0;
        int tx_size = 0;
 
@@ -2388,7 +2391,7 @@ static void bdx_get_strings(struct net_device *netdev, u32 stringset, u8 *data)
  */
 static int bdx_get_stats_count(struct net_device *netdev)
 {
-       struct bdx_priv *priv = netdev->priv;
+       struct bdx_priv *priv = netdev_priv(netdev);
        BDX_ASSERT(ARRAY_SIZE(bdx_stat_names)
                   != sizeof(struct bdx_stats) / sizeof(u64));
        return ((priv->stats_flag) ? ARRAY_SIZE(bdx_stat_names) : 0);
@@ -2403,7 +2406,7 @@ static int bdx_get_stats_count(struct net_device *netdev)
 static void bdx_get_ethtool_stats(struct net_device *netdev,
                                  struct ethtool_stats *stats, u64 *data)
 {
-       struct bdx_priv *priv = netdev->priv;
+       struct bdx_priv *priv = netdev_priv(netdev);
 
        if (priv->stats_flag) {