Skip to contentSkip to conversation

scsi: nsp_cs: MODULE_LICENSE clean up and compile test

PATCH Applied Johan Hovold 2 participants 4 messages Nov 5, 2019 – Nov 13, 2019

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

cover scsi: nsp_cs: MODULE_LICENSE clean up and compile test

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(-)
Signature · 1 line
2.23.0
#1 lore raw

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

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

---
 drivers/scsi/pcmcia/nsp_cs.c | 2 --
 1 file changed, 2 deletions(-)
drivers/scsi/pcmcia/nsp_cs.c +0 -2
index 97416e1dcc5b..93616f9fd6d7 100644
@@ -56,9 +56,7 @@
 MODULE_AUTHOR("YOKOTA Hiroshi <[email protected]>");
 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"
 
Signature · 1 line
2.23.0
#2 lore raw

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

In reply to Johan Hovold

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

---
 drivers/scsi/pcmcia/Kconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/scsi/pcmcia/Kconfig +1 -1
index 2368f34efba3..dc9b74c9348a 100644
@@ -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
Signature · 1 line
2.23.0
#3 lore raw
In reply to Johan Hovold

Johan,

Quoted 2 lines

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!

Signature · 1 line
Martin K. Petersen	Oracle Linux Engineering