2017-11-17 22:11:42

by Greg Kroah-Hartman

Subject: [PATCH] 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(-)

diff --git a/drivers/scsi/csiostor/csio_init.c b/drivers/scsi/csiostor/csio_init.c
index 28a9c7d706cb..abd71379bce3 100644
--- a/drivers/scsi/csiostor/csio_init.c
+++ b/drivers/scsi/csiostor/csio_init.c
@@ -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);
diff --git a/drivers/scsi/csiostor/csio_init.h b/drivers/scsi/csiostor/csio_init.h
index 96b31e5af91e..20244254325a 100644
--- a/drivers/scsi/csiostor/csio_init.h
+++ b/drivers/scsi/csiostor/csio_init.h
@@ -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"

--
2.15.0


From 1584342442584787748@xxx Fri Nov 17 19:24:55 +0000 2017
X-GM-THRID: 1584342442584787748
X-Gmail-Labels: Inbox,Category Forums,HistoricalUnread

2017-11-17 19:24:55

by Philippe Ombredanne

Subject: Re: [PATCH] scsi: csiostor: remove unneeded DRIVER_LICENSE #define

On Fri, Nov 17, 2017 at 3:21 PM, Greg Kroah-Hartman
<[email protected]> wrote:
> 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]>


Reviewed-by: Philippe Ombredanne <[email protected]>
--
Cordially
Philippe Ombredanne

From 1586845945661907294@xxx Fri Dec 15 10:37:02 +0000 2017
X-GM-THRID: 1585248980844207749
X-Gmail-Labels: Inbox,Category Forums