On 10/23/2014 05:20 PM, Guenter Roeck wrote:

quoted

quoted

Report known silicon revisions when probing Marvell 88E6060 switches.

quoted

quoted

Signed-off-by: Guenter Roeck <linux@roeck-us.net>
---
  drivers/net/dsa/mv88e6060.c | 5 ++++-
  1 file changed, 4 insertions(+), 1 deletion(-)

quoted

quoted

diff --git a/drivers/net/dsa/mv88e6060.c b/drivers/net/dsa/mv88e6060.c
index 05b0ca3..c29aebe 100644
--- a/drivers/net/dsa/mv88e6060.c
+++ b/drivers/net/dsa/mv88e6060.c

@@ -69,8 +69,11 @@ static char *mv88e6060_probe(struct device *host_dev,

int sw_addr)

      ret = mdiobus_read(bus, sw_addr + REG_PORT(0), 0x03);
      if (ret >= 0) {
-        ret &= 0xfff0;
          if (ret == 0x0600)
+            return "Marvell 88E6060 (A0)";
+        if (ret == 0x0601 || ret == 0x0602)

quoted

    *else* *if*.

quoted

quoted

+            return "Marvell 88E6060 (B0)";
+        if ((ret & 0xfff0) == 0x0600)

quoted

    Likewise?

The if case returns, so the else would just introduce an unnecessary
additional level of indentation.

    Not really.

I think nowadays even checkpatch
complains about an unnecessary else after return.

    You're right about the *return* though. I should have stayed silent.

Thanks,
Guenter

WBR, Sergei