Re: [PATCH 03/10] fs-enet: remove code associated with !CONFIG_PPC_MERGE
From: Scott Wood <hidden>
Date: 2008-08-01 20:27:20
Also in:
lkml, netdev
On Fri, Aug 01, 2008 at 11:44:13AM -0500, Kumar Gala wrote:
quoted hunk ↗ jump to hunk
diff --git a/drivers/net/fs_enet/fs_enet-main.c b/drivers/net/fs_enet/fs_enet-main.c index 9a51ec8..e54d003 100644 --- a/drivers/net/fs_enet/fs_enet-main.c +++ b/drivers/net/fs_enet/fs_enet-main.c@@ -669,7 +669,6 @@ static int fs_request_irq(struct net_device *dev, int irq, const char *name, { struct fs_enet_private *fep = netdev_priv(dev); - (*fep->ops->pre_request_irq)(dev, irq); return request_irq(irq, irqf, IRQF_SHARED, name, dev); }
This makes "fep" an unused variable. Eliminate this function entirely, and call request_irq directly from the caller.
quoted hunk ↗ jump to hunk
@@ -678,7 +677,6 @@ static void fs_free_irq(struct net_device *dev, int irq) struct fs_enet_private *fep = netdev_priv(dev); free_irq(irq, dev); - (*fep->ops->post_free_irq)(dev, irq); }
Likewise. -Scott