redonkable/alistair23-linux
redonkable/alistair23-linux
1
0
Fork 0
Code Releases Activity

greth: some driver cleanups

Browse source 
On Fri, Feb 19, 2010 at 13:51 +0100, Jiri Pirko wrote:
>
> <snip>
> >>@@ -1031,7 +1029,7 @@ static void greth_set_multicast_list(struct net_device *dev)
> >> 			return;
> >> 		}
> >>
> >>-		if (dev->mc_count == 0) {
> >>+		if (!netdev_mc_count(dev)) {
> also please use netdev_mc_empty() here.
Some driver cleanups:
* convert to use phy_find_first/phy_direct_connect
* convert to use netdev_mc_* helpers
* fixed missing validate_addr hook
* removed netdev_priv castings

Signed-off-by: Denis Kirjanov <kirjanov@gmail.com>
Reviewed-by: Jiri Pirko <jpirko@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
kirjanov@gmail.com 2010-02-19 05:00:52 +00:00 committed by David S. Miller
parent 91fea58584
commit 6e03718c85
1 changed files with 18 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

49
drivers/net/greth.c
View file

@ -965,7 +965,7 @@ static int greth_set_mac_add(struct net_device *dev, void *p)
struct greth_private *greth;
struct greth_regs *regs;
greth = (struct greth_private *) netdev_priv(dev);
greth = netdev_priv(dev);
regs = (struct greth_regs *) greth->regs;
if (!is_valid_ether_addr(addr->sa_data))
@ -988,20 +988,14 @@ static u32 greth_hash_get_index(__u8 *addr)
static void greth_set_hash_filter(struct net_device *dev)
{
struct dev_mc_list *curr;
struct greth_private *greth = (struct greth_private *) netdev_priv(dev);
struct greth_private *greth = netdev_priv(dev);
struct greth_regs *regs = (struct greth_regs *) greth->regs;
u32 mc_filter[2];
unsigned int i, bitnr;
unsigned int bitnr;
mc_filter[0] = mc_filter[1] = 0;
curr = dev->mc_list;
for (i = 0; i < dev->mc_count; i++, curr = curr->next) {
if (!curr)
break; /* unexpected end of list */
netdev_for_each_mc_addr(curr, dev) {
bitnr = greth_hash_get_index(curr->dmi_addr);
mc_filter[bitnr >> 5] |= 1 << (bitnr & 31);
}
@ -1031,7 +1025,7 @@ static void greth_set_multicast_list(struct net_device *dev)
return;
}
if (dev->mc_count == 0) {
if (netdev_mc_empty(dev)) {
cfg &= ~GRETH_CTRL_MCEN;
GRETH_REGSAVE(regs->control, cfg);
return;
@ -1160,6 +1154,7 @@ static struct net_device_ops greth_netdev_ops = {
.ndo_stop = greth_close,
.ndo_start_xmit = greth_start_xmit,
.ndo_set_mac_address = greth_set_mac_add,
.ndo_validate_addr = eth_validate_addr,
};
static inline int wait_for_mdio(struct greth_private *greth)
@ -1275,28 +1270,26 @@ static int greth_mdio_probe(struct net_device *dev)
{
struct greth_private *greth = netdev_priv(dev);
struct phy_device *phy = NULL;
u32 interface;
int i;
int ret;
/* Find the first PHY */
for (i = 0; i < PHY_MAX_ADDR; i++) {
if (greth->mdio->phy_map[i]) {
phy = greth->mdio->phy_map[i];
break;
}
}
phy = phy_find_first(greth->mdio);
if (!phy) {
if (netif_msg_probe(greth))
dev_err(&dev->dev, "no PHY found\n");
return -ENXIO;
}
if (greth->gbit_mac)
interface = PHY_INTERFACE_MODE_GMII;
else
interface = PHY_INTERFACE_MODE_MII;
phy = phy_connect(dev, dev_name(&phy->dev), &greth_link_change, 0, interface);
ret = phy_connect_direct(dev, phy, &greth_link_change,
0, greth->gbit_mac ?
PHY_INTERFACE_MODE_GMII :
PHY_INTERFACE_MODE_MII);
if (ret) {
if (netif_msg_ifup(greth))
dev_err(&dev->dev, "could not attach to PHY\n");
return ret;
}
if (greth->gbit_mac)
phy->supported &= PHY_GBIT_FEATURES;
@ -1305,12 +1298,6 @@ static int greth_mdio_probe(struct net_device *dev)
phy->advertising = phy->supported;
if (IS_ERR(phy)) {
if (netif_msg_ifup(greth))
dev_err(&dev->dev, "could not attach to PHY\n");
return PTR_ERR(phy);
}
greth->link = 0;
greth->speed = 0;
greth->duplex = -1;