diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2018-12-14 23:10:07 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-12-19 19:19:49 +0100 |
| commit | cda8e63c89d7eca14910638f945f5469500f1f82 (patch) | |
| tree | e673facd261d7274b3c4497af6095b0467291a53 /drivers/scsi/raid_class.c | |
| parent | dc5350715915eb08f73fa616f948b583a088d27c (diff) | |
| download | linux-stable-cda8e63c89d7eca14910638f945f5469500f1f82.tar.gz linux-stable-cda8e63c89d7eca14910638f945f5469500f1f82.tar.bz2 linux-stable-cda8e63c89d7eca14910638f945f5469500f1f82.zip | |
scsi: raid_attrs: fix unused variable warning
Commit 0eeec01488da9b1403c8c29e73eacac8af9e4bf2 upstream.
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>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'drivers/scsi/raid_class.c')
| -rw-r--r-- | drivers/scsi/raid_class.c | 4 |
1 files changed, 1 insertions, 3 deletions
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; } |