Commit 0eeec014 authored Aug 14, 2018 by Arnd Bergmann Committed by Martin K. Petersen Aug 30, 2018

scsi: raid_attrs: fix unused variable warning



I ran into a new warning on randconfig kernels:

drivers/scsi/raid_class.c: In function 'raid_match':
drivers/scsi/raid_class.c:64:24: error: unused variable 'i' [-Werror=unused-variable]

This looks like a very old problem that for some reason was very hard to
run into, but it is very easy to fix, by replacing the incorrect #ifdef
with a simpler IS_ENABLED() check.

Fixes: fac829fd ("[SCSI] raid_attrs: fix dependency problems")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

parent 5b394b2d

drivers/scsi/raid_class.c

+1 −3

Original line number	Diff line number	Diff line
		@@ -63,8 +63,7 @@ static int raid_match(struct attribute_container cont, struct device dev)
		* emulated RAID devices, so start with SCSI */
		struct raid_internal *i = ac_to_raid_internal(cont);

		#if defined(CONFIG_SCSI) \|\| defined(CONFIG_SCSI_MODULE)
		if (scsi_is_sdev_device(dev)) {
		if (IS_ENABLED(CONFIG_SCSI) && scsi_is_sdev_device(dev)) {
		struct scsi_device *sdev = to_scsi_device(dev);

		if (i->f->cookie != sdev->host->hostt)
		@@ -72,7 +71,6 @@ static int raid_match(struct attribute_container cont, struct device dev)

		return i->f->is_raid(dev);
		}
		#endif
		/* FIXME: look at other subsystems too */
		return 0;
		}

Admin message