drivers/net: fix sparse warning: returning void-valued expression

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

diff --git a/drivers/net/tehuti.c b/drivers/net/tehuti.c
index 7e36a10423f9cdaddd85b799e17eee4a174f870d..a10a83a11d9fb07a02d10d2f8b1fad1f13c26a71 100644 (file)
--- a/drivers/net/tehuti.c
+++ b/drivers/net/tehuti.c
@@ -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;
@@ -1885,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
@@ -1994,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 */