Message ID | 20170803094507.3439-6-privat@egil-hjelmeland.no |
---|---|
State | Changes Requested, archived |
Delegated to: | David Miller |
Headers | show |
On Thu, Aug 03, 2017 at 11:45:07AM +0200, Egil Hjelmeland wrote: > In lan9303_get_ethtool_stats: Get rid of 0x400 constant magic > by using new lan9303_read_switch_reg() inside loop. > Reduced scope of two variables. > > Signed-off-by: Egil Hjelmeland <privat@egil-hjelmeland.no> Reviewed-by: Andrew Lunn <andrew@lunn.ch> Andrew
On 08/03/2017 02:45 AM, Egil Hjelmeland wrote: > In lan9303_get_ethtool_stats: Get rid of 0x400 constant magic > by using new lan9303_read_switch_reg() inside loop. > Reduced scope of two variables. > > Signed-off-by: Egil Hjelmeland <privat@egil-hjelmeland.no> > --- > drivers/net/dsa/lan9303-core.c | 26 ++++++++++++++++---------- > 1 file changed, 16 insertions(+), 10 deletions(-) > > diff --git a/drivers/net/dsa/lan9303-core.c b/drivers/net/dsa/lan9303-core.c > index 6f409755ba1a..5aaa46146c27 100644 > --- a/drivers/net/dsa/lan9303-core.c > +++ b/drivers/net/dsa/lan9303-core.c > @@ -435,6 +435,13 @@ static int lan9303_write_switch_port( > chip, LAN9303_SWITCH_PORT_REG(port, regnum), val); > } > > +static int lan9303_read_switch_port( > + struct lan9303 *chip, int port, u16 regnum, u32 *val) > +{ This indentation is really funny, why not just break it up that way: static int lan9303_read_switch_port(struct lan9303 *chip, int port u16 regnum, u32 *val) { } This applies to patch 5 as well, other than that: Reviewed-by: Florian Fainelli <f.fainelli@gmail.com> > + return lan9303_read_switch_reg( > + chip, LAN9303_SWITCH_PORT_REG(port, regnum), val); > +} > + > static int lan9303_detect_phy_setup(struct lan9303 *chip) > { > int reg; > @@ -709,19 +716,18 @@ static void lan9303_get_ethtool_stats(struct dsa_switch *ds, int port, > uint64_t *data) > { > struct lan9303 *chip = ds->priv; > - u32 reg; > - unsigned int u, poff; > - int ret; > - > - poff = port * 0x400; > + unsigned int u; > > for (u = 0; u < ARRAY_SIZE(lan9303_mib); u++) { > - ret = lan9303_read_switch_reg(chip, > - lan9303_mib[u].offset + poff, > - ®); > + u32 reg; > + int ret; > + > + ret = lan9303_read_switch_port( > + chip, port, lan9303_mib[u].offset, ®); > + > if (ret) > - dev_warn(chip->dev, "Reading status reg %u failed\n", > - lan9303_mib[u].offset + poff); > + dev_warn(chip->dev, "Reading status port %d reg %u failed\n", > + port, lan9303_mib[u].offset); > data[u] = reg; > } > } >
Den 03. aug. 2017 20:04, skrev Florian Fainelli: > On 08/03/2017 02:45 AM, Egil Hjelmeland wrote: >> In lan9303_get_ethtool_stats: Get rid of 0x400 constant magic >> by using new lan9303_read_switch_reg() inside loop. >> Reduced scope of two variables. >> >> Signed-off-by: Egil Hjelmeland <privat@egil-hjelmeland.no> >> --- >> drivers/net/dsa/lan9303-core.c | 26 ++++++++++++++++---------- >> 1 file changed, 16 insertions(+), 10 deletions(-) >> >> diff --git a/drivers/net/dsa/lan9303-core.c b/drivers/net/dsa/lan9303-core.c >> index 6f409755ba1a..5aaa46146c27 100644 >> --- a/drivers/net/dsa/lan9303-core.c >> +++ b/drivers/net/dsa/lan9303-core.c >> @@ -435,6 +435,13 @@ static int lan9303_write_switch_port( >> chip, LAN9303_SWITCH_PORT_REG(port, regnum), val); >> } >> >> +static int lan9303_read_switch_port( >> + struct lan9303 *chip, int port, u16 regnum, u32 *val) >> +{ > > This indentation is really funny, why not just break it up that way: > > static int lan9303_read_switch_port(struct lan9303 *chip, int port > u16 regnum, u32 *val) > { > } > > This applies to patch 5 as well, other than that: > > Reviewed-by: Florian Fainelli <f.fainelli@gmail.com> > Because it is the form that passes scripts/checkpatch.pl which I find easiest to type and maintain. - No need to fine tune spaces. - No need to change indentation if later renaming function to name of different length. Do you have any references backing up your claim this is wrong? Cheers Egil
diff --git a/drivers/net/dsa/lan9303-core.c b/drivers/net/dsa/lan9303-core.c index 6f409755ba1a..5aaa46146c27 100644 --- a/drivers/net/dsa/lan9303-core.c +++ b/drivers/net/dsa/lan9303-core.c @@ -435,6 +435,13 @@ static int lan9303_write_switch_port( chip, LAN9303_SWITCH_PORT_REG(port, regnum), val); } +static int lan9303_read_switch_port( + struct lan9303 *chip, int port, u16 regnum, u32 *val) +{ + return lan9303_read_switch_reg( + chip, LAN9303_SWITCH_PORT_REG(port, regnum), val); +} + static int lan9303_detect_phy_setup(struct lan9303 *chip) { int reg; @@ -709,19 +716,18 @@ static void lan9303_get_ethtool_stats(struct dsa_switch *ds, int port, uint64_t *data) { struct lan9303 *chip = ds->priv; - u32 reg; - unsigned int u, poff; - int ret; - - poff = port * 0x400; + unsigned int u; for (u = 0; u < ARRAY_SIZE(lan9303_mib); u++) { - ret = lan9303_read_switch_reg(chip, - lan9303_mib[u].offset + poff, - ®); + u32 reg; + int ret; + + ret = lan9303_read_switch_port( + chip, port, lan9303_mib[u].offset, ®); + if (ret) - dev_warn(chip->dev, "Reading status reg %u failed\n", - lan9303_mib[u].offset + poff); + dev_warn(chip->dev, "Reading status port %d reg %u failed\n", + port, lan9303_mib[u].offset); data[u] = reg; } }
In lan9303_get_ethtool_stats: Get rid of 0x400 constant magic by using new lan9303_read_switch_reg() inside loop. Reduced scope of two variables. Signed-off-by: Egil Hjelmeland <privat@egil-hjelmeland.no> --- drivers/net/dsa/lan9303-core.c | 26 ++++++++++++++++---------- 1 file changed, 16 insertions(+), 10 deletions(-)