From nobody Thu Dec 18 11:23:55 2025 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 DAA79C83003 for ; Thu, 24 Aug 2023 13:42:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241431AbjHXNmR (ORCPT ); Thu, 24 Aug 2023 09:42:17 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48206 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S241433AbjHXNlw (ORCPT ); Thu, 24 Aug 2023 09:41:52 -0400 Received: from mgamail.intel.com (mgamail.intel.com [134.134.136.100]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 49E911BDB; Thu, 24 Aug 2023 06:41:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1692884493; x=1724420493; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=tiyfUtMuorXZJjAwz/eazM7LhieZM+Nv43GEbBvNdcY=; b=UCu619Lv8QDwEDdyISoTPHsvpwo+GLz/d/rX1PsYM5TGyvH+vc/tKb+s trB033AkWcApd724D0FcWZt+f/RRtk8fZv4Jmu/rcEjlbcY6naEXecURq 46fHwDsHUYlVOuH2W5VviWnj0ipNpfKbBR2gXGqptDKyuKyglExiKdGNL xJy0cWOxIWvzzLSs6oFqxQYg4CWYeXeXRrZOkk/JCueJ2qRjYavPsphHs B5q9P7LKCCOFqO56y9MY7WeGj6zAgnSsSeAuwQUAHK1Y5ekjF2LblH7hW nq0REwPN7alCkY7uLuQm6iqnxmzHdNdmiN5yJFIY/3ixFFqKfvENV/3lp w==; X-IronPort-AV: E=McAfee;i="6600,9927,10812"; a="440792375" X-IronPort-AV: E=Sophos;i="6.02,195,1688454000"; d="scan'208";a="440792375" Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by orsmga105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 24 Aug 2023 06:29:09 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10812"; a="802539832" X-IronPort-AV: E=Sophos;i="6.02,195,1688454000"; d="scan'208";a="802539832" Received: from abedekar-mobl1.ger.corp.intel.com (HELO ijarvine-mobl2.ger.corp.intel.com) ([10.251.213.29]) by fmsmga008-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 24 Aug 2023 06:29:07 -0700 From: =?UTF-8?q?Ilpo=20J=C3=A4rvinen?= To: linux-pci@vger.kernel.org, Bjorn Helgaas , Jean Delvare , Andi Shyti , linux-i2c@vger.kernel.org, linux-kernel@vger.kernel.org Cc: =?UTF-8?q?Ilpo=20J=C3=A4rvinen?= Subject: [PATCH 07/14] I2C: ali15x3: Do PCI error checks on own line Date: Thu, 24 Aug 2023 16:28:25 +0300 Message-Id: <20230824132832.78705-8-ilpo.jarvinen@linux.intel.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230824132832.78705-1-ilpo.jarvinen@linux.intel.com> References: <20230824132832.78705-1-ilpo.jarvinen@linux.intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Instead of if conditions with line splits, use the usual error handling pattern with a separate variable to improve readability. No functional changes intended. Signed-off-by: Ilpo J=C3=A4rvinen --- drivers/i2c/busses/i2c-ali15x3.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/i2c/busses/i2c-ali15x3.c b/drivers/i2c/busses/i2c-ali1= 5x3.c index cc58feacd082..6fedecef9df3 100644 --- a/drivers/i2c/busses/i2c-ali15x3.c +++ b/drivers/i2c/busses/i2c-ali15x3.c @@ -122,6 +122,7 @@ static int ali15x3_setup(struct pci_dev *ALI15X3_dev) { u16 a; unsigned char temp; + int ret; =20 /* Check the following things: - SMB I/O address is initialized @@ -167,12 +168,11 @@ static int ali15x3_setup(struct pci_dev *ALI15X3_dev) if(force_addr) { dev_info(&ALI15X3_dev->dev, "forcing ISA address 0x%04X\n", ali15x3_smba); - if (PCIBIOS_SUCCESSFUL !=3D pci_write_config_word(ALI15X3_dev, - SMBBA, - ali15x3_smba)) + ret =3D pci_write_config_word(ALI15X3_dev, SMBBA, ali15x3_smba); + if (ret !=3D PCIBIOS_SUCCESSFUL) goto error; - if (PCIBIOS_SUCCESSFUL !=3D pci_read_config_word(ALI15X3_dev, - SMBBA, &a)) + ret =3D pci_read_config_word(ALI15X3_dev, SMBBA, &a); + if (ret !=3D PCIBIOS_SUCCESSFUL) goto error; if ((a & ~(ALI15X3_SMB_IOSIZE - 1)) !=3D ali15x3_smba) { /* make sure it works */ --=20 2.30.2