Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

sh_eth: remove 'register_type' field from 'struct sh_eth_plat_data'

Now that the 'register_type' field of the 'sh_eth' driver's platform data is not
used by the driver anymore, it's time to remove it and its initializers from
the SH platform code. Also move *enum* declaring values for this field from
<linux/sh_eth.h> to the local driver's header file as they're only needed
by the driver itself now...

Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

authored by

Sergei Shtylyov and committed by
David S. Miller
8d3214c4 a3153d8c

+7 -18
-1
arch/arm/mach-shmobile/board-armadillo800eva.c
··· 358 358 static struct sh_eth_plat_data sh_eth_platdata = { 359 359 .phy = 0x00, /* LAN8710A */ 360 360 .edmac_endian = EDMAC_LITTLE_ENDIAN, 361 - .register_type = SH_ETH_REG_GIGABIT, 362 361 .phy_interface = PHY_INTERFACE_MODE_MII, 363 362 }; 364 363
-1
arch/arm/mach-shmobile/board-bockw.c
··· 89 89 static struct sh_eth_plat_data ether_platform_data __initdata = { 90 90 .phy = 0x01, 91 91 .edmac_endian = EDMAC_LITTLE_ENDIAN, 92 - .register_type = SH_ETH_REG_FAST_RCAR, 93 92 .phy_interface = PHY_INTERFACE_MODE_RMII, 94 93 /* 95 94 * Although the LINK signal is available on the board, it's connected to
-1
arch/sh/boards/board-espt.c
··· 80 80 static struct sh_eth_plat_data sh7763_eth_pdata = { 81 81 .phy = 0, 82 82 .edmac_endian = EDMAC_LITTLE_ENDIAN, 83 - .register_type = SH_ETH_REG_GIGABIT, 84 83 .phy_interface = PHY_INTERFACE_MODE_MII, 85 84 }; 86 85
-4
arch/sh/boards/board-sh7757lcr.c
··· 77 77 static struct sh_eth_plat_data sh7757_eth0_pdata = { 78 78 .phy = 1, 79 79 .edmac_endian = EDMAC_LITTLE_ENDIAN, 80 - .register_type = SH_ETH_REG_FAST_SH4, 81 80 .set_mdio_gate = sh7757_eth_set_mdio_gate, 82 81 }; 83 82 ··· 105 106 static struct sh_eth_plat_data sh7757_eth1_pdata = { 106 107 .phy = 1, 107 108 .edmac_endian = EDMAC_LITTLE_ENDIAN, 108 - .register_type = SH_ETH_REG_FAST_SH4, 109 109 .set_mdio_gate = sh7757_eth_set_mdio_gate, 110 110 }; 111 111 ··· 149 151 static struct sh_eth_plat_data sh7757_eth_giga0_pdata = { 150 152 .phy = 18, 151 153 .edmac_endian = EDMAC_LITTLE_ENDIAN, 152 - .register_type = SH_ETH_REG_GIGABIT, 153 154 .set_mdio_gate = sh7757_eth_giga_set_mdio_gate, 154 155 .phy_interface = PHY_INTERFACE_MODE_RGMII_ID, 155 156 }; ··· 183 186 static struct sh_eth_plat_data sh7757_eth_giga1_pdata = { 184 187 .phy = 19, 185 188 .edmac_endian = EDMAC_LITTLE_ENDIAN, 186 - .register_type = SH_ETH_REG_GIGABIT, 187 189 .set_mdio_gate = sh7757_eth_giga_set_mdio_gate, 188 190 .phy_interface = PHY_INTERFACE_MODE_RGMII_ID, 189 191 };
-1
arch/sh/boards/mach-ecovec24/setup.c
··· 159 159 static struct sh_eth_plat_data sh_eth_plat = { 160 160 .phy = 0x1f, /* SMSC LAN8700 */ 161 161 .edmac_endian = EDMAC_LITTLE_ENDIAN, 162 - .register_type = SH_ETH_REG_FAST_SH4, 163 162 .phy_interface = PHY_INTERFACE_MODE_MII, 164 163 .ether_link_active_low = 1 165 164 };
-1
arch/sh/boards/mach-se/7724/setup.c
··· 377 377 static struct sh_eth_plat_data sh_eth_plat = { 378 378 .phy = 0x1f, /* SMSC LAN8187 */ 379 379 .edmac_endian = EDMAC_LITTLE_ENDIAN, 380 - .register_type = SH_ETH_REG_FAST_SH4, 381 380 .phy_interace = PHY_INTERFACE_MODE_MII, 382 381 }; 383 382
-1
arch/sh/boards/mach-sh7763rdp/setup.c
··· 88 88 static struct sh_eth_plat_data sh7763_eth_pdata = { 89 89 .phy = 1, 90 90 .edmac_endian = EDMAC_LITTLE_ENDIAN, 91 - .register_type = SH_ETH_REG_GIGABIT, 92 91 .phy_interface = PHY_INTERFACE_MODE_MII, 93 92 }; 94 93
-1
arch/sh/kernel/cpu/sh2/setup-sh7619.c
··· 114 114 static struct sh_eth_plat_data eth_platform_data = { 115 115 .phy = 1, 116 116 .edmac_endian = EDMAC_LITTLE_ENDIAN, 117 - .register_type = SH_ETH_REG_FAST_SH3_SH2, 118 117 .phy_interace = PHY_INTERFACE_MODE_MII, 119 118 }; 120 119
+7
drivers/net/ethernet/renesas/sh_eth.h
··· 157 157 SH_ETH_MAX_REGISTER_OFFSET, 158 158 }; 159 159 160 + enum { 161 + SH_ETH_REG_GIGABIT, 162 + SH_ETH_REG_FAST_RCAR, 163 + SH_ETH_REG_FAST_SH4, 164 + SH_ETH_REG_FAST_SH3_SH2 165 + }; 166 + 160 167 /* Driver's parameters */ 161 168 #if defined(CONFIG_CPU_SH4) || defined(CONFIG_ARCH_SHMOBILE) 162 169 #define SH4_SKB_RX_ALIGN 32
-7
include/linux/sh_eth.h
··· 5 5 #include <linux/if_ether.h> 6 6 7 7 enum {EDMAC_LITTLE_ENDIAN, EDMAC_BIG_ENDIAN}; 8 - enum { 9 - SH_ETH_REG_GIGABIT, 10 - SH_ETH_REG_FAST_RCAR, 11 - SH_ETH_REG_FAST_SH4, 12 - SH_ETH_REG_FAST_SH3_SH2 13 - }; 14 8 15 9 struct sh_eth_plat_data { 16 10 int phy; 17 11 int edmac_endian; 18 - int register_type; 19 12 phy_interface_t phy_interface; 20 13 void (*set_mdio_gate)(void *addr); 21 14