aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/b44.c
diff options
context:
space:
mode:
authorBen Hutchings <bhutchings@solarflare.com>2009-01-19 19:43:59 -0500
committerDavid S. Miller <davem@davemloft.net>2009-01-21 17:33:50 -0500
commit288379f050284087578b77e04f040b57db3db3f8 (patch)
treeac5f5c83e2778a1966327d87316fc94067363b45 /drivers/net/b44.c
parent627af770c63acddc2402dd19fec70df5c3ad8ab7 (diff)
net: Remove redundant NAPI functions
Following the removal of the unused struct net_device * parameter from the NAPI functions named *netif_rx_* in commit 908a7a1, they are exactly equivalent to the corresponding *napi_* functions and are therefore redundant. Signed-off-by: Ben Hutchings <bhutchings@solarflare.com> Acked-by: Neil Horman <nhorman@tuxdriver.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/b44.c')
-rw-r--r--drivers/net/b44.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/b44.c b/drivers/net/b44.c
index c38512ebcea..92aaaa1ee9f 100644
--- a/drivers/net/b44.c
+++ b/drivers/net/b44.c
@@ -874,7 +874,7 @@ static int b44_poll(struct napi_struct *napi, int budget)
874 } 874 }
875 875
876 if (work_done < budget) { 876 if (work_done < budget) {
877 netif_rx_complete(napi); 877 napi_complete(napi);
878 b44_enable_ints(bp); 878 b44_enable_ints(bp);
879 } 879 }
880 880
@@ -906,13 +906,13 @@ static irqreturn_t b44_interrupt(int irq, void *dev_id)
906 goto irq_ack; 906 goto irq_ack;
907 } 907 }
908 908
909 if (netif_rx_schedule_prep(&bp->napi)) { 909 if (napi_schedule_prep(&bp->napi)) {
910 /* NOTE: These writes are posted by the readback of 910 /* NOTE: These writes are posted by the readback of
911 * the ISTAT register below. 911 * the ISTAT register below.
912 */ 912 */
913 bp->istat = istat; 913 bp->istat = istat;
914 __b44_disable_ints(bp); 914 __b44_disable_ints(bp);
915 __netif_rx_schedule(&bp->napi); 915 __napi_schedule(&bp->napi);
916 } else { 916 } else {
917 printk(KERN_ERR PFX "%s: Error, poll already scheduled\n", 917 printk(KERN_ERR PFX "%s: Error, poll already scheduled\n",
918 dev->name); 918 dev->name);