From patchwork Fri Dec 14 22:10:07 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 153906 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp2596267ljp; Fri, 14 Dec 2018 14:11:47 -0800 (PST) X-Google-Smtp-Source: AFSGD/Uz00npykwj0Y8gaTN4BlCkLjO7iBUKksMuNEHtM2hcZZcNDAA+9MVts+eEjqsC878ILgDg X-Received: by 2002:a63:f74f:: with SMTP id f15mr4286499pgk.190.1544825506945; Fri, 14 Dec 2018 14:11:46 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1544825506; cv=none; d=google.com; s=arc-20160816; b=O2ro4tI1ppq1Dlo1sXYL716G9nXWwPaLBGCrRliL2N6Fh4Aj7ThEBkVLcECc60zWxN +jSCe6QA+aKaTSJyXUSgdSDTnsWx4emvClCk4JqGWiagv+ArJyb2dcGDNQGMEGHk1G72 KoKahJJ/PczQUyXAzIOo3HhIhgL/9yDvCdiy4qIAkULlIVEOfK8BeUZ52ner5g1j365a AXbe8wLM4f5di9XpSB36QcpLbt8UGHr6PcuT01muapL9sA3qo1CUZYSGBTv0qnggkceM qSZl1gVummJe8M3QHGLltP5CRcerYTym6mwPiDcxaznVHvkoFpUrho2eBMU4R3JE4G6z eKSg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=2s048n0KLKaZLbPSgLnz88wBZoGLG76fW+lQa/4J43U=; b=AB3ejzcdHM1atNMcLzAA1N00bU1CUAVgt+K//08hm/JWV8IfcPGXMKR37PSAm6nDcc HRo8o5126PwTjIlNL3apgbMRr5gGA+TuXEgmM7BwYbZd+98cdL5w4vbL/v67hEXgCXX9 69sOVwImnm3alOme3Lu9EqMhkIQplIn16hwOqq5BxqWAqgYxS/PuxtRLX4OetX+0LR8D ZF+Th95P4GzWG8RsAo3c+m2iFDuRBc5pmspLFdDldgF2p5ZRgK8xsoTSuM5xw26SVnyH AqSlFk9wtBE0A8vptnuK5iosjMSkWwEt25zTDNCfwBsCjF4gxinGJKX5FkVavn3H8hBk q8Yw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id d8si4859532pgl.386.2018.12.14.14.11.46; Fri, 14 Dec 2018 14:11:46 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730987AbeLNWLh (ORCPT + 15 others); Fri, 14 Dec 2018 17:11:37 -0500 Received: from mout.kundenserver.de ([212.227.126.134]:49217 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730909AbeLNWLh (ORCPT ); Fri, 14 Dec 2018 17:11:37 -0500 Received: from wuerfel.lan ([109.192.41.194]) by mrelayeu.kundenserver.de (mreue011 [212.227.15.129]) with ESMTPA (Nemesis) id 1M9nhF-1gSj920Den-005rZg; Fri, 14 Dec 2018 23:11:29 +0100 From: Arnd Bergmann To: Greg Kroah-Hartman Cc: stable@vger.kernel.org, Arnd Bergmann , "Martin K . Petersen" , "James E.J. Bottomley" , linux-scsi@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 2/7] scsi: raid_attrs: fix unused variable warning Date: Fri, 14 Dec 2018 23:10:07 +0100 Message-Id: <20181214221023.3878670-3-arnd@arndb.de> X-Mailer: git-send-email 2.20.0 In-Reply-To: <20181214221023.3878670-1-arnd@arndb.de> References: <20181214221023.3878670-1-arnd@arndb.de> MIME-Version: 1.0 X-Provags-ID: V03:K1:WD/yj5Ry9KafPGHVw9edfVP0752pVKVw0uXAKK5BxXcrQDej+Uc mH3rUo7bMb2CKYrIxPnuIHlgiZMl9KSp1h5y8SeUhaECGrDYSyItPRvRbRlsh4p4MruhZZj RDkdtFpQzz3tXSdWUvm0pM9mYlKoSrUrIW+NEtKiw5u5xOzBmojQ5dYMbKk6iZ1Ci4/DUvy cqaK8Un+A1sjX6MYdTisw== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1; V03:K0:X780U6YvOBM=:iIMrWABabKU5tg+LtoWDjT vKjL6EWAOgNwgMWj7M7CUndT4xirt8nkXay/8LiR+CN5aTgLt7SmuAuojmDmWPIi1FOjDM+FS KULiLFZqnZLCufJkoQKVp40r3H+vyRccpPnj9NZrxSVpaH25kfSzTZZCvHQ4YshuanvMmklhL SwppLpdJcCS2k+KkJ4Om4jUNqjYIy2ZBFEwU6RPm2FC6oap8Z3uzW529Pvfaw4f2oXbnXwCLD eVKINt8jqd/RqwK9U+80V8IUvZwoY1wsgRs0gGBU8pw/j39Ld/tsYJTRSx+dNEtcrl+XIZQx3 kvuPLElxJJSNXseBvSu9lK+kFRFr7PXtmpiFCGYku+FBruifhKuuRkBqVaYrcLVDdK8yFRBeB Ypw9bxdG6uv8l3l7o2YAheVypSlDC8z1NM6Mt/XUxc3m57hQby9a2tjG3KElP8KdxM1TY1vwG 7zW21DUysg8cF/n4Py8k6A5hjGm2V9EfKWBGv0ok+Kwisq9kO/WKBy4MixwIZSkaIAUifox6Z vSv9JmMZdfz6JeGT96R/JrSfUmVZsbNnNttVTfoU/WUKXWswkJAd3pkssPy5mvSg+g5beACt0 E4get/uJCtLpWrWW8tRFl9IcQV8fs1jAq2IAPazdt3beTPsZJX7a5T1shgqT47EjtuVLEVuUX OV2pOCZMFrnyAQtpLWCA9eswg9MUP5WnUCJ6h5CgZO1UXOS4y3VWapdkDcjPg8MZbS30REC6X 3tELOeU7TiVIWNf+/pUTSoxQsrF11tr6fwMTeA== Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org 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 Signed-off-by: Martin K. Petersen --- drivers/scsi/raid_class.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) -- 2.20.0 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; }