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: 13364632 X-Patchwork-Delegate: bhelgaas@google.com Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 74E2BC88CB9 for ; Thu, 24 Aug 2023 19:38:41 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S243307AbjHXTiN (ORCPT ); Thu, 24 Aug 2023 15:38:13 -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 Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org 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 Reviewed-by: 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);