Skip to contentSkip to conversation

scsi: csiostor: remove unneeded DRIVER_LICENSE #define

PATCH Applied Greg Kroah-Hartman 3 participants 3 messages Nov 17, 2017 – Nov 21, 2017 SCSI

lore
Share & tools
lore

Greg Kroah-Hartman

author
#0 lore raw

PATCH 1/1 scsi: csiostor: remove unneeded DRIVER_LICENSE #define

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 in a .h file far away from the .c file it is used in.

Cc "James E.J. Bottomley" <[email protected]>
Cc "Martin K. Petersen" <[email protected]>
Cc Varun Prakash <[email protected]>
Reported-by Philippe Ombredanne <[email protected]>
Signed-off-by Greg Kroah-Hartman <[email protected]>
---
 drivers/scsi/csiostor/csio_init.c | 2 +-
 drivers/scsi/csiostor/csio_init.h | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)
drivers/scsi/csiostor/csio_init.c +1 -1
index 28a9c7d706cb..abd71379bce3 100644
@@ -1255,7 +1255,7 @@ module_init(csio_init);
 module_exit(csio_exit);
 MODULE_AUTHOR(CSIO_DRV_AUTHOR);
 MODULE_DESCRIPTION(CSIO_DRV_DESC);
-MODULE_LICENSE(CSIO_DRV_LICENSE);
+MODULE_LICENSE("Dual BSD/GPL");
 MODULE_DEVICE_TABLE(pci, csio_pci_tbl);
 MODULE_VERSION(CSIO_DRV_VERSION);
 MODULE_FIRMWARE(FW_FNAME_T5);
drivers/scsi/csiostor/csio_init.h +0 -1
index 96b31e5af91e..20244254325a 100644
@@ -48,7 +48,6 @@
 #include "csio_hw.h"
 
 #define CSIO_DRV_AUTHOR			"Chelsio Communications"
-#define CSIO_DRV_LICENSE		"Dual BSD/GPL"
 #define CSIO_DRV_DESC			"Chelsio FCoE driver"
 #define CSIO_DRV_VERSION		"1.0.0-ko"
Signature · 1 line
2.15.0
Reviewed-by on v1 1/1
#1 lore raw
Quoted 8 lines · Greg Kroah-Hartman

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 in a .h file far away from the .c file it is used in.

Quoted 5 lines
Cc "James E.J. Bottomley" <[email protected]>
Cc "Martin K. Petersen" <[email protected]>
Cc Varun Prakash <[email protected]>
Reported-by Philippe Ombredanne <[email protected]>
Signed-off-by Greg Kroah-Hartman <[email protected]>
Reviewed-by Philippe Ombredanne <[email protected]>
Signature · 2 lines
Cordially
Philippe Ombredanne
Applied
#2 lore raw
In reply to Greg Kroah-Hartman

Greg,

Quoted 7 lines

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 in a .h file far away from the .c file it is used in.

Applied to 4.16/scsi-queue, thanks!

Signature · 1 line
Martin K. Petersen	Oracle Linux Engineering