Commit 888cc8c2 authored by Sergei Shtylyov's avatar Sergei Shtylyov Committed by David S. Miller

sh_eth: remove EDMAC_BIG_ENDIAN

Commit  71557a37 ("[netdrvr] sh_eth: Add SH7619 support") added support
for the big-endian EDMAC descriptors. However, it was never used and never
worked right until the recent driver  fixes. I think we now  can just remove
this support,  it was only burdening the driver from the start. It should be
easy to do without disturbing the SH platform code, at least for now...
Signed-off-by: default avatarSergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Acked-by: default avatarSimon Horman <horms+renesas@verge.net.au>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 6e898bfd
...@@ -971,24 +971,12 @@ static void sh_eth_set_receive_align(struct sk_buff *skb) ...@@ -971,24 +971,12 @@ static void sh_eth_set_receive_align(struct sk_buff *skb)
/* CPU <-> EDMAC endian convert */ /* CPU <-> EDMAC endian convert */
static inline __u32 cpu_to_edmac(struct sh_eth_private *mdp, u32 x) static inline __u32 cpu_to_edmac(struct sh_eth_private *mdp, u32 x)
{ {
switch (mdp->edmac_endian) { return cpu_to_le32(x);
case EDMAC_LITTLE_ENDIAN:
return cpu_to_le32(x);
case EDMAC_BIG_ENDIAN:
return cpu_to_be32(x);
}
return x;
} }
static inline __u32 edmac_to_cpu(struct sh_eth_private *mdp, u32 x) static inline __u32 edmac_to_cpu(struct sh_eth_private *mdp, u32 x)
{ {
switch (mdp->edmac_endian) { return le32_to_cpu(x);
case EDMAC_LITTLE_ENDIAN:
return le32_to_cpu(x);
case EDMAC_BIG_ENDIAN:
return be32_to_cpu(x);
}
return x;
} }
/* Program the hardware MAC address from dev->dev_addr. */ /* Program the hardware MAC address from dev->dev_addr. */
...@@ -3097,8 +3085,6 @@ static int sh_eth_drv_probe(struct platform_device *pdev) ...@@ -3097,8 +3085,6 @@ static int sh_eth_drv_probe(struct platform_device *pdev)
/* get PHY ID */ /* get PHY ID */
mdp->phy_id = pd->phy; mdp->phy_id = pd->phy;
mdp->phy_interface = pd->phy_interface; mdp->phy_interface = pd->phy_interface;
/* EDMAC endian */
mdp->edmac_endian = pd->edmac_endian;
mdp->no_ether_link = pd->no_ether_link; mdp->no_ether_link = pd->no_ether_link;
mdp->ether_link_active_low = pd->ether_link_active_low; mdp->ether_link_active_low = pd->ether_link_active_low;
......
...@@ -513,7 +513,6 @@ struct sh_eth_private { ...@@ -513,7 +513,6 @@ struct sh_eth_private {
u32 cur_rx, dirty_rx; /* Producer/consumer ring indices */ u32 cur_rx, dirty_rx; /* Producer/consumer ring indices */
u32 cur_tx, dirty_tx; u32 cur_tx, dirty_tx;
u32 rx_buf_sz; /* Based on MTU+slack. */ u32 rx_buf_sz; /* Based on MTU+slack. */
int edmac_endian;
struct napi_struct napi; struct napi_struct napi;
bool irq_enabled; bool irq_enabled;
/* MII transceiver section. */ /* MII transceiver section. */
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
#include <linux/phy.h> #include <linux/phy.h>
#include <linux/if_ether.h> #include <linux/if_ether.h>
enum {EDMAC_LITTLE_ENDIAN, EDMAC_BIG_ENDIAN}; enum {EDMAC_LITTLE_ENDIAN};
struct sh_eth_plat_data { struct sh_eth_plat_data {
int phy; int phy;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment