Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7602011f authored by Shannon Nelson's avatar Shannon Nelson Committed by David S. Miller
Browse files

ldmvsw: update and simplify version string 



New version and simplify the print code.

Signed-off-by: default avatarShannon Nelson <shannon.nelson@oracle.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent daa86e50

drivers/net/ethernet/sun/ldmvsw.c

+4 −10
Original line number Diff line number Diff line
@@ -41,11 +41,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");
@@ -259,11 +259,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";
@@ -279,8 +274,6 @@ static int vsw_port_probe(struct vio_dev *vdev, const struct vio_device_id *id) 
	const u64 *port_id;

	u64 handle;



	print_version();



	hp = mdesc_grab();



	rmac = mdesc_get_property(hp, vdev->mp, remote_macaddr_prop, &len);
@@ -457,6 +450,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);

}