net: dsa: microchip: Improve phy mode message

Always print the selected phy mode for the CPU port when using the
ksz9477 driver. If the phy mode was changed, also print the previous
mode to aid in debugging.

To make the message more clear, prefix it with the port number which it
applies to and improve the language a little.

Signed-off-by: Paul Barker <pbarker@konsulko.com>
Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/dsa/microchip/ksz9477.c b/drivers/net/dsa/microchip/ksz9477.c
index df5ecd0261fa664302e61ef6db7534ecaafd5748..d9030820f406c9a74faa23d52cadf762409704f4 100644 (file)
--- a/drivers/net/dsa/microchip/ksz9477.c
+++ b/drivers/net/dsa/microchip/ksz9477.c
@@ -1265,6 +1265,8 @@ static void ksz9477_config_cpu_port(struct dsa_switch *ds)
        for (i = 0; i < dev->port_cnt; i++) {
                if (dsa_is_cpu_port(ds, i) && (dev->cpu_ports & (1 << i))) {
                        phy_interface_t interface;
+                       const char *prev_msg;
+                       const char *prev_mode;
 
                        dev->cpu_port = i;
                        dev->host_mask = (1 << dev->cpu_port);
@@ -1277,11 +1279,19 @@ static void ksz9477_config_cpu_port(struct dsa_switch *ds)
                        interface = ksz9477_get_interface(dev, i);
                        if (!dev->interface)
                                dev->interface = interface;
-                       if (interface && interface != dev->interface)
-                               dev_info(dev->dev,
-                                        "use %s instead of %s\n",
-                                         phy_modes(dev->interface),
-                                         phy_modes(interface));
+                       if (interface && interface != dev->interface) {
+                               prev_msg = " instead of ";
+                               prev_mode = phy_modes(interface);
+                       } else {
+                               prev_msg = "";
+                               prev_mode = "";
+                       }
+                       dev_info(dev->dev,
+                                "Port%d: using phy mode %s%s%s\n",
+                                i,
+                                phy_modes(dev->interface),
+                                prev_msg,
+                                prev_mode);
 
                        /* enable cpu port */
                        ksz9477_port_setup(dev, i, true);