Received-SPF: pass (google.com: domain of linux-kernel+bounces-192964-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:40f1:3f00::1 as permitted sender) client-ip=2604:1380:40f1:3f00::1;
From: Frank Li <Frank.Li@nxp.com>
Date: Tue, 28 May 2024 15:39:22 -0400
Subject: [PATCH v5 09/12] PCI: imx6: Consolidate redundant if-checks
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: 7bit
Message-Id: <20240528-pci2_upstream-v5-9-750aa7edb8e2@nxp.com>
References: <20240528-pci2_upstream-v5-0-750aa7edb8e2@nxp.com>
In-Reply-To: <20240528-pci2_upstream-v5-0-750aa7edb8e2@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?QTV0Rm5mazZldWhqcFR6UUJHU05JdVVDc3V1UjJYbDIxbjBheWtSRmRoSlNX?=
 =?utf-8?B?Q3JDaHkwalBRTUZzb0J2cDNNOTNlcXU1by9SZDNsSU5UdVBaUWE4Q1ZxcTU2?=
 =?utf-8?B?TGRGak1Td2FWSUpqVFJYeUx2REVHNXMxUndYVFJ0dFNkbmJXUTg4ZGlETXY3?=
 =?utf-8?B?OXdLK2RlaE52L242bVpOdW5jUG4rVDU5cVFBMit1STFmRE1Td25PRmtZaEZI?=
 =?utf-8?B?UjdCaTdvVlZDZGRJbUJuLzZ4U1c0SzRCeEpNSkY5NWtPMjBPcXllcXpIM2RJ?=
 =?utf-8?B?MU9KY1VXUVpucncrMVljdC9rTGt4TEgvb3Q3OXAzdlByeEU0U3BNaXZUZWhh?=
 =?utf-8?B?L0dVRWlaMGlJbFhTRGl1cFpLeWV6ZVNSK2Vqd1FxdXMyMndzczkwWFVuaWQr?=
 =?utf-8?B?R0pmTG0ySnNmNi9IcGpaYTNBN1ZhdDhuUmFaazM0VGFOMnczRkFTdE5EWTFV?=
 =?utf-8?B?U1NpVUhoSXZrTlVlTHhPZHFlWFQxZmZucHBGRnJJK2h2Q0FKVGJsaWk0STJi?=
 =?utf-8?B?SjdtS0lqMjZ1OC9RVDJUSGNzS0NOcythSG4ybnkwSUZ2T3locDZndnhSc2pC?=
 =?utf-8?B?ekxQdVdweUcwL0hDQ1BtVEJOd2Mwb3N0WWxSTlNocWxDVVVIWVR5MGtFcURO?=
 =?utf-8?B?emJKTlRnb1h6ZE9YZ0FZeHp4Y2dPdzFyc1VWN1NTOExDcmt6SkRTWDh3cXBj?=
 =?utf-8?B?U0luQyt2MXZIbjZXT0t0QjgwUjRhRjc0dXVwMzNBSllpV0lyQ3pjaG1BZTk2?=
 =?utf-8?B?UWlOekdSSmNjR24vaTRGTkREWjE2UzBWRnVpU2p4ZWRmb25sZGFRdFRBV24r?=
 =?utf-8?B?SHYyTnBna1lDcms1NG1yWVYrbmsycWFUa3R1NWVBZDRlMmQzcjJ2SE9Kdlk2?=
 =?utf-8?B?elpDUGN6bFEvOTFkc3EySFZMSUtBVW5kSGl2NmFzYTJOVlhwamhGaUlTQ0xR?=
 =?utf-8?B?Ujd2bUZzcnAzckdMeEdxaTJsZ1JrVzFENnhZSnk0Nzlqek5hR0tORzV2bDlu?=
 =?utf-8?B?K2wyNEtMSFRJSnp1ZTZPMGRuSXN1UnRXcm0xVmhpbUlGZXFBVVRTU1czTHl2?=
 =?utf-8?B?aXY0dFYxZVVDZWdRTzhyKy9HaDFQVXpFQ2x2UGIyNjhZaXZQcC83OGQ4bVEx?=
 =?utf-8?B?UmhJQ1F6d0tyaWdFaE5TV2tBbThlTjFZV2lwTG1YYXhvTzYxTlhrNzNkQ1Zi?=
 =?utf-8?B?aUl0aEgrbnljLzNlL3ZlZUY4NVRpMjRpM1Zwa2lZM2Q5cjFPRUpHUGovZklC?=
 =?utf-8?B?cFRHM24rVytQR3E3UFhFR25RSUZEVm9ySlQ4VVFuTG9wcGYvdkpDeU9CS2J0?=
 =?utf-8?B?b2VMaVR5VkRoN0lPSW5hc2ZKZ2syaW1ucDg3eElET3AyY0N4TWhHVHJhNkJB?=
 =?utf-8?B?UmZkcHRPSkh1c2hzV3NYRWJLbm4yNUxQcHVCbTVyeWJQbHA1NHQzMkRIL0Jx?=
 =?utf-8?B?SGVmeTJaMk1OS2xaWTNTbUp5ZkxwSHp5ME9VZHpaWWRmaWVXMURRckZqaHV4?=
 =?utf-8?B?RGJEL0FnbXJBa1YvREtuclE1NzJ3dlZKT0NFdHZZaHUvUTRlVE9vMkozREtx?=
 =?utf-8?B?WlhOMTVoNDBZTzVBUG9BS3lSZlNqUXREYSt0bVp4UlZ3YVZoZXJCYU9jN1M5?=
 =?utf-8?B?YnF4bkw3WW1qR1l3bkFBTW1JZFMraFd6U2pLYkpDMmhaeXAvNTY0T2N6dnVn?=
 =?utf-8?B?MlFTK24wVlh3aXNJUEhzVnRkWXFGdm85Y29OSDVwdGpRM3dUQnZmUHQ2MTRE?=
 =?utf-8?B?RWsvOE9YNGNnOVFIQzRyRVVhVEFCRXdCbkhFK0dGcktPaGpiNGNoZW15c2t2?=
 =?utf-8?B?SlVWTDhZcXNWN0ZXWlRqaFRkUXdnN0txWi96TFBtWnpyV0lUSzcrZVpFbmQ1?=
 =?utf-8?B?K1ErWG5iVC8wU2JuRXRJUVNncy92ZjM2VlAxTHVFZzQwLy9JS04zUHg5UGpM?=
 =?utf-8?B?Q1RScFd6WkNyMkVDWWZnZ3BVRjdUbFdJVnUyUXhNYXR1NUM2aUtCeW5hWmky?=
 =?utf-8?B?c21pR2t1cXFDUk5DNmVTZW9JdDFqd1AyWnlTVngvTE9ORjExWjN3SDlGQktF?=
 =?utf-8?B?TFl4b0ZxZkhtdFNEVFEzekI4Qm82NVhBcEhlSWpjaWw5eEhuSWhmUW9YeFVZ?=
 =?utf-8?Q?X3os=3D?=
X-OriginatorOrg: nxp.com
X-MS-Exchange-CrossTenant-Network-Message-Id: cb5457b6-c835-45be-3058-08dc7f4e0125
X-MS-Exchange-CrossTenant-AuthSource: PAXPR04MB9642.eurprd04.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 May 2024 19:40:18.4119
 (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: Nl3j9YI2d3JMiSMGcctTRcpAvHfJKMx7lPQS74zq3+4dba+5baTuVGPSc6ooGgAXw7yCtMZW29pOqcxcBmv6Uw==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: PAXPR04MB8655

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
}

Reviewed-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
Signed-off-by: Frank Li <Frank.Li@nxp.com>
---
 drivers/pci/controller/dwc/pci-imx6.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/drivers/pci/controller/dwc/pci-imx6.c b/drivers/pci/controller/dwc/pci-imx6.c
index 8ecc00049e20b..c8d58481f80dc 100644
--- a/drivers/pci/controller/dwc/pci-imx6.c
+++ b/drivers/pci/controller/dwc/pci-imx6.c
@@ -1028,9 +1028,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