fs-enet: remove code associated with !CONFIG_PPC_MERGE

Now that arch/ppc is gone we don't need CONFIG_PPC_MERGE anymore remove
the dead code associated with !CONFIG_PPC_MERGE.

With this change the pre_request_irq() and post_free_irq() calls became
nops so they have been removed.  Also removed fs_request_irq() and
fs_free_irq() and just called request_irq() and free_irq().

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Jeff Garzik <jeff@garzik.org>
Cc: Scott Wood <scottwood@freescale.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>

1 files changed, 0 insertions, 26 deletions

diff --git a/drivers/net/fs_enet/mac-scc.c b/drivers/net/fs_enet/mac-scc.c
index 22f50dd8b277..008cdd9cc536 100644
--- a/drivers/net/fs_enet/mac-scc.c
+++ b/drivers/net/fs_enet/mac-scc.c
@@ -377,30 +377,6 @@ static void stop(struct net_device *dev)
         fs_cleanup_bds(dev);
 }
 
-static void pre_request_irq(struct net_device *dev, int irq)
-{
-#ifndef CONFIG_PPC_MERGE
-        immap_t *immap = fs_enet_immap;
-        u32 siel;
-
-        /* SIU interrupt */
-        if (irq >= SIU_IRQ0 && irq < SIU_LEVEL7) {
-
-                siel = in_be32(&immap->im_siu_conf.sc_siel);
-                if ((irq & 1) == 0)
-                        siel |= (0x80000000 >> irq);
-                else
-                        siel &= ~(0x80000000 >> (irq & ~1));
-                out_be32(&immap->im_siu_conf.sc_siel, siel);
-        }
-#endif
-}
-
-static void post_free_irq(struct net_device *dev, int irq)
-{
-        /* nothing */
-}
-
 static void napi_clear_rx_event(struct net_device *dev)
 {
         struct fs_enet_private *fep = netdev_priv(dev);
@@ -494,8 +470,6 @@ const struct fs_ops fs_scc_ops = {
         .set_multicast_list     = set_multicast_list,
         .restart                = restart,
         .stop                   = stop,
-        .pre_request_irq        = pre_request_irq,
-        .post_free_irq          = post_free_irq,
         .napi_clear_rx_event    = napi_clear_rx_event,
         .napi_enable_rx         = napi_enable_rx,
         .napi_disable_rx        = napi_disable_rx,