[PATCH 0/2] scsi: nsp_cs: MODULE_LICENSE clean up and compile test

[PATCH 0/2] scsi: nsp_cs: MODULE_LICENSE clean up and compile test

[Johan Hovold]

We had two drivers in the tree needlessly checking whether
MODULE_LICENSE was defined, this fixes the second one.

In order to compile test this on a 64-bit machine I added COMPILE_TEST
to the current !64BIT dependency.

Johan


Johan Hovold (2):
  scsi: nsp_cs: drop redundant MODULE_LICENSE ifdef
  scsi: nsp_cs: enable compile-testing on 64-bit

 drivers/scsi/pcmcia/Kconfig  | 2 +-
 drivers/scsi/pcmcia/nsp_cs.c | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

-- 
2.23.0

[PATCH 1/2] scsi: nsp_cs: drop redundant MODULE_LICENSE ifdef

[Johan Hovold]

The MODULE_LICENSE macro is unconditionally defined in module.h, no need
to ifdef its use.

Signed-off-by: Johan Hovold <johan@kernel.org>
---
 drivers/scsi/pcmcia/nsp_cs.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/drivers/scsi/pcmcia/nsp_cs.c b/drivers/scsi/pcmcia/nsp_cs.c
index 97416e1dcc5b..93616f9fd6d7 100644
--- a/drivers/scsi/pcmcia/nsp_cs.c
+++ b/drivers/scsi/pcmcia/nsp_cs.c
@@ -56,9 +56,7 @@
 MODULE_AUTHOR("YOKOTA Hiroshi <yokota@netlab.is.tsukuba.ac.jp>");
 MODULE_DESCRIPTION("WorkBit NinjaSCSI-3 / NinjaSCSI-32Bi(16bit) PCMCIA SCSI host adapter module");
 MODULE_SUPPORTED_DEVICE("sd,sr,sg,st");
-#ifdef MODULE_LICENSE
 MODULE_LICENSE("GPL");
-#endif
 
 #include "nsp_io.h"
 
-- 
2.23.0

[PATCH 2/2] scsi: nsp_cs: enable compile-testing on 64-bit

[Johan Hovold]

For some reason this driver depends on !64BIT, but it can still be
useful to allow compile-testing on 64-bit machines.

Signed-off-by: Johan Hovold <johan@kernel.org>
---
 drivers/scsi/pcmcia/Kconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/scsi/pcmcia/Kconfig b/drivers/scsi/pcmcia/Kconfig
index 2368f34efba3..dc9b74c9348a 100644
--- a/drivers/scsi/pcmcia/Kconfig
+++ b/drivers/scsi/pcmcia/Kconfig
@@ -32,7 +32,7 @@ config PCMCIA_FDOMAIN
 
 config PCMCIA_NINJA_SCSI
 	tristate "NinjaSCSI-3 / NinjaSCSI-32Bi (16bit) PCMCIA support"
-	depends on !64BIT
+	depends on !64BIT || COMPILE_TEST
 	help
 	  If you intend to attach this type of PCMCIA SCSI host adapter to
 	  your computer, say Y here and read
-- 
2.23.0

Re: [PATCH 0/2] scsi: nsp_cs: MODULE_LICENSE clean up and compile test

[Martin K. Petersen]

Johan,

> We had two drivers in the tree needlessly checking whether
> MODULE_LICENSE was defined, this fixes the second one.

Applied to 5.5/scsi-queue, thanks!

-- 
Martin K. Petersen	Oracle Linux Engineering