From patchwork Mon Mar 20 13:16:33 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Andy Shevchenko X-Patchwork-Id: 72154 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:604a:0:0:0:0:0 with SMTP id j10csp1215740wrt; Mon, 20 Mar 2023 06:27:50 -0700 (PDT) X-Google-Smtp-Source: AK7set+Kg42IMto9ZaoUX8A3fg6tkw36aA9mZihcyVJs8NGiFm9V0CY+aailcEXV8/RD/pFxAnHg X-Received: by 2002:a17:90b:1b01:b0:23f:3f9c:7878 with SMTP id nu1-20020a17090b1b0100b0023f3f9c7878mr15291681pjb.2.1679318870102; Mon, 20 Mar 2023 06:27:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1679318870; cv=none; d=google.com; s=arc-20160816; b=m76hzWyZjrecpErHOw6Ix0hnbPpi3y2u5UQeA1X7DnCk8t11pVhkDNMkHbEM5snc/k buEIOmI0hbzKfuL1d3LwfqTizYOZ0VDNb1tm1eV6OumdhYpedyxih2QqwjPqtsvxGciW X++EK/blnx6nEbnHArk/cQPPfcqYEcOZtqc7CG8j1afFKPy0bHd+BzjTEjGlN/Yaibxy 70Mg5x/7viubY1Rq9ZesTOGp3ij6sOkgv8Tvhos3Qr6JubheJKvIu9spncQQJf0dJQcT moEgGbFbzC5h5TNn/ndAIcY7zaW1CPURJFsmpyvZxYjXCxug/PRaVORf2TYO4WFEVyJP 42tA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=N1webYU8N7gqxZ2+1gQ5vaSBZmNQV3blJvlCBLtRFhE=; b=kXMxn4NKb3zRg/aWdj5oZdpOXgXmTZkFReCZFWvmEKFDzwEx2EPy7BhKWcjImnw9oA 3U1598Ic+DcbsbDpo9MorUnCDtxiG8/F92FZ7aCOr4l1zDtfsF5NJXPkL0mS//WwHjwM PAMLBTOQw0ytFxT/mBBlUSGHE9S1JXu2OW+AYpReZJtwgzK8gy4szHWj60o/Dbug5OsK PHagiWulwUwmeRM2GGRXt8iRxI4EIEZ0Nt9bTG3wYNt2Kk3Tay3H+vR1KZcPNfXITRYQ XT+Qs31h7ma6WaUhoIsh8nmg+12DWMNgO5OSyOrDojpH9RaLfA96XJOm+Ljxhy1osvTQ KW+g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b="YG/JG+F3"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id gq12-20020a17090b104c00b002340e488cc5si15877338pjb.96.2023.03.20.06.27.37; Mon, 20 Mar 2023 06:27:50 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b="YG/JG+F3"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231756AbjCTNRT (ORCPT + 99 others); Mon, 20 Mar 2023 09:17:19 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41648 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231747AbjCTNRK (ORCPT ); Mon, 20 Mar 2023 09:17:10 -0400 Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5A56623A5B; Mon, 20 Mar 2023 06:16:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1679318218; x=1710854218; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=3Bu5KEQ7VbEZVFxJWJ3dCxTl63qFR3TMO6ewhBoLJ+8=; b=YG/JG+F3Aqb1j82yUubccWeA3qgzUxGZQyifGITwbZX5BqMTBtFM7zIX hka5uYgFVTCRwkzK5oZLXN4KcCwNf5LEJ41pOqdXwpovzql4HwDwHhTxD HqaVa44Uc0vBZ+47FXk8LWjrW9dnECrD3zWp+6AYeJcx5zOBTqQcyh52P 6Sk2NIz9mEPlBRxKJxbZ0PJaP6DU660vLaHvZYHF1FA2mqxz7HrulG1/H 2y4hrTfynGVcIJUe0xKS4UBYgZ/jTPUdnwoSXTCT8ZaJ2Xk/fQdgvMali gbsj8Avz8gR5NV4jKKanwfcjtf5cq/42r4PfAGIXo6EX/60q0i5s6n5Zz Q==; X-IronPort-AV: E=McAfee;i="6600,9927,10655"; a="424932250" X-IronPort-AV: E=Sophos;i="5.98,274,1673942400"; d="scan'208";a="424932250" Received: from orsmga007.jf.intel.com ([10.7.209.58]) by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 20 Mar 2023 06:16:08 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10654"; a="674382651" X-IronPort-AV: E=Sophos;i="5.98,274,1673942400"; d="scan'208";a="674382651" Received: from black.fi.intel.com ([10.237.72.28]) by orsmga007.jf.intel.com with ESMTP; 20 Mar 2023 06:15:58 -0700 Received: by black.fi.intel.com (Postfix, from userid 1003) id 2B4BE638; Mon, 20 Mar 2023 15:16:44 +0200 (EET) From: Andy Shevchenko To: =?utf-8?q?Micka=C3=ABl_Sala=C3=BCn?= , Andy Shevchenko , Mika Westerberg , =?utf-8?q?Krzysztof_Wilc?= =?utf-8?q?zy=C5=84ski?= , Michael Ellerman , Randy Dunlap , Arnd Bergmann , Niklas Schnelle , Bjorn Helgaas , "Rafael J. Wysocki" , =?utf-8?q?Pali_Roh=C3=A1r?= , "Maciej W. Rozycki" , Juergen Gross , Dominik Brodowski , linux-kernel@vger.kernel.org, linux-alpha@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mips@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, linux-sh@vger.kernel.org, sparclinux@vger.kernel.org, linux-pci@vger.kernel.org, xen-devel@lists.xenproject.org, linux-acpi@vger.kernel.org Cc: Miguel Ojeda , Richard Henderson , Ivan Kokshaysky , Matt Turner , Russell King , Andrew Lunn , Sebastian Hesselbarth , Gregory Clement , Thomas Bogendoerfer , Nicholas Piggin , Christophe Leroy , Anatolij Gustschin , Yoshinori Sato , Rich Felker , John Paul Adrian Glaubitz , "David S. Miller" , Bjorn Helgaas , Stefano Stabellini , Oleksandr Tyshchenko Subject: [PATCH v6 4/4] pcmcia: Convert to use pci_bus_for_each_resource_p() Date: Mon, 20 Mar 2023 15:16:33 +0200 Message-Id: <20230320131633.61680-5-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230320131633.61680-1-andriy.shevchenko@linux.intel.com> References: <20230320131633.61680-1-andriy.shevchenko@linux.intel.com> MIME-Version: 1.0 X-Spam-Status: No, score=-4.3 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,SPF_HELO_NONE, SPF_NONE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1760893463916336023?= X-GMAIL-MSGID: =?utf-8?q?1760893463916336023?= The pci_bus_for_each_resource_p() hides the iterator loop since it may be not used otherwise. With this, we may drop that iterator variable definition. Signed-off-by: Andy Shevchenko Reviewed-by: Krzysztof Wilczyński Acked-by: Dominik Brodowski --- drivers/pcmcia/rsrc_nonstatic.c | 9 +++------ drivers/pcmcia/yenta_socket.c | 3 +-- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/drivers/pcmcia/rsrc_nonstatic.c b/drivers/pcmcia/rsrc_nonstatic.c index ad1141fddb4c..9d92d4bb6239 100644 --- a/drivers/pcmcia/rsrc_nonstatic.c +++ b/drivers/pcmcia/rsrc_nonstatic.c @@ -934,7 +934,7 @@ static int adjust_io(struct pcmcia_socket *s, unsigned int action, unsigned long static int nonstatic_autoadd_resources(struct pcmcia_socket *s) { struct resource *res; - int i, done = 0; + int done = 0; if (!s->cb_dev || !s->cb_dev->bus) return -ENODEV; @@ -960,12 +960,9 @@ static int nonstatic_autoadd_resources(struct pcmcia_socket *s) */ if (s->cb_dev->bus->number == 0) return -EINVAL; - - for (i = 0; i < PCI_BRIDGE_RESOURCE_NUM; i++) { - res = s->cb_dev->bus->resource[i]; -#else - pci_bus_for_each_resource(s->cb_dev->bus, res, i) { #endif + + pci_bus_for_each_resource_p(s->cb_dev->bus, res) { if (!res) continue; diff --git a/drivers/pcmcia/yenta_socket.c b/drivers/pcmcia/yenta_socket.c index 1365eaa20ff4..2e5bdf3db0ba 100644 --- a/drivers/pcmcia/yenta_socket.c +++ b/drivers/pcmcia/yenta_socket.c @@ -673,9 +673,8 @@ static int yenta_search_res(struct yenta_socket *socket, struct resource *res, u32 min) { struct resource *root; - int i; - pci_bus_for_each_resource(socket->dev->bus, root, i) { + pci_bus_for_each_resource_p(socket->dev->bus, root) { if (!root) continue;