Commit 0ed08f82 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman Committed by Jon Mason
Browse files

ntb: remove unneeded DRIVER_LICENSE #defines 



There is no need to #define the license of the driver, just put it in
the MODULE_LICENSE() line directly as a text string.

This allows tools that check that the module license matches the source
code license to work properly, as there is no need to unwind the
unneeded dereference, especially when the string is defined just a few
lines above the usage of it.

Reported-and-reviewed-by: default avatarPhilippe Ombredanne <pombredanne@nexb.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Dave Jiang <dave.jiang@intel.com>
Cc: Allen Hubbe <Allen.Hubbe@emc.com>
Cc: Gary R Hook <gary.hook@amd.com>
Cc: Serge Semin <fancer.lancer@gmail.com>
Signed-off-by: default avatarJon Mason <jdmason@kudzu.us>
parent 140eb522

drivers/ntb/ntb.c

+1 −2
Original line number Original line Diff line number Diff line
@@ -63,12 +63,11 @@ 
#define DRIVER_NAME			"ntb"

#define DRIVER_NAME			"ntb"

#define DRIVER_DESCRIPTION		"PCIe NTB Driver Framework"

#define DRIVER_DESCRIPTION		"PCIe NTB Driver Framework"





#define DRIVER_LICENSE			"Dual BSD/GPL"

#define DRIVER_VERSION			"1.0"

#define DRIVER_VERSION			"1.0"

#define DRIVER_RELDATE			"24 March 2015"

#define DRIVER_RELDATE			"24 March 2015"

#define DRIVER_AUTHOR			"Allen Hubbe <Allen.Hubbe@emc.com>"

#define DRIVER_AUTHOR			"Allen Hubbe <Allen.Hubbe@emc.com>"





MODULE_LICENSE(DRIVER_LICENSE);

MODULE_LICENSE("Dual BSD/GPL");

MODULE_VERSION(DRIVER_VERSION);

MODULE_VERSION(DRIVER_VERSION);

MODULE_AUTHOR(DRIVER_AUTHOR);

MODULE_AUTHOR(DRIVER_AUTHOR);

MODULE_DESCRIPTION(DRIVER_DESCRIPTION);

MODULE_DESCRIPTION(DRIVER_DESCRIPTION);

drivers/ntb/test/ntb_perf.c

+1 −2
Original line number Original line Diff line number Diff line
@@ -63,7 +63,6 @@ 
#define DRIVER_NAME		"ntb_perf"

#define DRIVER_NAME		"ntb_perf"

#define DRIVER_DESCRIPTION	"PCIe NTB Performance Measurement Tool"

#define DRIVER_DESCRIPTION	"PCIe NTB Performance Measurement Tool"





#define DRIVER_LICENSE		"Dual BSD/GPL"

#define DRIVER_VERSION		"1.0"

#define DRIVER_VERSION		"1.0"

#define DRIVER_AUTHOR		"Dave Jiang <dave.jiang@intel.com>"

#define DRIVER_AUTHOR		"Dave Jiang <dave.jiang@intel.com>"
@@ -78,7 +77,7 @@ 
#define MAX_SEG_ORDER		20 /* no larger than 1M for kmalloc buffer */

#define MAX_SEG_ORDER		20 /* no larger than 1M for kmalloc buffer */

#define PIDX			NTB_DEF_PEER_IDX

#define PIDX			NTB_DEF_PEER_IDX





MODULE_LICENSE(DRIVER_LICENSE);

MODULE_LICENSE("Dual BSD/GPL");

MODULE_VERSION(DRIVER_VERSION);

MODULE_VERSION(DRIVER_VERSION);

MODULE_AUTHOR(DRIVER_AUTHOR);

MODULE_AUTHOR(DRIVER_AUTHOR);

MODULE_DESCRIPTION(DRIVER_DESCRIPTION);

MODULE_DESCRIPTION(DRIVER_DESCRIPTION);

drivers/ntb/test/ntb_pingpong.c

+1 −2
Original line number Original line Diff line number Diff line
@@ -68,12 +68,11 @@ 
#define DRIVER_NAME			"ntb_pingpong"

#define DRIVER_NAME			"ntb_pingpong"

#define DRIVER_DESCRIPTION		"PCIe NTB Simple Pingpong Client"

#define DRIVER_DESCRIPTION		"PCIe NTB Simple Pingpong Client"





#define DRIVER_LICENSE			"Dual BSD/GPL"

#define DRIVER_VERSION			"1.0"

#define DRIVER_VERSION			"1.0"

#define DRIVER_RELDATE			"24 March 2015"

#define DRIVER_RELDATE			"24 March 2015"

#define DRIVER_AUTHOR			"Allen Hubbe <Allen.Hubbe@emc.com>"

#define DRIVER_AUTHOR			"Allen Hubbe <Allen.Hubbe@emc.com>"





MODULE_LICENSE(DRIVER_LICENSE);

MODULE_LICENSE("Dual BSD/GPL");

MODULE_VERSION(DRIVER_VERSION);

MODULE_VERSION(DRIVER_VERSION);

MODULE_AUTHOR(DRIVER_AUTHOR);

MODULE_AUTHOR(DRIVER_AUTHOR);

MODULE_DESCRIPTION(DRIVER_DESCRIPTION);

MODULE_DESCRIPTION(DRIVER_DESCRIPTION);

drivers/ntb/test/ntb_tool.c

+1 −2
Original line number Original line Diff line number Diff line
@@ -109,12 +109,11 @@ 
#define DRIVER_NAME			"ntb_tool"

#define DRIVER_NAME			"ntb_tool"

#define DRIVER_DESCRIPTION		"PCIe NTB Debugging Tool"

#define DRIVER_DESCRIPTION		"PCIe NTB Debugging Tool"





#define DRIVER_LICENSE			"Dual BSD/GPL"

#define DRIVER_VERSION			"1.0"

#define DRIVER_VERSION			"1.0"

#define DRIVER_RELDATE			"22 April 2015"

#define DRIVER_RELDATE			"22 April 2015"

#define DRIVER_AUTHOR			"Allen Hubbe <Allen.Hubbe@emc.com>"

#define DRIVER_AUTHOR			"Allen Hubbe <Allen.Hubbe@emc.com>"





MODULE_LICENSE(DRIVER_LICENSE);

MODULE_LICENSE("Dual BSD/GPL");

MODULE_VERSION(DRIVER_VERSION);

MODULE_VERSION(DRIVER_VERSION);

MODULE_AUTHOR(DRIVER_AUTHOR);

MODULE_AUTHOR(DRIVER_AUTHOR);

MODULE_DESCRIPTION(DRIVER_DESCRIPTION);

MODULE_DESCRIPTION(DRIVER_DESCRIPTION);

CRA Git | Maintained and supported by SUSTech CRA and CCSE