| From 17c1ddfff070927bd8b1d07d6b4ce2bd84ef2918 Mon Sep 17 00:00:00 2001 |
| From: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com> |
| Date: Sun, 18 Aug 2013 03:13:26 +0400 |
| Subject: 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> |
| (cherry picked from commit 8d3214c4e8c8be6efd8ec7a172239ebbd4deb04b) |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| |
| Conflicts: |
| arch/sh/boards/mach-se/7724/setup.c |
| arch/sh/kernel/cpu/sh2/setup-sh7619.c |
| --- |
| arch/arm/mach-shmobile/board-armadillo800eva.c | 1 - |
| arch/arm/mach-shmobile/board-bockw.c | 1 - |
| arch/sh/boards/board-espt.c | 1 - |
| arch/sh/boards/board-sh7757lcr.c | 4 ---- |
| arch/sh/boards/mach-ecovec24/setup.c | 1 - |
| arch/sh/boards/mach-sh7763rdp/setup.c | 1 - |
| drivers/net/ethernet/renesas/sh_eth.h | 7 +++++++ |
| include/linux/sh_eth.h | 7 ------- |
| 8 files changed, 7 insertions(+), 16 deletions(-) |
| |
| diff --git a/arch/arm/mach-shmobile/board-armadillo800eva.c b/arch/arm/mach-shmobile/board-armadillo800eva.c |
| index 4b247407..06802584 100644 |
| --- a/arch/arm/mach-shmobile/board-armadillo800eva.c |
| +++ b/arch/arm/mach-shmobile/board-armadillo800eva.c |
| @@ -359,7 +359,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, |
| }; |
| |
| diff --git a/arch/arm/mach-shmobile/board-bockw.c b/arch/arm/mach-shmobile/board-bockw.c |
| index 127ad3a0..6b9faf39 100644 |
| --- a/arch/arm/mach-shmobile/board-bockw.c |
| +++ b/arch/arm/mach-shmobile/board-bockw.c |
| @@ -104,7 +104,6 @@ static struct resource sdhi0_resources[] __initdata = { |
| 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 |
| diff --git a/arch/sh/boards/board-espt.c b/arch/sh/boards/board-espt.c |
| index 4d94dff9..7291e2f1 100644 |
| --- a/arch/sh/boards/board-espt.c |
| +++ b/arch/sh/boards/board-espt.c |
| @@ -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, |
| }; |
| |
| diff --git a/arch/sh/boards/board-sh7757lcr.c b/arch/sh/boards/board-sh7757lcr.c |
| index 4f114d1c..25c5a932 100644 |
| --- a/arch/sh/boards/board-sh7757lcr.c |
| +++ b/arch/sh/boards/board-sh7757lcr.c |
| @@ -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, |
| }; |
| diff --git a/arch/sh/boards/mach-ecovec24/setup.c b/arch/sh/boards/mach-ecovec24/setup.c |
| index 61fade0f..a4f630f0 100644 |
| --- a/arch/sh/boards/mach-ecovec24/setup.c |
| +++ b/arch/sh/boards/mach-ecovec24/setup.c |
| @@ -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 |
| }; |
| diff --git a/arch/sh/boards/mach-sh7763rdp/setup.c b/arch/sh/boards/mach-sh7763rdp/setup.c |
| index 50ba481f..2c8fb046 100644 |
| --- a/arch/sh/boards/mach-sh7763rdp/setup.c |
| +++ b/arch/sh/boards/mach-sh7763rdp/setup.c |
| @@ -88,7 +88,6 @@ static struct resource sh_eth_resources[] = { |
| static struct sh_eth_plat_data sh7763_eth_pdata = { |
| .phy = 1, |
| .edmac_endian = EDMAC_LITTLE_ENDIAN, |
| - .register_type = SH_ETH_REG_GIGABIT, |
| .phy_interface = PHY_INTERFACE_MODE_MII, |
| }; |
| |
| diff --git a/drivers/net/ethernet/renesas/sh_eth.h b/drivers/net/ethernet/renesas/sh_eth.h |
| index 1e785281..a0db02c6 100644 |
| --- a/drivers/net/ethernet/renesas/sh_eth.h |
| +++ b/drivers/net/ethernet/renesas/sh_eth.h |
| @@ -157,6 +157,13 @@ enum { |
| SH_ETH_MAX_REGISTER_OFFSET, |
| }; |
| |
| +enum { |
| + SH_ETH_REG_GIGABIT, |
| + SH_ETH_REG_FAST_RCAR, |
| + SH_ETH_REG_FAST_SH4, |
| + SH_ETH_REG_FAST_SH3_SH2 |
| +}; |
| + |
| /* Driver's parameters */ |
| #if defined(CONFIG_CPU_SH4) || defined(CONFIG_ARCH_SHMOBILE) |
| #define SH4_SKB_RX_ALIGN 32 |
| diff --git a/include/linux/sh_eth.h b/include/linux/sh_eth.h |
| index fc305713..15b2ea93 100644 |
| --- a/include/linux/sh_eth.h |
| +++ b/include/linux/sh_eth.h |
| @@ -4,17 +4,10 @@ |
| #include <linux/phy.h> |
| |
| enum {EDMAC_LITTLE_ENDIAN, EDMAC_BIG_ENDIAN}; |
| -enum { |
| - SH_ETH_REG_GIGABIT, |
| - SH_ETH_REG_FAST_RCAR, |
| - SH_ETH_REG_FAST_SH4, |
| - SH_ETH_REG_FAST_SH3_SH2 |
| -}; |
| |
| struct sh_eth_plat_data { |
| int phy; |
| int edmac_endian; |
| - int register_type; |
| phy_interface_t phy_interface; |
| void (*set_mdio_gate)(void *addr); |
| |
| -- |
| 1.8.4.3.gca3854a |
| |