fs-enet: remove code associated with !CONFIG_PPC_MERGE
Subsystems (2)
PATCH 11/21 fs-enet: remove code associated with !CONFIG_PPC_MERGE
From: Kumar Gala <[email protected]>
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().
---
drivers/net/fs_enet/fs_enet-main.c | 22 ++----------------- drivers/net/fs_enet/fs_enet.h | 2 - drivers/net/fs_enet/mac-fcc.c | 12 ---------- drivers/net/fs_enet/mac-fec.c | 30 --------------------------- drivers/net/fs_enet/mac-scc.c | 26 ----------------------- 5 files changed, 3 insertions(+), 89 deletions(-)
drivers/net/fs_enet/fs_enet-main.c renamed from drivers/net/fs_enet/fs_enet-main.c~fs-enet-remove-code-associated-with-config_ppc_merge +3 -19
@@ -664,23 +664,6 @@ static int fs_enet_start_xmit(struct sk_return NETDEV_TX_OK ; } -static int fs_request_irq (struct net_device *dev,int irq,const char *name, -irq_handler_t irqf) -{ -struct fs_enet_private *fep =netdev_priv (dev); - - (*fep->ops->pre_request_irq)(dev, irq); -return request_irq (irq, irqf,IRQF_SHARED , name, dev); -} - -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); -} -static void fs_timeout (struct net_device *dev) {struct fs_enet_private *fep =netdev_priv (dev);
@@ -800,7 +783,8 @@ static int fs_enet_open(struct net_devicnapi_enable (&fep->napi);/* Install our interrupt handler. */ - r =fs_request_irq (dev, fep->interrupt,"fs_enet-mac" , fs_enet_interrupt); + r =request_irq (fep->interrupt, fs_enet_interrupt,IRQF_SHARED , +"fs_enet-mac" , dev);if (r !=0 ) { printk(KERN_ERR DRV_MODULE_NAME ": %s Could not allocate FS_ENET IRQ!", dev->name);
@@ -842,7 +826,7 @@ static int fs_enet_close(struct net_devi/* release any irqs */ phy_disconnect (fep->phydev); fep->phydev =NULL ; -fs_free_irq (dev, fep->interrupt); +free_irq (fep->interrupt, dev);return 0 ; }
drivers/net/fs_enet/fs_enet.h renamed from drivers/net/fs_enet/fs_enet.h~fs-enet-remove-code-associated-with-config_ppc_merge +0 -2
@@ -34,8 +34,6 @@ struct fs_ops {void (*adjust_link)(struct net_device *dev);void (*restart)(struct net_device *dev);void (*stop)(struct net_device *dev); -void (*pre_request_irq)(struct net_device *dev,int irq); -void (*post_free_irq)(struct net_device *dev,int irq);void (*napi_clear_rx_event)(struct net_device *dev);void (*napi_enable_rx)(struct net_device *dev);void (*napi_disable_rx)(struct net_device *dev);
drivers/net/fs_enet/mac-fcc.c renamed from drivers/net/fs_enet/mac-fcc.c~fs-enet-remove-code-associated-with-config_ppc_merge +0 -12
@@ -421,16 +421,6 @@ static void stop(struct net_device *dev)fs_cleanup_bds (dev); } -static void pre_request_irq (struct net_device *dev,int irq) -{ -/* nothing */ -} - -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);
@@ -540,8 +530,6 @@ const struct fs_ops fs_fcc_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,
drivers/net/fs_enet/mac-fec.c renamed from drivers/net/fs_enet/mac-fec.c~fs-enet-remove-code-associated-with-config_ppc_merge +0 -30
@@ -313,11 +313,7 @@ static void restart(struct net_device *d* Clear any outstanding interrupt. */ FW (fecp, ievent,0xffc0 ); -#ifndef CONFIG_PPC_MERGE -FW (fecp, ivec, (fep->interrupt /2 ) <<29 ); -#else FW (fecp, ivec, (virq_to_hw (fep->interrupt) /2 ) <<29 ); -#endif /* * adjust to speed (only for DUET & RMII)
@@ -413,30 +409,6 @@ static void stop(struct net_device *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);
@@ -529,8 +501,6 @@ const struct fs_ops fs_fec_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,
drivers/net/fs_enet/mac-scc.c renamed from drivers/net/fs_enet/mac-scc.c~fs-enet-remove-code-associated-with-config_ppc_merge +0 -26
@@ -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,
_
Jeff Garzik
AppliedQuoted 201 lines · [email protected] wrote:
From: Kumar Gala <[email protected]>
Now that
arch/ppcis gone we don't needCONFIG_PPC_MERGEanymore remove the dead code associated with !CONFIG_PPC_MERGE.With this change the
pre_request_irq()andpost_free_irq()calls became nops so they have been removed. Also removedfs_request_irq()andfs_free_irq()and just calledrequest_irq()andfree_irq().Signed-off-by Kumar Gala <[email protected]>Cc Benjamin Herrenschmidt <[email protected]>Cc Paul Mackerras <[email protected]>Cc Jeff Garzik <[email protected]>Cc Scott Wood <[email protected]>Signed-off-by Andrew Morton <[email protected]>---
drivers/net/fs_enet/fs_enet-main.c | 22 ++----------------- drivers/net/fs_enet/fs_enet.h | 2 - drivers/net/fs_enet/mac-fcc.c | 12 ---------- drivers/net/fs_enet/mac-fec.c | 30 --------------------------- drivers/net/fs_enet/mac-scc.c | 26 ----------------------- 5 files changed, 3 insertions(+), 89 deletions(-)diff -puN
drivers/net/fs_enet/fs_enet-main.c~fs-enet-remove-code-associated-with-config_ppc_mergedrivers/net/fs_enet/fs_enet-main.cdrivers/net/fs_enet/fs_enet-main.c renamed from drivers/net/fs_enet/fs_enet-main.c~fs-enet-remove-code-associated-with-config_ppc_merge +3
-19@@ -664,23 +664,6 @@ static int fs_enet_start_xmit(struct sk_return NETDEV_TX_OK ; } -static int fs_request_irq (struct net_device *dev,int irq,const char *name, -irq_handler_t irqf) -{ -struct fs_enet_private *fep =netdev_priv (dev); - - (*fep->ops->pre_request_irq)(dev, irq); -return request_irq (irq, irqf,IRQF_SHARED , name, dev); -} - -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); -} -static void fs_timeout (struct net_device *dev) {struct fs_enet_private *fep =netdev_priv (dev);@@ -800,7 +783,8 @@ static int fs_enet_open(struct net_devicnapi_enable (&fep->napi);/* Install our interrupt handler. */ - r =fs_request_irq (dev, fep->interrupt,"fs_enet-mac" , fs_enet_interrupt); + r =request_irq (fep->interrupt, fs_enet_interrupt,IRQF_SHARED , +"fs_enet-mac" , dev);if (r !=0 ) { printk(KERN_ERR DRV_MODULE_NAME ": %s Could not allocate FS_ENET IRQ!", dev->name);@@ -842,7 +826,7 @@ static int fs_enet_close(struct net_devi/* release any irqs */ phy_disconnect (fep->phydev); fep->phydev =NULL ; -fs_free_irq (dev, fep->interrupt); +free_irq (fep->interrupt, dev);return 0 ; }diff -puN
drivers/net/fs_enet/fs_enet.h~fs-enet-remove-code-associated-with-config_ppc_mergedrivers/net/fs_enet/fs_enet.hdrivers/net/fs_enet/fs_enet.h renamed from drivers/net/fs_enet/fs_enet.h~fs-enet-remove-code-associated-with-config_ppc_merge +0
-2@@ -34,8 +34,6 @@ struct fs_ops {void (*adjust_link)(struct net_device *dev);void (*restart)(struct net_device *dev);void (*stop)(struct net_device *dev); -void (*pre_request_irq)(struct net_device *dev,int irq); -void (*post_free_irq)(struct net_device *dev,int irq);void (*napi_clear_rx_event)(struct net_device *dev);void (*napi_enable_rx)(struct net_device *dev);void (*napi_disable_rx)(struct net_device *dev);diff -puN
drivers/net/fs_enet/mac-fcc.c~fs-enet-remove-code-associated-with-config_ppc_mergedrivers/net/fs_enet/mac-fcc.cdrivers/net/fs_enet/mac-fcc.c renamed from drivers/net/fs_enet/mac-fcc.c~fs-enet-remove-code-associated-with-config_ppc_merge +0
-12@@ -421,16 +421,6 @@ static void stop(struct net_device *dev)fs_cleanup_bds (dev); } -static void pre_request_irq (struct net_device *dev,int irq) -{ -/* nothing */ -} - -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);@@ -540,8 +530,6 @@ const struct fs_ops fs_fcc_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,diff -puN
drivers/net/fs_enet/mac-fec.c~fs-enet-remove-code-associated-with-config_ppc_mergedrivers/net/fs_enet/mac-fec.cdrivers/net/fs_enet/mac-fec.c renamed from drivers/net/fs_enet/mac-fec.c~fs-enet-remove-code-associated-with-config_ppc_merge +0
-30@@ -313,11 +313,7 @@ static void restart(struct net_device *d* Clear any outstanding interrupt. */ FW (fecp, ievent,0xffc0 ); -#ifndef CONFIG_PPC_MERGE -FW (fecp, ivec, (fep->interrupt /2 ) <<29 ); -#else FW (fecp, ivec, (virq_to_hw (fep->interrupt) /2 ) <<29 ); -#endif /* * adjust to speed (only for DUET & RMII) @@ -413,30 +409,6 @@ static void stop(struct net_device *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);@@ -529,8 +501,6 @@ const struct fs_ops fs_fec_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,diff -puN
drivers/net/fs_enet/mac-scc.c~fs-enet-remove-code-associated-with-config_ppc_mergedrivers/net/fs_enet/mac-scc.cdrivers/net/fs_enet/mac-scc.c renamed from drivers/net/fs_enet/mac-scc.c~fs-enet-remove-code-associated-with-config_ppc_merge +0
-24@@ -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);
drivers/net/fs_enet/mac-scc.c const struct fs_ops fs_scc_ops = { · line 474
Quoted 7 lines
drivers/net/fs_enet/mac-scc.c renamed from drivers/net/fs_enet/mac-scc.c~fs-enet-remove-code-associated-with-config_ppc_merge +0
-2@@ -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,
applied