Received-SPF: pass (google.com: domain of linux-kernel+bounces-128153-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) client-ip=2604:1380:45e3:2400::1;
From: Frank Li <Frank.Li@nxp.com>
Date: Tue, 02 Apr 2024 10:33:45 -0400
Subject: [PATCH v3 09/11] PCI: imx: Consolidate redundant if-checks
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: 7bit
Message-Id: <20240402-pci2_upstream-v3-9-803414bdb430@nxp.com>
References: <20240402-pci2_upstream-v3-0-803414bdb430@nxp.com>
In-Reply-To: <20240402-pci2_upstream-v3-0-803414bdb430@nxp.com>
To: Richard Zhu <hongxing.zhu@nxp.com>, 
 Lucas Stach <l.stach@pengutronix.de>, 
 Lorenzo Pieralisi <lpieralisi@kernel.org>, 
 =?utf-8?q?Krzysztof_Wilczy=C5=84ski?= <kw@linux.com>, 
 Rob Herring <robh@kernel.org>, Bjorn Helgaas <bhelgaas@google.com>, 
 Shawn Guo <shawnguo@kernel.org>, Sascha Hauer <s.hauer@pengutronix.de>, 
 Pengutronix Kernel Team <kernel@pengutronix.de>, 
 Fabio Estevam <festevam@gmail.com>, NXP Linux Team <linux-imx@nxp.com>, 
 Philipp Zabel <p.zabel@pengutronix.de>, Liam Girdwood <lgirdwood@gmail.com>, 
 Mark Brown <broonie@kernel.org>, 
 Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>, 
 Krzysztof Kozlowski <krzysztof.kozlowski+dt@linaro.org>, 
 Conor Dooley <conor+dt@kernel.org>
Cc: linux-pci@vger.kernel.org, imx@lists.linux.dev, 
 linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, 
 bpf@vger.kernel.org, devicetree@vger.kernel.org, 
 Frank Li <Frank.Li@nxp.com>
Precedence: bulk
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0:
	=?utf-8?B?TjFDWC9UVnBNbThNMEJqMFphUmpTd3VRSmJocG5WNjJDeTF2NWxXa3RldWh5?=
 =?utf-8?B?V3NlT0k0aUtrVmZkQ2F4S3I0bEQ4OGpoWlBDaFJ3Y0RLRU5ISFI3MUI1anU5?=
 =?utf-8?B?Zm5yNGVhVERXSTZpM3VNZ0toODIzRTVXbU82aVYwYU1xbzRoakluQThhNUlw?=
 =?utf-8?B?U1JWZTFwOEhkSHl5NUZFWWpPVzBwQUQrM1lhTXVwYXEvWTl0c2RETXR0bEdp?=
 =?utf-8?B?cDU0NTcrbW92SUlOR1BSZnpyMjZKcTdYSk03WkYvVFRla2FVS3huZ20yNGJX?=
 =?utf-8?B?bXZQWDV6SmM5MjNjVjRwMHltdUVNVVg1Wjh0dXNuMStVSHZTVndmell3dzBB?=
 =?utf-8?B?Q2cyWXdRaUQ2YkhicHRwVlhiRkN3S0laK3ZieDE4RG1kVFBCQ3A0WW9TNDRQ?=
 =?utf-8?B?NERCZEV1aURxdjdCSUx4UlNrL2d2UnVSR0tCenBxR0tvMUliVkd2U01YVFpC?=
 =?utf-8?B?dnVYcjBGTHZXdXB6eWt1T0V4TCtuZVFESFpRRjNrcmtlcXRQcWtxKzA2TFkx?=
 =?utf-8?B?R0RpOEdObi91bllteCtIVXQ5RjRJVmh4Q2hPRWcwNk9lM0pHdHcyWGs4RnlQ?=
 =?utf-8?B?M3p2eFl0ZnRkWWdsQUsxQTFEV2xydkNqVjJNM3hITlZ4NlNOdFN3emRma2ZF?=
 =?utf-8?B?ekdoMUk3aE50bCtsQlZER3d6ZkNYaG9TM3BxbVYwQ2sxU2VYa1JWSzd4L2J1?=
 =?utf-8?B?N2FtOG5hOE9NY09BNlhDU25ySzJLZkg5K2RFbDUvcEpObC9mTFpxKzU5dkxC?=
 =?utf-8?B?V2J5Q0RBRUFWam8wc0FuZlpvT0pzdTN1WXJneDI0NkhvY0hNSkRvK2h1YitT?=
 =?utf-8?B?VVcyS050SG90OFZOYmZtem9Zd3hNS1Q5TVdXVm1rek5iT1YvZ0xTQVpXa3M3?=
 =?utf-8?B?Q1JmUm5rRVZTTGdxM29LbFVBZDZWL3pITmQ2bmJiT0ZWck9nUE1Xb1ArOHpz?=
 =?utf-8?B?bVdSZzJSdm1WbHUyc3VoQmxzTWFUV1pHWEV5RFZDZUR5TWVIaFpkU1hpN1RV?=
 =?utf-8?B?Y0g1RXpLYjBMNE5JV2tUTStaY05tSGJvUGRmZVNXbnVncFRRdzJyUTQvbXIx?=
 =?utf-8?B?ZXJoT3VHbm9YMFVXbXNCaXZCQ3NXaDhqanVpUFdON05JOFRZL3hEd09tYWNq?=
 =?utf-8?B?S016bEgyR1lxSmN5TnBDSzZpUmptTWhZUkFJV0h6Mks1TDlud0IzTDF5Tkts?=
 =?utf-8?B?V0RveitaQTdFbUNzWUhVQytPUkxINEVOQzBLdFBHQUtvS1FyOW0wZzV4ZkRK?=
 =?utf-8?B?cnc5aXUyMnUwUDFKMVk4b3VLdXljMytyaXB1TE5OemNXcHR1L3RWWmQvMk9t?=
 =?utf-8?B?TGFjSFBmS3hpWjZUMzFlYStyRXhUdmxMQjdVSktxM2xrdlJHU2lneWNNYmQ5?=
 =?utf-8?B?QS9TMGs1MkQ0L2xvOVNJMWQvRnJUcTA4ZnBmS2ttNVJaL2x1VVpvTXdCdEFp?=
 =?utf-8?B?bTg0ajlQWWFVTGxsNE1qOUd5R3g1QjdLekZqSlRWYWk5R05PY3VrV3Fpb2FF?=
 =?utf-8?B?YXRtRmNwK0srZUdoMTI3ZTVldTMvZzV2bndYaDVTMFBpbk03MnY2aTJGaFZr?=
 =?utf-8?B?dTI2bC81N2s0aVNEaXN6QXFPekwxWDJLWTRQMmg5bHo3N0l0cStnSVozeG4r?=
 =?utf-8?B?ZHo5T1hJTHBBdHMvK2U4WjVVS1lEQkczdXVETEg4WW9XRXBBTDVGcjdqdW9O?=
 =?utf-8?B?UE1sd1Fpa2hGM1A0UjVGMkJCMzdzdEIwVzI4YjBpelZPS0pzb0VvNy9MTFpv?=
 =?utf-8?B?LzlHc1Vla1Y3TU9JZGNLZE5UQ25lU2FoVy9mUnBZT0hyL2NxbUZlS1R1NVBS?=
 =?utf-8?B?blFWS1NCUDdzVGN5MUEwUXpVNXpXZjdVdVExRkJldGVkUEVmV3kyU2JaTjhz?=
 =?utf-8?B?aTBxOHJGQndjMlhLYnlWcFEwa0NLRlRzbzgrUWtWS2w0U1FRY25PNElmRDVB?=
 =?utf-8?B?eXBOZklPQTYzZlBjemZLWk1DQWJkQytlWlJYbTRpUWx3Vnlsd29sUDBBS3l2?=
 =?utf-8?B?MncvNzVobUMyU2FSUldJRlltZTZQNzM5WnI4TEkyM0E5N1lnYUhrNHFWS2hM?=
 =?utf-8?B?dXNsUFo1am9WYkVSOVBvSmgxVWpwcC9LdGp5K1hROTkxNlJEdEk2cjZPcG0z?=
 =?utf-8?Q?A3FU=3D?=
X-OriginatorOrg: nxp.com
X-MS-Exchange-CrossTenant-Network-Message-Id: bbbaf992-968d-4cef-7b04-08dc5322093d
X-MS-Exchange-CrossTenant-AuthSource: PAXPR04MB9642.eurprd04.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Apr 2024 14:34:43.0988
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: zSoQH5eIknRw/Mj7mtP8dJrRCJrj87YPDX5cVXQusBZ7Be4m0EYUjg3zlwn9Pvh9pD42FS9rDMAGlU9opIWiFQ==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: PAXPR04MB8926

Consolidated redundant if-checks pertaining to imx_pcie->phy. Instead of
two separate checks, merged them into one to improve code readability.

if (imx_pcie->phy) {
	... code 1
}

if (imx_pcie->phy) {
	... code 2
}

Merge into one if block.

if (imx_pcie->phy) {
	... code 1
	... code 2
}

Signed-off-by: Frank Li <Frank.Li@nxp.com>
---
 drivers/pci/controller/dwc/pcie-imx.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/drivers/pci/controller/dwc/pcie-imx.c b/drivers/pci/controller/dwc/pcie-imx.c
index 653d8e8ee1abc..378808262d16b 100644
--- a/drivers/pci/controller/dwc/pcie-imx.c
+++ b/drivers/pci/controller/dwc/pcie-imx.c
@@ -1103,9 +1103,7 @@ static int imx_pcie_host_init(struct dw_pcie_rp *pp)
 			dev_err(dev, "pcie PHY power up failed\n");
 			goto err_clk_disable;
 		}
-	}
 
-	if (imx_pcie->phy) {
 		ret = phy_power_on(imx_pcie->phy);
 		if (ret) {
 			dev_err(dev, "waiting for PHY ready timeout!\n");

-- 
2.34.1