KumiSystems/openwrtv3
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

generic: ar8216: coding style cleanup

Browse source 
SVN-Revision: 30857
This commit is contained in:
Gabor Juhos 2012-03-08 10:21:14 +00:00
parent e2d3cb69a1
commit 1ad06d4c3a
1 changed files with 24 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

47
target/linux/generic/files/drivers/net/phy/ar8216.c
View file

@ -226,7 +226,7 @@ ar8216_read_port_link(struct ar8216_priv *priv, int port,
static int static int
ar8216_set_vlan(struct switch_dev *dev, const struct switch_attr *attr, ar8216_set_vlan(struct switch_dev *dev, const struct switch_attr *attr,
struct switch_val *val) struct switch_val *val)
{ {
struct ar8216_priv *priv = to_ar8216(dev); struct ar8216_priv *priv = to_ar8216(dev);
priv->vlan = !!val->value.i; priv->vlan = !!val->value.i;
@ -235,7 +235,7 @@ ar8216_set_vlan(struct switch_dev *dev, const struct switch_attr *attr,
static int static int
ar8216_get_vlan(struct switch_dev *dev, const struct switch_attr *attr, ar8216_get_vlan(struct switch_dev *dev, const struct switch_attr *attr,
struct switch_val *val) struct switch_val *val)
{ {
struct ar8216_priv *priv = to_ar8216(dev); struct ar8216_priv *priv = to_ar8216(dev);
val->value.i = priv->vlan; val->value.i = priv->vlan;
@ -267,7 +267,7 @@ ar8216_get_pvid(struct switch_dev *dev, int port, int *vlan)
static int static int
ar8216_set_vid(struct switch_dev *dev, const struct switch_attr *attr, ar8216_set_vid(struct switch_dev *dev, const struct switch_attr *attr,
struct switch_val *val) struct switch_val *val)
{ {
struct ar8216_priv *priv = to_ar8216(dev); struct ar8216_priv *priv = to_ar8216(dev);
priv->vlan_id[val->port_vlan] = val->value.i; priv->vlan_id[val->port_vlan] = val->value.i;
@ -276,7 +276,7 @@ ar8216_set_vid(struct switch_dev *dev, const struct switch_attr *attr,
static int static int
ar8216_get_vid(struct switch_dev *dev, const struct switch_attr *attr, ar8216_get_vid(struct switch_dev *dev, const struct switch_attr *attr,
struct switch_val *val) struct switch_val *val)
{ {
struct ar8216_priv *priv = to_ar8216(dev); struct ar8216_priv *priv = to_ar8216(dev);
val->value.i = priv->vlan_id[val->port_vlan]; val->value.i = priv->vlan_id[val->port_vlan];
@ -299,8 +299,8 @@ ar8216_mangle_tx(struct sk_buff *skb, struct net_device *dev)
struct ar8216_priv *priv = dev->phy_ptr; struct ar8216_priv *priv = dev->phy_ptr;
unsigned char *buf; unsigned char *buf;
if (unlikely(!priv)) if (unlikely(!priv))
goto error; goto error;
if (!priv->vlan) if (!priv->vlan)
goto send; goto send;
@ -451,9 +451,9 @@ ar8216_set_ports(struct switch_dev *dev, struct switch_val *val)
for (i = 0; i < val->len; i++) { for (i = 0; i < val->len; i++) {
struct switch_port *p = &val->value.ports[i]; struct switch_port *p = &val->value.ports[i];
if (p->flags & (1 << SWITCH_PORT_FLAG_TAGGED)) if (p->flags & (1 << SWITCH_PORT_FLAG_TAGGED)) {
priv->vlan_tagged |= (1 << p->id); priv->vlan_tagged |= (1 << p->id);
else { } else {
priv->vlan_tagged &= ~(1 << p->id); priv->vlan_tagged &= ~(1 << p->id);
priv->pvid[p->id] = val->port_vlan; priv->pvid[p->id] = val->port_vlan;
@ -606,11 +606,10 @@ ar8216_hw_apply(struct switch_dev *dev)
int egress, ingress; int egress, ingress;
int pvid; int pvid;
if (priv->vlan) { if (priv->vlan)
pvid = priv->vlan_id[priv->pvid[i]]; pvid = priv->vlan_id[priv->pvid[i]];
} else { else
pvid = i; pvid = i;
}
if (priv->vlan) { if (priv->vlan) {
if (priv->vlan_tagged & (1 << i)) if (priv->vlan_tagged & (1 << i))
@ -620,11 +619,11 @@ ar8216_hw_apply(struct switch_dev *dev)
} else { } else {
egress = AR8216_OUT_KEEP; egress = AR8216_OUT_KEEP;
} }
if (priv->vlan) {
if (priv->vlan)
ingress = AR8216_IN_SECURE; ingress = AR8216_IN_SECURE;
} else { else
ingress = AR8216_IN_PORT_ONLY; ingress = AR8216_IN_PORT_ONLY;
}
if (priv->chip == AR8236) if (priv->chip == AR8236)
ar8236_setup_port(priv, i, egress, ingress, portmask[i], ar8236_setup_port(priv, i, egress, ingress, portmask[i],
@ -649,7 +648,8 @@ ar8216_hw_init(struct ar8216_priv *priv)
} }
static int static int
ar8236_hw_init(struct ar8216_priv *priv) { ar8236_hw_init(struct ar8216_priv *priv)
{
int i; int i;
struct mii_bus *bus; struct mii_bus *bus;
@ -675,7 +675,8 @@ ar8236_hw_init(struct ar8216_priv *priv) {
} }
static int static int
ar8316_hw_init(struct ar8216_priv *priv) { ar8316_hw_init(struct ar8216_priv *priv)
{
int i; int i;
u32 val, newval; u32 val, newval;
struct mii_bus *bus; struct mii_bus *bus;
@ -781,9 +782,9 @@ ar8216_reset_switch(struct switch_dev *dev)
mutex_lock(&priv->reg_mutex); mutex_lock(&priv->reg_mutex);
memset(&priv->vlan, 0, sizeof(struct ar8216_priv) - memset(&priv->vlan, 0, sizeof(struct ar8216_priv) -
offsetof(struct ar8216_priv, vlan)); offsetof(struct ar8216_priv, vlan));
for (i = 0; i < AR8X16_MAX_VLANS; i++) {
for (i = 0; i < AR8X16_MAX_VLANS; i++)
priv->vlan_id[i] = i; priv->vlan_id[i] = i;
}
/* Configure all ports */ /* Configure all ports */
for (i = 0; i < AR8216_NUM_PORTS; i++) for (i = 0; i < AR8216_NUM_PORTS; i++)
@ -954,9 +955,9 @@ ar8216_read_status(struct phy_device *phydev)
struct ar8216_priv *priv = phydev->priv; struct ar8216_priv *priv = phydev->priv;
struct switch_port_link link; struct switch_port_link link;
int ret; int ret;
if (phydev->addr != 0) {
if (phydev->addr != 0)
return genphy_read_status(phydev); return genphy_read_status(phydev);
}
ar8216_read_port_link(priv, phydev->addr, &link); ar8216_read_port_link(priv, phydev->addr, &link);
phydev->link = !!link.link; phydev->link = !!link.link;
@ -965,13 +966,13 @@ ar8216_read_status(struct phy_device *phydev)
switch (link.speed) { switch (link.speed) {
case SWITCH_PORT_SPEED_10: case SWITCH_PORT_SPEED_10:
phydev->speed = SPEED_10; phydev->speed = SPEED_10;
break; break;
case SWITCH_PORT_SPEED_100: case SWITCH_PORT_SPEED_100:
phydev->speed = SPEED_100; phydev->speed = SPEED_100;
break; break;
case SWITCH_PORT_SPEED_1000: case SWITCH_PORT_SPEED_1000:
phydev->speed = SPEED_1000; phydev->speed = SPEED_1000;
break; break;
default: default:
phydev->speed = 0; phydev->speed = 0;