From patchwork Fri Mar 10 17:14:16 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Andy Shevchenko X-Patchwork-Id: 67593 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp997040wrd; Fri, 10 Mar 2023 09:21:33 -0800 (PST) X-Google-Smtp-Source: AK7set/vAKHYJA7Srg47aHeURJPDv6Vy5LRVlsg9kHHitQcLI3fnx/Vub/U29O7OL6wnA/cZhvRX X-Received: by 2002:a17:902:e752:b0:19a:5958:15e7 with SMTP id p18-20020a170902e75200b0019a595815e7mr3456436plf.15.1678468893617; Fri, 10 Mar 2023 09:21:33 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1678468893; cv=none; d=google.com; s=arc-20160816; b=RhXFOsZ3DTsefsA9SmP6Bsne+QNjcL3ko6j9qdTvJBB0v/UhS+UOphJpnwrLSHPiWV FBsORp+qWMgFRmzskcyugZG+sdvH0iIb55Xr30TfaynVphMVpOQoO3xX0VejkfIdTT/F Nuw40SbmvEaY2J12AYPTQTzs45LOBZCWPPmZsl3R0cOmBkNTOKcyc870kY49vXD9G42G qWPcPQiH6ZcEvVGxc1c+xtmmBzK0yLv9F0W9y+Y9Nh2+FVob9UmgBPq/kdVvGuPgEwnK gxeRY7HAK6Yk5W+qwOuHxU0MgANNST56qnecbFXGi84t3w3BoYO88QP1KUYx3Cu/FjMD ZYRQ== 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=vVVfWJCrvi8RtvgLfSI2D6TodUgBv6CgdjfWrnsE61U=; b=Uhdw73Z9ampqNzoE2b5IUzj52nY12zkjNAmKKIsICjdTCxzAcmFAYi8h9LiOGUtzXF H9CWHhUGXmroYvzJGq6zj73eGbrbK4SPwtDk2ClGaDQCgQAXrM+Ps5WS7PJyzIvucXe7 NoZtS9sWWhMP2N9Z3wddRzv49U0AmulI0T75PNiCXy7CDP2Xcz93/BCfR9G9oKePHirO 77S8bkSba/DeX8zea/eBbWuuyrpqxek8u2Ea5qMw8n/fDp6iH5WHsNmdkga5jRs+lbNd ufbU/kvOalpN9quPbfoNsLbwGcpSKSxghWwmPK72um+UxXxBnYxn/qB0ynNtTLmelNLW ETIw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=QwWp+pwD; 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 y12-20020a17090322cc00b0019b009d5d60si423499plg.134.2023.03.10.09.21.18; Fri, 10 Mar 2023 09:21:33 -0800 (PST) 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=QwWp+pwD; 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 S231362AbjCJROp (ORCPT + 99 others); Fri, 10 Mar 2023 12:14:45 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36884 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230333AbjCJROg (ORCPT ); Fri, 10 Mar 2023 12:14:36 -0500 Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 77E755B433; Fri, 10 Mar 2023 09:14:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1678468454; x=1710004454; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=At9xdYTQNTpkoGAW78tZWvzRJ4xj1ehsEwPouDTGZjw=; b=QwWp+pwDv1RWiI26KOBED6yl76ciM7XDOxbZiU62AjSjPVfd4jfRbawz Fq8v+KRI0/R2NGzn6Lg3VCGJ7+0UyU1kUocLzktlr4ZZlCp243slwLUIb SDxXN4GlRwyeq5qqK/eLVO2mm0VCL2JWtfbGf6KVebL5TtOWsDIW4qQEn ZOzdK2uzYhO0IHfmkgWflmHjwej0C2+Ixfd9xY7f42CkJOe5F3XrvG5fR ZpTAxcRQc/DZvD8ZCj064wa6uj1djT9s0yTfp8BE8JyxIED4uHYCAmq++ 7SRx98cD3ddEfQKz5GbBxTX43jbYi8bUMxdhpDtZ89olxzpaJgmwCGGE/ Q==; X-IronPort-AV: E=McAfee;i="6500,9779,10645"; a="325132287" X-IronPort-AV: E=Sophos;i="5.98,250,1673942400"; d="scan'208";a="325132287" Received: from orsmga006.jf.intel.com ([10.7.209.51]) by orsmga101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 Mar 2023 09:13:48 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10645"; a="655250064" X-IronPort-AV: E=Sophos;i="5.98,250,1673942400"; d="scan'208";a="655250064" Received: from black.fi.intel.com ([10.237.72.28]) by orsmga006.jf.intel.com with ESMTP; 10 Mar 2023 09:13:37 -0800 Received: by black.fi.intel.com (Postfix, from userid 1003) id 867E0367; Fri, 10 Mar 2023 19:14:21 +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 , Bjorn Helgaas , "Rafael J. Wysocki" , Niklas Schnelle , =?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 v4 4/4] pcmcia: Convert to use pci_bus_for_each_resource_p() Date: Fri, 10 Mar 2023 19:14:16 +0200 Message-Id: <20230310171416.23356-5-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230310171416.23356-1-andriy.shevchenko@linux.intel.com> References: <20230310171416.23356-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, RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,SPF_NONE, URIBL_BLOCKED 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?1760002198502935140?= X-GMAIL-MSGID: =?utf-8?q?1760002198502935140?= 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;