lkml.org 
[lkml]   [2017]   [Feb]   [3]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH net-next 8/9] ldmvsw: update and simplify version string
    Date
    New version and simplify the print code.

    Signed-off-by: Shannon Nelson <shannon.nelson@oracle.com>
    ---
    drivers/net/ethernet/sun/ldmvsw.c | 14 ++++----------
    1 files changed, 4 insertions(+), 10 deletions(-)

    diff --git a/drivers/net/ethernet/sun/ldmvsw.c b/drivers/net/ethernet/sun/ldmvsw.c
    index 7c5dab4..552c0a9 100644
    --- 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");
    @@ -320,11 +320,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";

    @@ -341,8 +336,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);
    @@ -527,6 +520,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);
    }

    --
    1.7.1
    \
     
     \ /
      Last update: 2017-02-03 18:45    [W:3.061 / U:0.296 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site