From patchwork Thu Aug 24 19:37:02 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bjorn Helgaas X-Patchwork-Id: 136874 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:a7d1:0:b0:3f2:4152:657d with SMTP id p17csp1376226vqm; Thu, 24 Aug 2023 13:36:12 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFNBPzSerkCLxMISK/kH+WrVdhRavJmFTq87GxfcR4FNeI8GEdKnit8PRIu6Z8TuFVW482p X-Received: by 2002:a05:6a00:4692:b0:68a:2260:c84d with SMTP id de18-20020a056a00469200b0068a2260c84dmr20373604pfb.10.1692909371992; Thu, 24 Aug 2023 13:36:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1692909371; cv=none; d=google.com; s=arc-20160816; b=nnHOGV6UBLW47wM+qs4hkXcBwVlT1GFwal8j2ytUROLFFX3Usasde6AJGcpIodf4PE 9n8EqrwL/KwgsZoAqN1XDNr4BREOA4Tq7fyjOuYKfl1CPxnb1pRK83mFFVQZzCEX0CWX m6qaY9+R+dPl9wN15TU1lR/+sR9FSAw/G6T9sY54igfN/VhCcD4bcner1RDHJHWtUFma KtDLyoGlpRti8tvuIXYS3NHyJE/1R7Y1SwAs04DHO2tWmDBCmll66pOqD/S0gdBq11gN NoLXxEIX4IaDKxY099Sz2Mt2iYAI6OvqENrYYBbIy1m8xrZdpCSoavFUhIx/1drgHSdg nN8g== 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=DS+vH0paxeDt22D+K1u6QpRvxzGy2RQIS/vvTjHgGgU=; fh=VgulsHW1/1Fp2ppP2QMjRhzgKmrVDSsXe3olgPeruIA=; b=S8bo3cpD1RtHGs4W8ONicZPGuv++LEHqtfZqmQ5Bxq/6TFIvyadU49nStkWbkvWBc0 o1z7G/uAO6u2m4Bd3RnJ0yEpWu65mZtfgcfKnDQGgNu5ITPlaFruSaNkuNoJHDDb6Cen aQlImQDuhYyH3SJO0TA099u6E7lJwgIQjvWYPfQ4BSku2pS9Xxr26yruLs5TUGHFFs/S j+/x90zuE+2EEhvg5AxROP9nsAph+ku2LCnBYqxZ/MeBM7JjlL0QiUEGF/Pzcbn7V8JW iO3EJmHAT35cFq2hVGpCdKzHB5ejzs30cvEUiJf1LW3QKnkSYSH5u6AzlDMALOmiCXS3 awOg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=g96co2jU; 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=kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id p18-20020a639512000000b0056baff5c55esi90038pgd.74.2023.08.24.13.35.53; Thu, 24 Aug 2023 13:36:11 -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=@kernel.org header.s=k20201202 header.b=g96co2jU; 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=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S243266AbjHXThk (ORCPT + 99 others); Thu, 24 Aug 2023 15:37:40 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41850 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S243297AbjHXTh3 (ORCPT ); Thu, 24 Aug 2023 15:37:29 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DCA6C1BDF; Thu, 24 Aug 2023 12:37:27 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 71B7F63E83; Thu, 24 Aug 2023 19:37:27 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id A40EEC433C8; Thu, 24 Aug 2023 19:37:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1692905846; bh=FvE1bHfRSq51w6iPVI+P4zuQ2+MxIoKwCRP0Ix/yP+E=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=g96co2jU1FMBovyFhehbgptyzNlsDEAqOgx7UEf7JnL/hPhLBHNM5GGQga0FETAZD cP4rU2av5pEMkeMzPYZNRb5HcBCp+HyytKrPO9rUXQZ7Um2Tc3VMhNC9jpKuIlWtgW ye4xZp/jitoGtGUrRGbC0rThujL4qeKvGEhUcPL+H8n6FYBfmpuXQTOFEyAnPvf97i 8KXcGmemPrWNZb+plyoTl3isFImLmAemghhS2bz26LjwKoCYZpPuTWIkarZSXYHjdJ hXDGLCBBrOP+wxx5TJ7DawCa6NVkHhc1NJGrVjT+LqMHESvNFLxDeMcgzBn8CJVFpL pwT7FP1eOXipw== From: Bjorn Helgaas To: linux-pci@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Bjorn Helgaas Subject: [PATCH 02/12] PCI: Unexport pcie_port_bus_type Date: Thu, 24 Aug 2023 14:37:02 -0500 Message-Id: <20230824193712.542167-3-helgaas@kernel.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230824193712.542167-1-helgaas@kernel.org> References: <20230824193712.542167-1-helgaas@kernel.org> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF, RCVD_IN_DNSWL_BLOCKED,SPF_HELO_NONE,SPF_PASS 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: INBOX X-GMAIL-THRID: 1775144137952524909 X-GMAIL-MSGID: 1775144137952524909 From: Bjorn Helgaas pcie_port_bus_type is used only in pci-driver.c and pcie/portdrv_core.c and pcie/portdrv_pci.c. None of these can be built as modules, so pcie_port_bus_type doesn't need to be exported. Unexport it. Signed-off-by: Bjorn Helgaas --- drivers/pci/pci-driver.c | 1 - 1 file changed, 1 deletion(-) diff --git a/drivers/pci/pci-driver.c b/drivers/pci/pci-driver.c index ae9baf801681..1f9845377eff 100644 --- a/drivers/pci/pci-driver.c +++ b/drivers/pci/pci-driver.c @@ -1705,7 +1705,6 @@ struct bus_type pcie_port_bus_type = { .name = "pci_express", .match = pcie_port_bus_match, }; -EXPORT_SYMBOL_GPL(pcie_port_bus_type); #endif static int __init pci_driver_init(void) From patchwork Thu Aug 24 19:37:07 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bjorn Helgaas X-Patchwork-Id: 136872 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:a7d1:0:b0:3f2:4152:657d with SMTP id p17csp1365251vqm; Thu, 24 Aug 2023 13:14:16 -0700 (PDT) X-Google-Smtp-Source: AGHT+IH9/6aVcjRuWLJNCcRySXY77Vo3YeDotPW8iRBUD2IhTs+7OtH6Z/n5AG6/nt2I1xS3hfLz X-Received: by 2002:a17:90a:2f47:b0:268:fc26:73a9 with SMTP id s65-20020a17090a2f4700b00268fc2673a9mr12968287pjd.40.1692908055930; Thu, 24 Aug 2023 13:14:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1692908055; cv=none; d=google.com; s=arc-20160816; b=OlRTExZj+gp+k/vnBDHASdOONAOmMgiuKcQDv7Ef/i/ytsuqLpJ5xsXj4UM0rOB8gq 7FNltoJxlYo/vUnBs+wlj0fCC5icBWG50Spabq/+XhK7K72pr4MNPt3KmUyqcD9zFn1q ZjyDDVHl+ZOG09wAOjjNvK0AsG1+3VUnYqV+cdVkxolOT0RnrmJT7sKZRgaa6eZK65eb vgYpLiowzk8cMRlaVf753lhLFw3yF/gtAAVlo08dxUKpeW40JfsIZR8q/HYlQLQTUkTX zb/JKz4u2nZ1O82jrW/9I/mIcCT2Ut6fZFUKUwKysVxHG88B4hpDOqJreU3uXKaeoAY3 CuHg== 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=45qYCpGF2068yqDIfaqBp8qdNZCZLwMTwYBhXMcLEuU=; fh=VgulsHW1/1Fp2ppP2QMjRhzgKmrVDSsXe3olgPeruIA=; b=y3PMwPtOeKX/nJ3hjtse+TALkMyzSkKqedRXyt2wTAi8Ksvu6WGjPGCM9BF92AlS92 qzJHDricE/fVTqesVvd438MTQ/UoEO1zDaRh6wOxI2+VJgdAZ4RgseY70teOdw4pbQbS Ej3JxFImY9qvIQt7U/heXgktW/Veu710Axc04DcX/PpkJj0WF6gd604BIv7ZsKflVlwa 1ZVcW2zFyvd9hbhNMvRHLWgx3unNOgaSjaLwJtWR3NL+oHB1xXq1rLfPufRkXVP0Vk9K kL0ip9kf5o6mDdRzqIK+HRdJSizszNSdC92TQJQGnJQbDx7s3yAybqXalzykuCgvi4YK l7XQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=Fnx+q3wo; 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=kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id f34-20020a17090a702500b00263f3d759cdsi224222pjk.78.2023.08.24.13.13.51; Thu, 24 Aug 2023 13:14:15 -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=@kernel.org header.s=k20201202 header.b=Fnx+q3wo; 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=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S243305AbjHXTiN (ORCPT + 99 others); Thu, 24 Aug 2023 15:38:13 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44450 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S243269AbjHXThl (ORCPT ); Thu, 24 Aug 2023 15:37:41 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5B4DE10EF; Thu, 24 Aug 2023 12:37:39 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id C6731654DF; Thu, 24 Aug 2023 19:37:38 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 07B10C433C7; Thu, 24 Aug 2023 19:37:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1692905858; bh=cRcXheMwP6+1IJC+RJCLu/hAsRt8eGGz+8gJIYd9Mr4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Fnx+q3wot+N0rwZlsRkmOo/a0ur9OMBcgzbVfO3Q8KyWCUaQeV6CE76fqtj4mNNnh v97rUHuo2De5LEkm26rmn5ClFd2dKmfOKv9bac/BrqNzLcHhU8LGFEHi1VBDwqpRF8 LR3QN/egT81La04HcYJpfRMcO5J8/kOgQYM/6K+RP4MQ3Jtw1RmVYfXUsYGOYHzCmH +uYo/OAZQ5v8jUuYBrZkZm4wTSAuHNursZE06y3MYBcj2gEkLEYkje42oaVtyVW6n6 GBynX9Mr9JsBjTYJ7OjXlFPRfktdzX7qTIp3xy52+JwD3M7oMe2Ma6/xOjCJFpANXp qgLtgWRu8xhpg== From: Bjorn Helgaas To: linux-pci@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Bjorn Helgaas Subject: [PATCH 07/12] PCI: Simplify pci_pio_to_address() Date: Thu, 24 Aug 2023 14:37:07 -0500 Message-Id: <20230824193712.542167-8-helgaas@kernel.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230824193712.542167-1-helgaas@kernel.org> References: <20230824193712.542167-1-helgaas@kernel.org> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF, RCVD_IN_DNSWL_BLOCKED,SPF_HELO_NONE,SPF_PASS 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: INBOX X-GMAIL-THRID: 1775142757612139797 X-GMAIL-MSGID: 1775142757612139797 From: Bjorn Helgaas Simplify pci_pio_to_address() by removing an unnecessary local variable. No functional change intended. Signed-off-by: Bjorn Helgaas --- drivers/pci/pci.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c index 60230da957e0..4d2b11c71e62 100644 --- a/drivers/pci/pci.c +++ b/drivers/pci/pci.c @@ -4191,16 +4191,12 @@ int pci_register_io_range(struct fwnode_handle *fwnode, phys_addr_t addr, phys_addr_t pci_pio_to_address(unsigned long pio) { - phys_addr_t address = (phys_addr_t)OF_BAD_ADDR; - #ifdef PCI_IOBASE - if (pio >= MMIO_UPPER_LIMIT) - return address; - - address = logic_pio_to_hwaddr(pio); + if (pio < MMIO_UPPER_LIMIT) + return logic_pio_to_hwaddr(pio); #endif - return address; + return (phys_addr_t) OF_BAD_ADDR; } EXPORT_SYMBOL_GPL(pci_pio_to_address); From patchwork Thu Aug 24 19:37:12 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Bjorn Helgaas X-Patchwork-Id: 136875 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:a7d1:0:b0:3f2:4152:657d with SMTP id p17csp1381378vqm; Thu, 24 Aug 2023 13:47:30 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHsKh9Cfw8MuvqthJ9jhI8EnxfDcdR4oUvIY/SV7AB/ivjuZgean4o5HWlHejxe9xhEOKDd X-Received: by 2002:ac2:4bd4:0:b0:4fb:9f24:bba9 with SMTP id o20-20020ac24bd4000000b004fb9f24bba9mr13836913lfq.5.1692910049730; Thu, 24 Aug 2023 13:47:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1692910049; cv=none; d=google.com; s=arc-20160816; b=wmTjrKBQTzBFM1WQ0Yd9n8Uk5mtdr6MHuOAzgSMLy1r1Yjg4Tf7zbCppMA2J+BVOpL rNc23LpbiB6VIebqa4QnkxoIdQhRk/D92p+EWPtnhix7tbtZANazMQtvaYyU6G9u6HbE sNq8PrMt3FL++sWo+CQ0B78s+Nhxzy1Du+UHRvPHtl9lXQ7gxflsIxzKo41w+WHk3hD8 ZDXUDYWYniwZlqd1Vhd0+PdD9yVIhs8PM/88f3BgNfegMnIOUAiohYaY/XAgoCD/sIHk PwkBNKmB9MQEXZkglyBGXJrjfp1XKx5aZTyLEPo2xOfiXaRZm6r2GRixNowwUw9IKvFp Tk1w== 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=wS5XrjvhyReP/2w97EgDX2DJ1qqSZ7jLPZjY3ENVXy8=; fh=6ogUT078J8Im+f3ps6BY6OTDSYcgsaeNGtxds486jN4=; b=d4L1MfnYcqAZxs3c83moUR15N/1pgUDaC2WYv/t6S0Ym/o6rocRtQU7qHTAZOdZQLG lWIgPD8g+cj78JreJAbzaFaAazGm6uFxW8wQh/gFZgnv3qkZ2KGjV2vaZCVAVJRCugi3 fDBCJskwonbW/1xy86e9DdbVKoK9V6SERDw/u7OQJ+l4xs5IugGDtwl7XiR6GugeBGbA WR20S+tQhaCc3ceEQcuVCFjYM4rcRlL/4IUOmcHtDcLcCsgAQXQBkPEq2DvdxqyJ1DVO gQ+0G0tZZ2n49Q493Jqzv7Z2p0U00FdAqcblXylvL0b8lCH8b54aScfJ+YXtm1PIxFbv 92GA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=Q7tk6OtT; 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=kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id j16-20020a170906831000b0098da8d0ce54si61413ejx.834.2023.08.24.13.46.57; Thu, 24 Aug 2023 13:47:29 -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=@kernel.org header.s=k20201202 header.b=Q7tk6OtT; 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=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S243400AbjHXTiX (ORCPT + 99 others); Thu, 24 Aug 2023 15:38:23 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55310 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S243335AbjHXTh4 (ORCPT ); Thu, 24 Aug 2023 15:37:56 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 388C9199D; Thu, 24 Aug 2023 12:37:51 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id C28B963E83; Thu, 24 Aug 2023 19:37:50 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id C5FC6C433C8; Thu, 24 Aug 2023 19:37:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1692905870; bh=TxFlo3rahknBv2NQiotq3bBQOJxkeLlh82x/HlCUcLs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Q7tk6OtT86xxJ0CtbEXRYpeQrsQw9aTDqvQezQ1M9psRMZcMaxwjxOWa2iphx/TQ+ nrut97Rzyri2OB4eE4wTI49tKu6GwuLJG1sjT8uKxXbPca+Q6znJdT8NhjaHvVc1qQ CeZCyNvQrvGj7A99WWCtQb8K2GkiLREC0O6WUWIjd3JOgDrU0DqPKQPFi6h0v1V7CP bE0W+TOvi7/nH6jpBUgsMN4awHTQwwdBYVHc0p5SCoZhSeYlt/om0d2D1ilLsxNYmy /grc8L7bff1Pm7xRfHW5g2ayKcsYwZwLeK+GSiuKbxdXNUaXAdLusqWs9mY+9BdYcQ vOMVXZ116QWeA== From: Bjorn Helgaas To: linux-pci@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Bjorn Helgaas , =?utf-8?q?Ilpo_J=C3=A4rvinen?= Subject: [PATCH 12/12] PCI: Simplify pcie_capability_clear_and_set_word() control flow Date: Thu, 24 Aug 2023 14:37:12 -0500 Message-Id: <20230824193712.542167-13-helgaas@kernel.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230824193712.542167-1-helgaas@kernel.org> References: <20230824193712.542167-1-helgaas@kernel.org> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF, RCVD_IN_DNSWL_BLOCKED,SPF_HELO_NONE,SPF_PASS 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: INBOX X-GMAIL-THRID: 1775144847853761779 X-GMAIL-MSGID: 1775144847853761779 From: Bjorn Helgaas Return early for errors in pcie_capability_clear_and_set_word_unlocked() and pcie_capability_clear_and_set_dword() to simplify the control flow. No functional change intended. Signed-off-by: Bjorn Helgaas Cc: Ilpo Järvinen --- drivers/pci/access.c | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/drivers/pci/access.c b/drivers/pci/access.c index 0b2e90d2f04f..6554a2e89d36 100644 --- a/drivers/pci/access.c +++ b/drivers/pci/access.c @@ -504,13 +504,12 @@ int pcie_capability_clear_and_set_word_unlocked(struct pci_dev *dev, int pos, u16 val; ret = pcie_capability_read_word(dev, pos, &val); - if (!ret) { - val &= ~clear; - val |= set; - ret = pcie_capability_write_word(dev, pos, val); - } + if (ret) + return ret; - return ret; + val &= ~clear; + val |= set; + return pcie_capability_write_word(dev, pos, val); } EXPORT_SYMBOL(pcie_capability_clear_and_set_word_unlocked); @@ -535,13 +534,12 @@ int pcie_capability_clear_and_set_dword(struct pci_dev *dev, int pos, u32 val; ret = pcie_capability_read_dword(dev, pos, &val); - if (!ret) { - val &= ~clear; - val |= set; - ret = pcie_capability_write_dword(dev, pos, val); - } + if (ret) + return ret; - return ret; + val &= ~clear; + val |= set; + return pcie_capability_write_dword(dev, pos, val); } EXPORT_SYMBOL(pcie_capability_clear_and_set_dword);