Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8d3214c4 authored by Sergei Shtylyov's avatar Sergei Shtylyov Committed by David S. Miller
Browse files

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: default avatarSergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent a3153d8c

arch/arm/mach-shmobile/board-armadillo800eva.c

+0 −1
Original line number Diff line number Diff line
@@ -358,7 +358,6 @@ static struct platform_device usbhsf_device = { 
static struct sh_eth_plat_data sh_eth_platdata = {

	.phy			= 0x00, /* LAN8710A */

	.edmac_endian		= EDMAC_LITTLE_ENDIAN,

	.register_type		= SH_ETH_REG_GIGABIT,

	.phy_interface		= PHY_INTERFACE_MODE_MII,

};

arch/arm/mach-shmobile/board-bockw.c

+0 −1
Original line number Diff line number Diff line
@@ -89,7 +89,6 @@ static struct sh_mobile_sdhi_info sdhi0_info = { 
static struct sh_eth_plat_data ether_platform_data __initdata = {

	.phy		= 0x01,

	.edmac_endian	= EDMAC_LITTLE_ENDIAN,

	.register_type	= SH_ETH_REG_FAST_RCAR,

	.phy_interface	= PHY_INTERFACE_MODE_RMII,

	/*

	 * Although the LINK signal is available on the board, it's connected to

arch/sh/boards/board-espt.c

+0 −1
Original line number Diff line number Diff line
@@ -80,7 +80,6 @@ static struct resource sh_eth_resources[] = { 
static struct sh_eth_plat_data sh7763_eth_pdata = {

	.phy = 0,

	.edmac_endian = EDMAC_LITTLE_ENDIAN,

	.register_type = SH_ETH_REG_GIGABIT,

	.phy_interface = PHY_INTERFACE_MODE_MII,

};

arch/sh/boards/board-sh7757lcr.c

+0 −4
Original line number Diff line number Diff line
@@ -77,7 +77,6 @@ static struct resource sh_eth0_resources[] = { 
static struct sh_eth_plat_data sh7757_eth0_pdata = {

	.phy = 1,

	.edmac_endian = EDMAC_LITTLE_ENDIAN,

	.register_type = SH_ETH_REG_FAST_SH4,

	.set_mdio_gate = sh7757_eth_set_mdio_gate,

};
@@ -106,7 +105,6 @@ static struct resource sh_eth1_resources[] = { 
static struct sh_eth_plat_data sh7757_eth1_pdata = {

	.phy = 1,

	.edmac_endian = EDMAC_LITTLE_ENDIAN,

	.register_type = SH_ETH_REG_FAST_SH4,

	.set_mdio_gate = sh7757_eth_set_mdio_gate,

};
@@ -151,7 +149,6 @@ static struct resource sh_eth_giga0_resources[] = { 
static struct sh_eth_plat_data sh7757_eth_giga0_pdata = {

	.phy = 18,

	.edmac_endian = EDMAC_LITTLE_ENDIAN,

	.register_type = SH_ETH_REG_GIGABIT,

	.set_mdio_gate = sh7757_eth_giga_set_mdio_gate,

	.phy_interface = PHY_INTERFACE_MODE_RGMII_ID,

};
@@ -186,7 +183,6 @@ static struct resource sh_eth_giga1_resources[] = { 
static struct sh_eth_plat_data sh7757_eth_giga1_pdata = {

	.phy = 19,

	.edmac_endian = EDMAC_LITTLE_ENDIAN,

	.register_type = SH_ETH_REG_GIGABIT,

	.set_mdio_gate = sh7757_eth_giga_set_mdio_gate,

	.phy_interface = PHY_INTERFACE_MODE_RGMII_ID,

};

arch/sh/boards/mach-ecovec24/setup.c

+0 −1
Original line number Diff line number Diff line
@@ -159,7 +159,6 @@ static struct resource sh_eth_resources[] = { 
static struct sh_eth_plat_data sh_eth_plat = {

	.phy = 0x1f, /* SMSC LAN8700 */

	.edmac_endian = EDMAC_LITTLE_ENDIAN,

	.register_type = SH_ETH_REG_FAST_SH4,

	.phy_interface = PHY_INTERFACE_MODE_MII,

	.ether_link_active_low = 1

};