scsi: ncr53c8xx: Drop CONFIG_ prefix from Zalon-specific compiler defines
PATCH 1/1 scsi: ncr53c8xx: Drop CONFIG_ prefix from Zalon-specific compiler defines
kconfiglint reports:
X001: CONFIG_NCR53C8XX_PREFETCH referenced in Makefile but not
defined in any Kconfig
X001: CONFIG_SCSI_NCR53C8XX_NO_WORD_TRANSFERS referenced in Makefile
but not defined in any Kconfig
The ncr53c8xx SCSI driver uses two preprocessor defines that carry the CONFIG_ prefix but are not defined in any Kconfig file:
-DCONFIG_NCR53C8XX_PREFETCH
-DCONFIG_SCSI_NCR53C8XX_NO_WORD_TRANSFERS
These are hardcoded compiler flags in drivers/scsi/Makefile, passed only when CONFIG_SCSI_ZALON is enabled:
ncr53c8xx-flags-$(CONFIG_SCSI_ZALON) \
:= -DCONFIG_NCR53C8XX_PREFETCH -DSCSI_NCR_BIG_ENDIAN \
-DCONFIG_SCSI_NCR53C8XX_NO_WORD_TRANSFERSThe source files ncr53c8xx.c and ncr53c8xx.h check these defines with #ifdef to enable script prefetching and disable 16-bit word transfers respectively — both specific to the PA-RISC Zalon SCSI controller's big-endian bus requirements.
These defines have been present since the initial git import in commit 1da177e4c3f4 ("Linux-2.6.12-rc2"). They predate the modern Kconfig convention that CONFIG_ prefixed symbols should always originate from Kconfig. The third define on the same line, SCSI_NCR_BIG_ENDIAN, already correctly omits the CONFIG_ prefix.
The CONFIG_ prefix is misleading: these are not user-configurable options and do not appear in any Kconfig menu. They are unconditionally enabled for all Zalon builds. Remove the CONFIG_ prefix from both symbols — renaming them to NCR53C8XX_PREFETCH and SCSI_NCR53C8XX_NO_WORD_TRANSFERS — to match the convention used by SCSI_NCR_BIG_ENDIAN on the same line and to avoid confusion with actual Kconfig-managed symbols.
No functional change.
--- drivers/scsi/Makefile | 4 ++-- drivers/scsi/ncr53c8xx.c | 2 +- drivers/scsi/ncr53c8xx.h | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-)
drivers/scsi/Makefile +2 -2
@@ -177,8 +177,8 @@ sd_mod-$(CONFIG_BLK_DEV_ZONED) += sd_zbc.o sr_mod-objs := sr.o sr_ioctl.o sr_vendor.o ncr53c8xx-flags-$(CONFIG_SCSI_ZALON) \ - := -DCONFIG_NCR53C8XX_PREFETCH -DSCSI_NCR_BIG_ENDIAN \ - -DCONFIG_SCSI_NCR53C8XX_NO_WORD_TRANSFERS + := -DNCR53C8XX_PREFETCH -DSCSI_NCR_BIG_ENDIAN \ + -DSCSI_NCR53C8XX_NO_WORD_TRANSFERS CFLAGS_ncr53c8xx.o := $(ncr53c8xx-flags-y) $(ncr53c8xx-flags-m) zalon7xx-objs := zalon.o ncr53c8xx.o
drivers/scsi/ncr53c8xx.c +1 -1
@@ -1776,7 +1776,7 @@ struct ncb {** return from the subroutine. */ -#ifdef CONFIG_NCR53C8XX_PREFETCH +#ifdef NCR53C8XX_PREFETCH #define PREFETCH_FLUSH_CNT 2#define PREFETCH_FLUSH SCR_CALL, PADDRH (wait_dma),#else
drivers/scsi/ncr53c8xx.h +2 -2
@@ -397,7 +397,7 @@#else -#ifdef CONFIG_SCSI_NCR53C8XX_NO_WORD_TRANSFERS +#ifdef SCSI_NCR53C8XX_NO_WORD_TRANSFERS /* Only 8 or 32 bit transfers allowed */ #define INW_OFF (o) (readb((char __iomem *)np->reg + ncr_offw(o)) << 8 | readb((char __iomem *)np->reg + ncr_offw(o) + 1))#else
@@ -405,7 +405,7 @@#endif #define INL_OFF (o) readl_raw((char __iomem *)np->reg + (o)) -#ifdef CONFIG_SCSI_NCR53C8XX_NO_WORD_TRANSFERS +#ifdef SCSI_NCR53C8XX_NO_WORD_TRANSFERS /* Only 8 or 32 bit transfers allowed */ #define OUTW_OFF (o, val) do { writeb((char)((val) >> 8), (char __iomem *)np->reg + ncr_offw(o)); writeb((char)(val), (char __iomem *)np->reg + ncr_offw(o) + 1); } while (0)#else
Signature · 1 line
2.53.0
Martin K. Petersen
AppliedSasha,
Quoted 6 lines
kconfiglint reports:
X001:
CONFIG_NCR53C8XX_PREFETCHreferenced inMakefilebut not
defined in anyKconfig
X001:CONFIG_SCSI_NCR53C8XX_NO_WORD_TRANSFERSreferenced inMakefile
but not defined in anyKconfig
Applied to 7.2/scsi-staging, thanks!
Signature · 1 line
Martin K. Petersen
Martin K. Petersen
AppliedQuoted 8 lines · Sasha Levin
kconfiglint reports:
X001:
CONFIG_NCR53C8XX_PREFETCHreferenced inMakefilebut not
defined in anyKconfig
X001:CONFIG_SCSI_NCR53C8XX_NO_WORD_TRANSFERSreferenced inMakefile
but not defined in anyKconfig[...]
Applied to 7.2/scsi-queue, thanks!
[1/1] scsi: ncr53c8xx: Drop CONFIG_ prefix from Zalon-specific compiler defines
https://git.kernel.org/mkp/scsi/c/7787588db949
Signature · 1 line
Martin K. Petersen