scsi: raid_attrs: fix unused variable warning

Message ID 20180813222716.757523-1-arnd@arndb.de
State New
Headers show
Series
  • scsi: raid_attrs: fix unused variable warning
Related show

Commit Message

Arnd Bergmann Aug. 13, 2018, 10:27 p.m.
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: fac829fdcaf4 ("[SCSI] raid_attrs: fix dependency problems")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>

---
 drivers/scsi/raid_class.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

-- 
2.18.0

Comments

Martin K. Petersen Aug. 30, 2018, 11:23 a.m. | #1
Arnd,

> 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.


Applied to 4.20/scsi-queue. Thanks!

-- 
Martin K. Petersen	Oracle Linux Engineering

Patch

diff --git a/drivers/scsi/raid_class.c b/drivers/scsi/raid_class.c
index ea88906d2cc5..5c3d6e1e0145 100644
--- a/drivers/scsi/raid_class.c
+++ b/drivers/scsi/raid_class.c
@@ -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;
 }