[PATCH] via-velocity: Add missing KERN_ where needed

[Joe Perches]

Link status is emitted on multiple lines as it does not use
KERN_CONT.

Coalesce the multi-part logging into a single line output and
add missing KERN_<LEVEL> to a couple logging calls.

This also reduces object size.

Signed-off-by: Joe Perches <j...@perches.com>
---
 drivers/net/ethernet/via/via-velocity.c | 46 ++++++++++++++++++++++-----------
 1 file changed, 31 insertions(+), 15 deletions(-)

diff --git a/drivers/net/ethernet/via/via-velocity.c 
b/drivers/net/ethernet/via/via-velocity.c
index 713dbc04b25b..84d456464b88 100644
--- a/drivers/net/ethernet/via/via-velocity.c
+++ b/drivers/net/ethernet/via/via-velocity.c
@@ -927,12 +927,12 @@ static int velocity_set_media_mode(struct velocity_info 
*vptr, u32 mii_status)
                if (mii_status & VELOCITY_DUPLEX_FULL) {
                        CHIPGCR |= CHIPGCR_FCFDX;
                        writeb(CHIPGCR, &regs->CHIPGCR);
-                       VELOCITY_PRT(MSG_LEVEL_INFO, "set Velocity to forced 
full mode\n");
+                       VELOCITY_PRT(MSG_LEVEL_INFO, KERN_INFO "set Velocity to 
forced full mode\n");
                        if (vptr->rev_id < REV_ID_VT3216_A0)
                                BYTE_REG_BITS_OFF(TCR_TB2BDIS, &regs->TCR);
                } else {
                        CHIPGCR &= ~CHIPGCR_FCFDX;
-                       VELOCITY_PRT(MSG_LEVEL_INFO, "set Velocity to forced 
half mode\n");
+                       VELOCITY_PRT(MSG_LEVEL_INFO, KERN_INFO "set Velocity to 
forced half mode\n");
                        writeb(CHIPGCR, &regs->CHIPGCR);
                        if (vptr->rev_id < REV_ID_VT3216_A0)
                                BYTE_REG_BITS_ON(TCR_TB2BDIS, &regs->TCR);
@@ -985,45 +985,61 @@ static int velocity_set_media_mode(struct velocity_info 
*vptr, u32 mii_status)
  */
 static void velocity_print_link_status(struct velocity_info *vptr)
 {
+       const char *link;
+       const char *speed;
+       const char *duplex;
 
        if (vptr->mii_status & VELOCITY_LINK_FAIL) {
                VELOCITY_PRT(MSG_LEVEL_INFO, KERN_NOTICE "%s: failed to detect 
cable link\n", vptr->netdev->name);
-       } else if (vptr->options.spd_dpx == SPD_DPX_AUTO) {
-               VELOCITY_PRT(MSG_LEVEL_INFO, KERN_NOTICE "%s: Link 
auto-negotiation", vptr->netdev->name);
+               return;
+       }
+
+       if (vptr->options.spd_dpx == SPD_DPX_AUTO) {
+               link = "auto-negotiation";
 
                if (vptr->mii_status & VELOCITY_SPEED_1000)
-                       VELOCITY_PRT(MSG_LEVEL_INFO, " speed 1000M bps");
+                       speed = "1000";
                else if (vptr->mii_status & VELOCITY_SPEED_100)
-                       VELOCITY_PRT(MSG_LEVEL_INFO, " speed 100M bps");
+                       speed = "100";
                else
-                       VELOCITY_PRT(MSG_LEVEL_INFO, " speed 10M bps");
+                       speed = "10";
 
                if (vptr->mii_status & VELOCITY_DUPLEX_FULL)
-                       VELOCITY_PRT(MSG_LEVEL_INFO, " full duplex\n");
+                       duplex = "full";
                else
-                       VELOCITY_PRT(MSG_LEVEL_INFO, " half duplex\n");
+                       duplex = "half";
        } else {
-               VELOCITY_PRT(MSG_LEVEL_INFO, KERN_NOTICE "%s: Link forced", 
vptr->netdev->name);
+               link = "forced";
+
                switch (vptr->options.spd_dpx) {
                case SPD_DPX_1000_FULL:
-                       VELOCITY_PRT(MSG_LEVEL_INFO, " speed 1000M bps full 
duplex\n");
+                       speed = "1000";
+                       duplex = "full";
                        break;
                case SPD_DPX_100_HALF:
-                       VELOCITY_PRT(MSG_LEVEL_INFO, " speed 100M bps half 
duplex\n");
+                       speed = "100";
+                       duplex = "half";
                        break;
                case SPD_DPX_100_FULL:
-                       VELOCITY_PRT(MSG_LEVEL_INFO, " speed 100M bps full 
duplex\n");
+                       speed = "100";
+                       duplex = "full";
                        break;
                case SPD_DPX_10_HALF:
-                       VELOCITY_PRT(MSG_LEVEL_INFO, " speed 10M bps half 
duplex\n");
+                       speed = "10";
+                       duplex = "half";
                        break;
                case SPD_DPX_10_FULL:
-                       VELOCITY_PRT(MSG_LEVEL_INFO, " speed 10M bps full 
duplex\n");
+                       speed = "10";
+                       duplex = "full";
                        break;
                default:
+                       speed = "unknown";
+                       duplex = "unknown";
                        break;
                }
        }
+       VELOCITY_PRT(MSG_LEVEL_INFO, KERN_NOTICE "%s: Link %s speed %sM bps %s 
duplex\n",
+                    vptr->netdev->name, link, speed, duplex);
 }
 
 /**