projects
/
openwrt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ar71xx: fix inline attribute location
[openwrt.git]
/
target
/
linux
/
ar71xx
/
files
/
drivers
/
net
/
ag71xx
/
ag71xx_ar7240.c
diff --git
a/target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx_ar7240.c
b/target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx_ar7240.c
index
e299e68
..
c256d05
100644
(file)
--- a/
target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx_ar7240.c
+++ b/
target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx_ar7240.c
@@
-414,7
+414,7
@@
static int ar7240sw_reset(struct ar7240sw *as)
AR7240_MASK_CTRL_SOFT_RESET);
ret = ar7240sw_reg_wait(as, AR7240_REG_MASK_CTRL,
AR7240_MASK_CTRL_SOFT_RESET);
ret = ar7240sw_reg_wait(as, AR7240_REG_MASK_CTRL,
- AR7240_MASK_CTRL_SOFT_RESET, 0, 1000);
+ AR7240_MASK_CTRL_SOFT_RESET, 0, 1000);
return ret;
}
return ret;
}
@@
-518,7
+518,7
@@
static int ar7240_set_addr(struct ar7240sw *as, u8 *addr)
static int
ar7240_set_vid(struct switch_dev *dev, const struct switch_attr *attr,
static int
ar7240_set_vid(struct switch_dev *dev, const struct switch_attr *attr,
-
struct switch_val *val)
+ struct switch_val *val)
{
struct ar7240sw *as = sw_to_ar7240(dev);
as->vlan_id[val->port_vlan] = val->value.i;
{
struct ar7240sw *as = sw_to_ar7240(dev);
as->vlan_id[val->port_vlan] = val->value.i;
@@
-527,7
+527,7
@@
ar7240_set_vid(struct switch_dev *dev, const struct switch_attr *attr,
static int
ar7240_get_vid(struct switch_dev *dev, const struct switch_attr *attr,
static int
ar7240_get_vid(struct switch_dev *dev, const struct switch_attr *attr,
-
struct switch_val *val)
+ struct switch_val *val)
{
struct ar7240sw *as = sw_to_ar7240(dev);
val->value.i = as->vlan_id[val->port_vlan];
{
struct ar7240sw *as = sw_to_ar7240(dev);
val->value.i = as->vlan_id[val->port_vlan];
@@
-613,7
+613,7
@@
ar7240_set_ports(struct switch_dev *dev, struct switch_val *val)
static int
ar7240_set_vlan(struct switch_dev *dev, const struct switch_attr *attr,
static int
ar7240_set_vlan(struct switch_dev *dev, const struct switch_attr *attr,
-
struct switch_val *val)
+ struct switch_val *val)
{
struct ar7240sw *as = sw_to_ar7240(dev);
as->vlan = !!val->value.i;
{
struct ar7240sw *as = sw_to_ar7240(dev);
as->vlan = !!val->value.i;
@@
-622,7
+622,7
@@
ar7240_set_vlan(struct switch_dev *dev, const struct switch_attr *attr,
static int
ar7240_get_vlan(struct switch_dev *dev, const struct switch_attr *attr,
static int
ar7240_get_vlan(struct switch_dev *dev, const struct switch_attr *attr,
-
struct switch_val *val)
+ struct switch_val *val)
{
struct ar7240sw *as = sw_to_ar7240(dev);
val->value.i = as->vlan;
{
struct ar7240sw *as = sw_to_ar7240(dev);
val->value.i = as->vlan;
@@
-770,7
+770,8
@@
static struct ar7240sw *ar7240_probe(struct ag71xx *ag)
ver = (ctrl >> AR7240_MASK_CTRL_VERSION_S) & AR7240_MASK_CTRL_VERSION_M;
if (ver != 1) {
ver = (ctrl >> AR7240_MASK_CTRL_VERSION_S) & AR7240_MASK_CTRL_VERSION_M;
if (ver != 1) {
- pr_err("%s: unsupported chip, ctrl=%08x\n", ag->dev->name, ctrl);
+ pr_err("%s: unsupported chip, ctrl=%08x\n",
+ ag->dev->name, ctrl);
return NULL;
}
return NULL;
}
@@
-790,8
+791,8
@@
static struct ar7240sw *ar7240_probe(struct ag71xx *ag)
swdev->ops = &ar7240_ops;
if (register_switch(&as->swdev, ag->dev) < 0) {
swdev->ops = &ar7240_ops;
if (register_switch(&as->swdev, ag->dev) < 0) {
- kfree(as);
- return NULL;
+
kfree(as);
+
return NULL;
}
printk("%s: Found an AR7240 built-in switch\n", ag->dev->name);
}
printk("%s: Found an AR7240 built-in switch\n", ag->dev->name);
@@
-824,7
+825,7
@@
void ag71xx_ar7240_stop(struct ag71xx *ag)
{
}
{
}
-int __init ag71xx_ar7240_init(struct ag71xx *ag)
+int __
dev
init ag71xx_ar7240_init(struct ag71xx *ag)
{
struct ar7240sw *as;
{
struct ar7240sw *as;
@@
-838,7
+839,7
@@
int __init ag71xx_ar7240_init(struct ag71xx *ag)
return 0;
}
return 0;
}
-void __exit ag71xx_ar7240_cleanup(struct ag71xx *ag)
+void __
dev
exit ag71xx_ar7240_cleanup(struct ag71xx *ag)
{
struct ar7240sw *as = ag->phy_priv;
{
struct ar7240sw *as = ag->phy_priv;
This page took
0.039592 seconds
and
4
git commands to generate.