diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-11-17 15:33:17 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-11-17 15:33:17 +0100 |
| commit | a431c0902c6a9c8ca02fc519c75a487ace5e1682 (patch) | |
| tree | ae6e31f122b018436d7ecda20c10576eb869a31f /0005-ntb-remove-unneeded-DRIVER_LICENSE-defines.patch | |
| parent | b2e3df6421e77c5f5f6248d19160b3d1950d78e8 (diff) | |
| download | patches-a431c0902c6a9c8ca02fc519c75a487ace5e1682.tar.gz | |
some new patches added so I don't loose them.
Diffstat (limited to '0005-ntb-remove-unneeded-DRIVER_LICENSE-defines.patch')
| -rw-r--r-- | 0005-ntb-remove-unneeded-DRIVER_LICENSE-defines.patch | 96 |
1 files changed, 96 insertions, 0 deletions
diff --git a/0005-ntb-remove-unneeded-DRIVER_LICENSE-defines.patch b/0005-ntb-remove-unneeded-DRIVER_LICENSE-defines.patch new file mode 100644 index 00000000000000..10d3d022bc58eb --- /dev/null +++ b/0005-ntb-remove-unneeded-DRIVER_LICENSE-defines.patch @@ -0,0 +1,96 @@ +From efdffdc616a1323db077cdba06a3227f61be517b Mon Sep 17 00:00:00 2001 +From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> +Date: Fri, 17 Nov 2017 15:07:15 +0100 +Subject: [PATCH 5/7] 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. + +Cc: Jon Mason <jdmason@kudzu.us> +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> +Cc: linux-ntb@googlegroups.com +Cc: linux-kernel@vger.kernel.org +Reported-by: Philippe Ombredanne <pombredanne@nexb.com> +Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> +--- + drivers/ntb/ntb.c | 3 +-- + drivers/ntb/test/ntb_perf.c | 3 +-- + drivers/ntb/test/ntb_pingpong.c | 3 +-- + drivers/ntb/test/ntb_tool.c | 3 +-- + 4 files changed, 4 insertions(+), 8 deletions(-) + +--- a/drivers/ntb/ntb.c ++++ b/drivers/ntb/ntb.c +@@ -63,12 +63,11 @@ + #define DRIVER_NAME "ntb" + #define DRIVER_DESCRIPTION "PCIe NTB Driver Framework" + +-#define DRIVER_LICENSE "Dual BSD/GPL" + #define DRIVER_VERSION "1.0" + #define DRIVER_RELDATE "24 March 2015" + #define DRIVER_AUTHOR "Allen Hubbe <Allen.Hubbe@emc.com>" + +-MODULE_LICENSE(DRIVER_LICENSE); ++MODULE_LICENSE("Dual BSD/GPL"); + MODULE_VERSION(DRIVER_VERSION); + MODULE_AUTHOR(DRIVER_AUTHOR); + MODULE_DESCRIPTION(DRIVER_DESCRIPTION); +--- a/drivers/ntb/test/ntb_perf.c ++++ b/drivers/ntb/test/ntb_perf.c +@@ -63,7 +63,6 @@ + #define DRIVER_NAME "ntb_perf" + #define DRIVER_DESCRIPTION "PCIe NTB Performance Measurement Tool" + +-#define DRIVER_LICENSE "Dual BSD/GPL" + #define DRIVER_VERSION "1.0" + #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 PIDX NTB_DEF_PEER_IDX + +-MODULE_LICENSE(DRIVER_LICENSE); ++MODULE_LICENSE("Dual BSD/GPL"); + MODULE_VERSION(DRIVER_VERSION); + MODULE_AUTHOR(DRIVER_AUTHOR); + MODULE_DESCRIPTION(DRIVER_DESCRIPTION); +--- a/drivers/ntb/test/ntb_pingpong.c ++++ b/drivers/ntb/test/ntb_pingpong.c +@@ -68,12 +68,11 @@ + #define DRIVER_NAME "ntb_pingpong" + #define DRIVER_DESCRIPTION "PCIe NTB Simple Pingpong Client" + +-#define DRIVER_LICENSE "Dual BSD/GPL" + #define DRIVER_VERSION "1.0" + #define DRIVER_RELDATE "24 March 2015" + #define DRIVER_AUTHOR "Allen Hubbe <Allen.Hubbe@emc.com>" + +-MODULE_LICENSE(DRIVER_LICENSE); ++MODULE_LICENSE("Dual BSD/GPL"); + MODULE_VERSION(DRIVER_VERSION); + MODULE_AUTHOR(DRIVER_AUTHOR); + MODULE_DESCRIPTION(DRIVER_DESCRIPTION); +--- a/drivers/ntb/test/ntb_tool.c ++++ b/drivers/ntb/test/ntb_tool.c +@@ -109,12 +109,11 @@ + #define DRIVER_NAME "ntb_tool" + #define DRIVER_DESCRIPTION "PCIe NTB Debugging Tool" + +-#define DRIVER_LICENSE "Dual BSD/GPL" + #define DRIVER_VERSION "1.0" + #define DRIVER_RELDATE "22 April 2015" + #define DRIVER_AUTHOR "Allen Hubbe <Allen.Hubbe@emc.com>" + +-MODULE_LICENSE(DRIVER_LICENSE); ++MODULE_LICENSE("Dual BSD/GPL"); + MODULE_VERSION(DRIVER_VERSION); + MODULE_AUTHOR(DRIVER_AUTHOR); + MODULE_DESCRIPTION(DRIVER_DESCRIPTION); |