ucc_geth: delete non NAPI code from the driver.

Signed-off-by: Francois Romieu <romieu@fr.zoreil.com>
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>

diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 1fe7e0792c1fd11e1e3a8515da7924db40d106ac..9b98714889bfb7c7101f170f00cdacf23894681f 100644 (file)
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -2270,10 +2270,6 @@ config UCC_GETH
          This driver supports the Gigabit Ethernet mode of the QUICC Engine,
          which is available on some Freescale SOCs.
 
          This driver supports the Gigabit Ethernet mode of the QUICC Engine,
          which is available on some Freescale SOCs.
 

-config UGETH_NAPI
-       bool "Use Rx Polling (NAPI)"
-       depends on UCC_GETH
-

 config UGETH_MAGIC_PACKET
        bool "Magic Packet detection support"
        depends on UCC_GETH
 config UGETH_MAGIC_PACKET
        bool "Magic Packet detection support"
        depends on UCC_GETH

diff --git a/drivers/net/ucc_geth.c b/drivers/net/ucc_geth.c
index fb0b918e5ccb3790f688655534280e4670102d56..07933f71b86d0aa81c5a3533a0b10b9a9655e743 100644 (file)
--- a/drivers/net/ucc_geth.c
+++ b/drivers/net/ucc_geth.c
@@ -3500,11 +3500,7 @@ static int ucc_geth_rx(struct ucc_geth_private *ugeth, u8 rxQ, int rx_work_limit
 
                        dev->stats.rx_bytes += length;
                        /* Send the packet up the stack */
 
                        dev->stats.rx_bytes += length;
                        /* Send the packet up the stack */

-#ifdef CONFIG_UGETH_NAPI

                        netif_receive_skb(skb);
                        netif_receive_skb(skb);

-#else
-                       netif_rx(skb);
-#endif                         /* CONFIG_UGETH_NAPI */

                }
 
                ugeth->dev->last_rx = jiffies;
                }
 
                ugeth->dev->last_rx = jiffies;


@@ -3580,7 +3576,6 @@ static int ucc_geth_tx(struct net_device *dev, u8 txQ)
        return 0;
 }
 
        return 0;
 }
 

-#ifdef CONFIG_UGETH_NAPI

 static int ucc_geth_poll(struct napi_struct *napi, int budget)
 {
        struct ucc_geth_private *ugeth = container_of(napi, struct ucc_geth_private, napi);
 static int ucc_geth_poll(struct napi_struct *napi, int budget)
 {
        struct ucc_geth_private *ugeth = container_of(napi, struct ucc_geth_private, napi);


@@ -3607,7 +3602,6 @@ static int ucc_geth_poll(struct napi_struct *napi, int budget)
 
        return howmany;
 }
 
        return howmany;
 }

-#endif                         /* CONFIG_UGETH_NAPI */

 
 static irqreturn_t ucc_geth_irq_handler(int irq, void *info)
 {
 
 static irqreturn_t ucc_geth_irq_handler(int irq, void *info)
 {


@@ -3617,9 +3611,6 @@ static irqreturn_t ucc_geth_irq_handler(int irq, void *info)
        struct ucc_geth_info *ug_info;
        register u32 ucce;
        register u32 uccm;
        struct ucc_geth_info *ug_info;
        register u32 ucce;
        register u32 uccm;

-#ifndef CONFIG_UGETH_NAPI
-       register u32 rx_mask;
-#endif

        register u32 tx_mask;
        u8 i;
 
        register u32 tx_mask;
        u8 i;
 


@@ -3636,21 +3627,11 @@ static irqreturn_t ucc_geth_irq_handler(int irq, void *info)
 
        /* check for receive events that require processing */
        if (ucce & UCCE_RX_EVENTS) {
 
        /* check for receive events that require processing */
        if (ucce & UCCE_RX_EVENTS) {

-#ifdef CONFIG_UGETH_NAPI

                if (netif_rx_schedule_prep(dev, &ugeth->napi)) {
                        uccm &= ~UCCE_RX_EVENTS;
                        out_be32(uccf->p_uccm, uccm);
                        __netif_rx_schedule(dev, &ugeth->napi);
                }
                if (netif_rx_schedule_prep(dev, &ugeth->napi)) {
                        uccm &= ~UCCE_RX_EVENTS;
                        out_be32(uccf->p_uccm, uccm);
                        __netif_rx_schedule(dev, &ugeth->napi);
                }

-#else
-               rx_mask = UCCE_RXBF_SINGLE_MASK;
-               for (i = 0; i < ug_info->numQueuesRx; i++) {
-                       if (ucce & rx_mask)
-                               ucc_geth_rx(ugeth, i, (int)ugeth->ug_info->bdRingLenRx[i]);
-                       ucce &= ~rx_mask;
-                       rx_mask <<= 1;
-               }
-#endif /* CONFIG_UGETH_NAPI */

        }
 
        /* Tx event processing */
        }
 
        /* Tx event processing */


@@ -3720,9 +3701,8 @@ static int ucc_geth_open(struct net_device *dev)
                return err;
        }
 
                return err;
        }
 

-#ifdef CONFIG_UGETH_NAPI

        napi_enable(&ugeth->napi);
        napi_enable(&ugeth->napi);

-#endif
+

        err = ucc_geth_startup(ugeth);
        if (err) {
                if (netif_msg_ifup(ugeth))
        err = ucc_geth_startup(ugeth);
        if (err) {
                if (netif_msg_ifup(ugeth))


@@ -3783,9 +3763,8 @@ static int ucc_geth_open(struct net_device *dev)
        return err;
 
 out_err:
        return err;
 
 out_err:

-#ifdef CONFIG_UGETH_NAPI

        napi_disable(&ugeth->napi);
        napi_disable(&ugeth->napi);

-#endif
+

        return err;
 }
 
        return err;
 }
 


@@ -3796,9 +3775,7 @@ static int ucc_geth_close(struct net_device *dev)
 
        ugeth_vdbg("%s: IN", __FUNCTION__);
 
 
        ugeth_vdbg("%s: IN", __FUNCTION__);
 

-#ifdef CONFIG_UGETH_NAPI

        napi_disable(&ugeth->napi);
        napi_disable(&ugeth->napi);

-#endif

 
        ucc_geth_stop(ugeth);
 
 
        ucc_geth_stop(ugeth);
 


@@ -4050,9 +4027,7 @@ static int ucc_geth_probe(struct of_device* ofdev, const struct of_device_id *ma
        dev->hard_start_xmit = ucc_geth_start_xmit;
        dev->tx_timeout = ucc_geth_timeout;
        dev->watchdog_timeo = TX_TIMEOUT;
        dev->hard_start_xmit = ucc_geth_start_xmit;
        dev->tx_timeout = ucc_geth_timeout;
        dev->watchdog_timeo = TX_TIMEOUT;

-#ifdef CONFIG_UGETH_NAPI

        netif_napi_add(dev, &ugeth->napi, ucc_geth_poll, UCC_GETH_DEV_WEIGHT);
        netif_napi_add(dev, &ugeth->napi, ucc_geth_poll, UCC_GETH_DEV_WEIGHT);

-#endif                         /* CONFIG_UGETH_NAPI */

 #ifdef CONFIG_NET_POLL_CONTROLLER
        dev->poll_controller = ucc_netpoll;
 #endif
 #ifdef CONFIG_NET_POLL_CONTROLLER
        dev->poll_controller = ucc_netpoll;
 #endif