fs_enet: Remove dead code
Subsystems (2)
PATCH v2 1/1 fs_enet: Remove dead code
CONFIG_DUET doesn't exist anymore, remove all the code that exists to support it.
Signed-off-by Kumar Gala <[email protected]>
---
* Removed stale comment that went along w/DUET support
drivers/net/fs_enet/fs_enet-main.c | 35 +---------------------------------- drivers/net/fs_enet/fs_enet.h | 5 ----- drivers/net/fs_enet/mac-fec.c | 34 ---------------------------------- 3 files changed, 1 insertions(+), 73 deletions(-)
drivers/net/fs_enet/fs_enet-main.c +1 -34
@@ -938,30 +938,6 @@ extern void fs_mii_disconnect(struct net_device *dev);/**************************************************************************************/ -/* handy pointer to the immap */ -void __iomem *fs_enet_immap =NULL ; - -static int setup_immap (void ) -{ -#ifdef CONFIG_CPM1 - fs_enet_immap =ioremap (IMAP_ADDR ,0x4000 ); -WARN_ON (!fs_enet_immap); -#elif defined(CONFIG_CPM2 ) - fs_enet_immap = cpm2_immr; -#endif - -return 0 ; -} - -static void cleanup_immap (void ) -{ -#if defined(CONFIG_CPM1 ) -iounmap (fs_enet_immap); -#endif -} - -/**************************************************************************************/ -static int __devinit find_phy (struct device_node *np,struct fs_platform_info *fpi) {
@@ -1191,25 +1167,16 @@ static struct of_platform_driver fs_enet_driver = {static int __init fs_init (void ) { -int r =setup_immap (); +int r =of_register_platform_driver (&fs_enet_driver);if (r !=0 )return r; - r =of_register_platform_driver (&fs_enet_driver); -if (r !=0 ) - goto out; -return 0 ; - -out: -cleanup_immap (); -return r; } static void __exit fs_cleanup(void) {of_unregister_platform_driver (&fs_enet_driver); -cleanup_immap (); }#ifdef CONFIG_NET_POLL_CONTROLLER
drivers/net/fs_enet/fs_enet.h +0 -5
@@ -194,9 +194,4 @@ extern const struct fs_ops fs_scc_ops;/*******************************************************************/ -/* handy pointer to the immap */ -extern void __iomem *fs_enet_immap; - -/*******************************************************************/ -#endif
drivers/net/fs_enet/mac-fec.c +0 -34
@@ -245,10 +245,6 @@ static void set_multicast_list(struct net_device *dev)static void restart (struct net_device *dev) { -#ifdef CONFIG_DUET -immap_t *immap = fs_enet_immap; -u32 cptr; -#endif struct fs_enet_private *fep =netdev_priv (dev);fec_t __iomem *fecp = fep->fec.fecp;const struct fs_platform_info *fpi = fep->fpi;
@@ -315,36 +311,6 @@ static void restart(struct net_device *dev)FW (fecp, ievent,0xffc0 );FW (fecp, ivec, (virq_to_hw (fep->interrupt) /2 ) <<29 ); -/* -* adjust to speed (only for DUET & RMII) -*/ -#ifdef CONFIG_DUET -if (fpi->use_rmii) { - cptr =in_be32 (&immap->im_cpm.cp_cptr); -switch (fs_get_fec_index (fpi->fs_no)) { -case 0 : - cptr |=0x100 ; -if (fep->speed ==10 ) - cptr |=0x0000010 ; -else if (fep->speed ==100 ) - cptr &= ~0x0000010 ; -break ; -case 1 : - cptr |=0x80 ; -if (fep->speed ==10 ) - cptr |=0x0000008 ; -else if (fep->speed ==100 ) - cptr &= ~0x0000008 ; -break ; -default : -BUG ();/* should never happen */ -break ; - } -out_be32 (&immap->im_cpm.cp_cptr, cptr); - } -#endif - -FW (fecp, r_cntrl,FEC_RCNTRL_MII_MODE );/* MII enable */ /* * adjust to duplex mode
Signature · 1 line
1.6.0.6
David Miller
maintainerFrom: Kumar Gala <[email protected]>
Date: Wed, 22 Apr 2009 16:35:48 -0500
Quoted 4 lines
CONFIG_DUETdoesn't exist anymore, remove all the code that exists to support it.Signed-off-by Kumar Gala <[email protected]>
I took the liberty of simplifying fs_init() even further when applying this. It had become:
int r = foo(); if (r != 0) return r; return 0;
which is just plain:
return foo();
fs_enet: Remove dead code
CONFIG_DUET doesn't exist anymore, remove all the code that exists to support it.
[ Simplify fs_init() even further -DaveM ]
Signed-off-by Kumar Gala <[email protected]>
Signed-off-by David S. Miller <[email protected]>
--- drivers/net/fs_enet/fs_enet-main.c | 39 +----------------------------------- drivers/net/fs_enet/fs_enet.h | 5 ---- drivers/net/fs_enet/mac-fec.c | 34 ------------------------------- 3 files changed, 1 insertions(+), 77 deletions(-)
drivers/net/fs_enet/fs_enet-main.c +1 -38
@@ -941,30 +941,6 @@ extern void fs_mii_disconnect(struct net_device *dev);/**************************************************************************************/ -/* handy pointer to the immap */ -void __iomem *fs_enet_immap =NULL ; - -static int setup_immap (void ) -{ -#ifdef CONFIG_CPM1 - fs_enet_immap =ioremap (IMAP_ADDR ,0x4000 ); -WARN_ON (!fs_enet_immap); -#elif defined(CONFIG_CPM2 ) - fs_enet_immap = cpm2_immr; -#endif - -return 0 ; -} - -static void cleanup_immap (void ) -{ -#if defined(CONFIG_CPM1 ) -iounmap (fs_enet_immap); -#endif -} - -/**************************************************************************************/ -#ifdef CONFIG_FS_ENET_HAS_FEC #define IS_FEC (match) ((match)->data == &fs_fec_ops)#else
@@ -1144,25 +1120,12 @@ static struct of_platform_driver fs_enet_driver = {static int __init fs_init (void ) { -int r =setup_immap (); -if (r !=0 ) -return r; - - r =of_register_platform_driver (&fs_enet_driver); -if (r !=0 ) - goto out; - -return 0 ; - -out: -cleanup_immap (); -return r; +return of_register_platform_driver (&fs_enet_driver); } static void __exit fs_cleanup(void) {of_unregister_platform_driver (&fs_enet_driver); -cleanup_immap (); }#ifdef CONFIG_NET_POLL_CONTROLLER
drivers/net/fs_enet/fs_enet.h +0 -5
@@ -194,9 +194,4 @@ extern const struct fs_ops fs_scc_ops;/*******************************************************************/ -/* handy pointer to the immap */ -extern void __iomem *fs_enet_immap; - -/*******************************************************************/ -#endif
drivers/net/fs_enet/mac-fec.c +0 -34
@@ -245,10 +245,6 @@ static void set_multicast_list(struct net_device *dev)static void restart (struct net_device *dev) { -#ifdef CONFIG_DUET -immap_t *immap = fs_enet_immap; -u32 cptr; -#endif struct fs_enet_private *fep =netdev_priv (dev);fec_t __iomem *fecp = fep->fec.fecp;const struct fs_platform_info *fpi = fep->fpi;
@@ -315,36 +311,6 @@ static void restart(struct net_device *dev)FW (fecp, ievent,0xffc0 );FW (fecp, ivec, (virq_to_hw (fep->interrupt) /2 ) <<29 ); -/* -* adjust to speed (only for DUET & RMII) -*/ -#ifdef CONFIG_DUET -if (fpi->use_rmii) { - cptr =in_be32 (&immap->im_cpm.cp_cptr); -switch (fs_get_fec_index (fpi->fs_no)) { -case 0 : - cptr |=0x100 ; -if (fep->speed ==10 ) - cptr |=0x0000010 ; -else if (fep->speed ==100 ) - cptr &= ~0x0000010 ; -break ; -case 1 : - cptr |=0x80 ; -if (fep->speed ==10 ) - cptr |=0x0000008 ; -else if (fep->speed ==100 ) - cptr &= ~0x0000008 ; -break ; -default : -BUG ();/* should never happen */ -break ; - } -out_be32 (&immap->im_cpm.cp_cptr, cptr); - } -#endif - -FW (fecp, r_cntrl,FEC_RCNTRL_MII_MODE );/* MII enable */ /* * adjust to duplex mode
Signature · 1 line
1.6.2.4