Commit 0eeec014 authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Martin K. Petersen

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: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 5b394b2d
...@@ -63,8 +63,7 @@ static int raid_match(struct attribute_container *cont, struct device *dev) ...@@ -63,8 +63,7 @@ static int raid_match(struct attribute_container *cont, struct device *dev)
* emulated RAID devices, so start with SCSI */ * emulated RAID devices, so start with SCSI */
struct raid_internal *i = ac_to_raid_internal(cont); struct raid_internal *i = ac_to_raid_internal(cont);
#if defined(CONFIG_SCSI) || defined(CONFIG_SCSI_MODULE) if (IS_ENABLED(CONFIG_SCSI) && scsi_is_sdev_device(dev)) {
if (scsi_is_sdev_device(dev)) {
struct scsi_device *sdev = to_scsi_device(dev); struct scsi_device *sdev = to_scsi_device(dev);
if (i->f->cookie != sdev->host->hostt) if (i->f->cookie != sdev->host->hostt)
...@@ -72,7 +71,6 @@ static int raid_match(struct attribute_container *cont, struct device *dev) ...@@ -72,7 +71,6 @@ static int raid_match(struct attribute_container *cont, struct device *dev)
return i->f->is_raid(dev); return i->f->is_raid(dev);
} }
#endif
/* FIXME: look at other subsystems too */ /* FIXME: look at other subsystems too */
return 0; return 0;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment