ldmvsw: update and simplify version string

New version and simplify the print code.

Orabug: 23293104

Signed-off-by: Shannon Nelson <shannon.nelson@oracle.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
(cherry picked from commit 7602011f59cc32ebc3a5f9058d6ba11b096c8c50)
Signed-off-by: Allen Pais <allen.pais@oracle.com>

diff --git a/drivers/net/ethernet/sun/ldmvsw.c b/drivers/net/ethernet/sun/ldmvsw.c
index bf5818a9e29930a5cf141d3bfe75e9e88b8a98dd..cd359c282ddc554495dbd5ba5519a9a6cdb7b343 100644 (file)
--- a/drivers/net/ethernet/sun/ldmvsw.c
+++ b/drivers/net/ethernet/sun/ldmvsw.c
@@ -42,11 +42,11 @@
 static u8 vsw_port_hwaddr[ETH_ALEN] = {0xFE, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF};
 
 #define DRV_MODULE_NAME                "ldmvsw"
-#define DRV_MODULE_VERSION     "1.0"
-#define DRV_MODULE_RELDATE     "Jan 15, 2016"
+#define DRV_MODULE_VERSION     "1.1"
+#define DRV_MODULE_RELDATE     "February 3, 2017"
 
 static char version[] =
-       DRV_MODULE_NAME ".c:v" DRV_MODULE_VERSION " (" DRV_MODULE_RELDATE ")\n";
+       DRV_MODULE_NAME " " DRV_MODULE_VERSION " (" DRV_MODULE_RELDATE ")";
 MODULE_AUTHOR("Oracle");
 MODULE_DESCRIPTION("Sun4v LDOM Virtual Switch Driver");
 MODULE_LICENSE("GPL");
@@ -257,11 +257,6 @@ static struct vio_driver_ops vsw_vio_ops = {
        .handshake_complete     = sunvnet_handshake_complete_common,
 };
 
-static void print_version(void)
-{
-       printk_once(KERN_INFO "%s", version);
-}
-
 static const char *remote_macaddr_prop = "remote-mac-address";
 static const char *id_prop = "id";
 
@@ -278,8 +273,6 @@ static int vsw_port_probe(struct vio_dev *vdev, const struct vio_device_id *id)
        u64 handle;
        u64 node;
 
-       print_version();
-
        hp = mdesc_grab();
 
        node = vio_vdev_node(hp, vdev);
@@ -464,6 +457,7 @@ static struct vio_driver vsw_port_driver = {
 
 static int __init vsw_init(void)
 {
+       pr_info("%s\n", version);
        return vio_register_driver(&vsw_port_driver);
 }