sysmo-bts
/
barebox
9
0
Fork 0
Code Releases Activity

net: cpsw: drop for_each_slave 

We currently only use one slave, so drop for_each_slave and hardcode
slave[0] until we pass the proper context to the functions that makes
this hack unnecessary.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
This commit is contained in:
Sascha Hauer 2013-11-20 10:09:01 +01:00
parent a722418645
commit 82bc71b820
1 changed files with 14 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
drivers/net/cpsw.c
View File

@ -228,12 +228,6 @@ struct cpsw_priv {
struct cpdma_chan rx_chan, tx_chan;
struct cpsw_slave *slaves;
#define for_each_slave(priv, func, arg...) \
do { \
int idx; \
for (idx = 0; idx < (priv)->num_slaves; idx++) \
(func)((priv)->slaves + idx, ##arg); \
} while (0)
};
static int cpsw_ale_get_field(u32 *ale_entry, u32 start, u32 bits)
@ -542,16 +536,6 @@ static inline void soft_reset(struct cpsw_priv *priv, void *reg)
((mac)[2] << 16) | ((mac)[3] << 24))
#define mac_lo(mac) (((mac)[4] << 0) | ((mac)[5] << 8))
static void cpsw_set_slave_mac(struct cpsw_slave *slave,
struct cpsw_priv *priv,
unsigned char *mac)
{
dev_dbg(priv->dev, "* %s\n", __func__);
writel(mac_hi(mac), &slave->regs->sa_hi);
writel(mac_lo(mac), &slave->regs->sa_lo);
}
static int cpsw_get_hwaddr(struct eth_device *edev, unsigned char *mac)
{
struct cpsw_priv *priv = edev->priv;
@ -564,12 +548,14 @@ static int cpsw_get_hwaddr(struct eth_device *edev, unsigned char *mac)
static int cpsw_set_hwaddr(struct eth_device *edev, unsigned char *mac)
{
struct cpsw_priv *priv = edev->priv;
struct cpsw_slave *slave = &priv->slaves[0];
dev_dbg(priv->dev, "* %s\n", __func__);
memcpy(&priv->mac_addr, mac, sizeof(priv->mac_addr));
for_each_slave(priv, cpsw_set_slave_mac, priv, mac);
writel(mac_hi(mac), &slave->regs->sa_hi);
writel(mac_lo(mac), &slave->regs->sa_lo);
return 0;
}
@ -617,22 +603,25 @@ static void cpsw_slave_update_link(struct cpsw_slave *slave,
slave->mac_control = mac_control;
}
static int cpsw_update_link(struct cpsw_priv *priv)
static int cpsw_update_link(struct cpsw_slave *slave, struct cpsw_priv *priv)
{
int link = 0;
dev_dbg(priv->dev, "* %s\n", __func__);
for_each_slave(priv, cpsw_slave_update_link, priv, &link);
cpsw_slave_update_link(slave, priv, &link);
return link;
}
static void cpsw_adjust_link(struct eth_device *edev) {
static void cpsw_adjust_link(struct eth_device *edev)
{
struct cpsw_priv *priv = edev->priv;
struct cpsw_slave *slave = &priv->slaves[0];
dev_dbg(priv->dev, "* %s\n", __func__);
cpsw_update_link(priv);
cpsw_update_link(slave, priv);
}
static inline u32 cpsw_get_slave_port(struct cpsw_priv *priv, u32 slave_num)
@ -805,9 +794,8 @@ static int cpsw_open(struct eth_device *edev)
ALE_SECURE);
cpsw_ale_add_mcast(priv, ethbdaddr, 1 << priv->host_port);
for_each_slave(priv, cpsw_slave_init, priv);
cpsw_update_link(priv);
cpsw_slave_init(&priv->slaves[0], priv);
cpsw_update_link(&priv->slaves[0], priv);
/* init descriptor pool */
for (i = 0; i < NUM_DESCS; i++) {
@ -1122,7 +1110,7 @@ int cpsw_probe(struct device_d *dev)
priv->data = *data;
priv->num_slaves = data->num_slaves;
priv->slaves = xzalloc(sizeof(struct cpsw_slave) * priv->num_slaves);
for_each_slave(priv, cpsw_slave_init_data, idx, priv);
cpsw_slave_init_data(&priv->slaves[0], 0, priv);
}
priv->channels = 8;
@ -1196,7 +1184,7 @@ int cpsw_probe(struct device_d *dev)
mdiobus_register(&priv->miibus);
for_each_slave(priv, cpsw_slave_setup, idx, priv);
cpsw_slave_setup(&priv->slaves[0], 0, priv);
return 0;
}