From patchwork Mon Jun 17 20:16:43 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Frank Li X-Patchwork-Id: 13701398 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id D2BFBC27C79 for ; Mon, 17 Jun 2024 20:32:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:MIME-Version:Cc:To: In-Reply-To:References:Message-Id:Content-Transfer-Encoding:Content-Type: Subject:Date:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=TFxC9rPKvd93kah/Dqg8UZA6Y/nTglhldH9xaKShG1E=; b=enngPMuVnVTcHlCzk09RNn/6Ki FXuAgjWngZC1x+HqLGSjMd6kuE9rhkOet9WUixf1wpWfRtg7+m4NTyonKR5/lADI4yQmpvix8R8Rl ifxF0m8z0i2MHEMy8pYXCWdREo79C/8gD0kTiuVdWYVG4mxzD7ttgWobbBZECQSL33SZFBTfPQf9Y D+4I2d8+PH4o2dug6pVeEdUBr4idGNrqVdtveEYKrcPsasGk9hrYSvg/9Bf3KCoemdUMAsGU4u4Mn 8TBVrfjw+Pqa1MHoDgjcBcoUnPM3mk/6OO7ghKvwpgxnGvxSP5tvT8yhTi7u43mJXNauRqp96MTdx 5WlhtYZw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1sJJ1S-0000000CXkZ-0PxG; Mon, 17 Jun 2024 20:32:14 +0000 Received: from mail-db3eur04on0626.outbound.protection.outlook.com ([2a01:111:f400:fe0c::626] helo=EUR04-DB3-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1sJJ1M-0000000CXi1-1Fat for linux-arm-kernel@lists.infradead.org; Mon, 17 Jun 2024 20:32:09 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=RQkv+5eczKPHjTcJuDyR3iMU37XH8y0vC9fwRJ9D05W5w0CqBpqkBvNKiditjCOp/TnX5+lvTCXoWEUnBWCq0d/eTLif6b6Stu0rvmbFl4DIjSmKs4EkfFEf75X2eNPYPnsRfNN4tQF7xW5uIrW1kAjYf92qRqxUZPRCw9c3rhzUmlz1Nq6chkrUP4pnJa8BjLla1vGN9I0KPUJ5Nc079JhXiQ5r2rEWoDPQu1o6z5uXZNhKwaFxiBAc4chH1Vo4ZzrHfYO8MQrgiJZRyh+4dd32wZhV9Wxb3mC0CS4qtrYca/8qRAmA/DQFhiTXCN/L7wySMkxShUnjd+XmiwejkQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=TFxC9rPKvd93kah/Dqg8UZA6Y/nTglhldH9xaKShG1E=; b=ib8paJe74nGtt6ZkPVFnsrR2GYLJPDdGZ8ZTOeMzjn2G4zgS+Br37z9iTaP1UpGKmcdjBHh9z6WwYef2ReuKp1KWjyjHsFvrRJNCZ+jjELpFFqSG3ky55bzam7ucIFug6cBTi2B/WCGkrP3E2o1Nt9B39CCpeUjJMUT3Yu1JTbIs/QF26pyb6YiaBC0GUIol3O7UXZ9pEvgvDuUZskBwUu9f/zscnjRTeuXqoEwNzEzQp+WGTZSs58aYw8hlmm/C22pC9SmfmZuIrgzMZA8DjbIbEsC8Ah3MUAsTvSv9FDW2+FjnP19cG9qRi1S3JiWIjxcrdn7s02CYA6Bs36G9FQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=nxp.com; dmarc=pass action=none header.from=nxp.com; dkim=pass header.d=nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=TFxC9rPKvd93kah/Dqg8UZA6Y/nTglhldH9xaKShG1E=; b=dGQ0bjFcrn/NjqDpOwoEA98K40NHE9KY+rh4A6FAbgjQHUaylhHN44f5sVjzUb9TmSHH5vHya+is/OKFgdA82Kdeyio3PUxVnxLiDY/kMcKNBsW3QrYVIoO4Zsoix1VK5X0oYlCORIVVgJnpauJTj+6Z32DmEU5Ewce0S32knSU= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nxp.com; Received: from PAXPR04MB9642.eurprd04.prod.outlook.com (2603:10a6:102:240::14) by PA4PR04MB7997.eurprd04.prod.outlook.com (2603:10a6:102:c9::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7677.30; Mon, 17 Jun 2024 20:17:53 +0000 Received: from PAXPR04MB9642.eurprd04.prod.outlook.com ([fe80::9126:a61e:341d:4b06]) by PAXPR04MB9642.eurprd04.prod.outlook.com ([fe80::9126:a61e:341d:4b06%2]) with mapi id 15.20.7677.030; Mon, 17 Jun 2024 20:17:53 +0000 From: Frank Li Date: Mon, 17 Jun 2024 16:16:43 -0400 Subject: [PATCH v6 07/10] PCI: imx6: Consolidate redundant if-checks Message-Id: <20240617-pci2_upstream-v6-7-e0821238f997@nxp.com> References: <20240617-pci2_upstream-v6-0-e0821238f997@nxp.com> In-Reply-To: <20240617-pci2_upstream-v6-0-e0821238f997@nxp.com> To: Richard Zhu , Lucas Stach , Lorenzo Pieralisi , =?utf-8?q?Krzysztof_Wilczy?= =?utf-8?q?=C5=84ski?= , Rob Herring , Bjorn Helgaas , Shawn Guo , Sascha Hauer , Pengutronix Kernel Team , Fabio Estevam , NXP Linux Team , Philipp Zabel , Liam Girdwood , Mark Brown , Manivannan Sadhasivam , Krzysztof Kozlowski , Conor Dooley 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 X-Mailer: b4 0.13-dev-e586c X-Developer-Signature: v=1; a=ed25519-sha256; t=1718655424; l=1048; i=Frank.Li@nxp.com; s=20240130; h=from:subject:message-id; bh=om4Fh5oG1kwE0U1dD6JH9tan5doH9jtRSql0uUIv1xY=; b=9uMWFLwCroYvOHNKcVvIyAR98TUgqlnHeSFOo7S1rAHPzfM51UrKhhWjtHs+nq2N1UKOlhl1X owo2yndpsGqCSHZI5Lv7DzWZMFSjssR1DMn57At8HNnaPPdP6Muk//F X-Developer-Key: i=Frank.Li@nxp.com; a=ed25519; pk=I0L1sDUfPxpAkRvPKy7MdauTuSENRq+DnA+G4qcS94Q= X-ClientProxiedBy: SJ0PR05CA0116.namprd05.prod.outlook.com (2603:10b6:a03:334::31) To PAXPR04MB9642.eurprd04.prod.outlook.com (2603:10a6:102:240::14) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: PAXPR04MB9642:EE_|PA4PR04MB7997:EE_ X-MS-Office365-Filtering-Correlation-Id: b7d209d0-5982-4a3c-7811-08dc8f0a9163 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230037|376011|7416011|1800799021|366013|52116011|38350700011|921017; X-Microsoft-Antispam-Message-Info: =?utf-8?q?OoKU6ir4l6l0+3vYxj9el4my4mRMJsd?= =?utf-8?q?W16SFgEbyW1WkPgLMCscQsf5wCY4vv6Qiex2B/1nud2zqyNU79krh2r02J1jkL2Qw?= =?utf-8?q?TMO7l4xC6aMMpE5Y2FkO3LsJu8FR5osUtAV0RnrWbHrrNykh7wUCjrwFNUsua0v9p?= =?utf-8?q?Hn1oObt0otzklE8oQO+daOjuHMP1MO2zbTUODfZ8bzd5WRCnA+ZfH9NN7DWAJHoWS?= =?utf-8?q?m23MmTfVCzA91c/zIZwvyW7jR4nbuk7WEJvy0xjvM/0F+72YV2k52fOPbXoPq4+Hf?= =?utf-8?q?OIsrnFjuDM53j251O1bkypQZDbmFamfzi2m33dKxbj0YsSPPaP7ZXbtcuCuObuhNF?= =?utf-8?q?C/f3pK+bu1O8Xp2f5V5zIWBuyv32+kimRXvhgpPOC94ruYI2R+jZ46e5ses/y1her?= =?utf-8?q?FIS8A9LVJi5ZNPa8KmPZVjlWnoOPA27MR60z2IcBqfxOYZQLBM8DZdbmwhHUtzOLU?= =?utf-8?q?w1dpaUxncjeag4vpz1029+haMwLTN8dliO1mj50R9RZL2b5pVI/4vfMVmBnsCVBZe?= =?utf-8?q?AfZhr0cMPYuQcsaytJOMaM0u2upwcpuVm9SaqawKFrPCYNv90Yxj3jy17BUNrWQaP?= =?utf-8?q?Hrfn5Z/7lm71Adl+YdQfT3LMa2EBSUuyjYB7RObXuYqPm7/ddZeLT+i+zqPd67tGn?= =?utf-8?q?q7ACe7VRS8wwbbrsEGfIjj2Hxl5PpWd5fM3jcU2jLjv+aaLQjQ88zZv7NqJci5y2Q?= =?utf-8?q?cK9Z1nFqyTBbpYaVP84ejWobDfN+xbTtdKCwGIw07fu39GRGwW6XHePEFE8nKo3Y+?= =?utf-8?q?h8wK6g/B6iUsU5cKklml/J7sbWisnrWU+fIDdEXEFJxx4QMrk5E9FvdaquDlNlgSt?= =?utf-8?q?8cJqCDGgmuL4QKbjGrRxh3octdcDiXtb2YQz3EOPdWYkkWrlQUJBOsTkjgorwnAYZ?= =?utf-8?q?Q2bwYCnHJBaHPioC+wbMgALuoII0ZcZF9NoY9k/syGFQAQDMoFBlu2rW0pZ7YtM6K?= =?utf-8?q?vspMj9MEscveufYS8Cx3sD/yr7eZoh8F/0CPirbS57uY8WKNIPCpjSUZWBuGXoMn1?= =?utf-8?q?EshcDQU3ZFJuE+Pc/HlH5OmsiTFGVrHeklAZNszvN2SzsB1pTsWbcbJxQjzgLh/fN?= =?utf-8?q?GOkPdDc4PxOwqgjnzq2FjLB+JaSRhseu9+KQ5sQzhZ3aSo2B002ATTiar7ZU7CTHd?= =?utf-8?q?Yz0pW84wELfhLWCnHvDNJlhTKeVXDwHSk13NwoBXsIOqJtSPAFqRW4M0LTOxwKdiV?= =?utf-8?q?jObID7A8ob1BABoE8205aR69kUCFPVRbPEgZIQ783v0AL+q+PLXO/5MH2Khl7/MV2?= =?utf-8?q?MvKaltMiaXFtOLTgCGuPBkKrQQP4LuFHjEP1kGrEYG0QPvTXC1fI21SQJNE8b2t4P?= =?utf-8?q?C1l7C9NUteCT?= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:PAXPR04MB9642.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230037)(376011)(7416011)(1800799021)(366013)(52116011)(38350700011)(921017);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?1eV4hL7f7xW7F+KGiSD98l04wZop?= =?utf-8?q?r54zXYmCGj9JOmCKQqQhBxsOPV9K+MGaM5wJu/WfZHkYGgtxsUHcfa6xN2Smz71Cb?= =?utf-8?q?cr/JkDh5Q0ysm/Kb6HCvCnTNJbV+GSeMEq0BDkXnG5aaaFzxWimPK/6cg1el0Hc57?= =?utf-8?q?8FvDe9GZ8sx6suFULOQK5zQjAerM97ZggUMUYNPJDMIhZjerWwJdEY5G0LbBb4ZY9?= =?utf-8?q?kE1aahpFavtrZ7AR2/KCEsyHSO3hudf78y/XWyUTvmUWDKi8IUijcLfi9styPahuL?= =?utf-8?q?FtJmWYY1vz1syqiwBIpwvrWBIWBT+0PkOxk4BBEuThCEucCZcPFZTPvyi41aJQcch?= =?utf-8?q?giGOOT+nJ/6AIbsRucGnpmUQkLDCwGYBdw8i4BPO4qLvD/WAz6aPaDCgzkGxGVvWs?= =?utf-8?q?wIlXodr8CiNnkjpU4j1jCFvDLFvVln04QXSrPby2TGlgzAFqCVZ6vMxUl1jZxZBeC?= =?utf-8?q?I3MutwouD3A+RhV43qxD8klPp84cBd20kVRNxPVUmglooFD8EnufRBFrnE36cDSQO?= =?utf-8?q?dNOBE6+X2nyDzKuCssJONCLOH+HAML7cEuH/NkwlyrxvMdsvgjhpTA6qb6o90yvTh?= =?utf-8?q?8mtuog1bKPfLmDaWbI2g4PyY/3z0ajn3clU3ZBmN6mDzyCzpeppmI3oB5tjKU3ipO?= =?utf-8?q?b7ByIp5+hcV3fxEcJeY0G0ypSoYQy1jmCX+SZbj2Xk12TXXAj73Z8b2m4C8VaYoUU?= =?utf-8?q?ASKzJ65gfD+0QzfS1+K1hWbbXpHw9eNAvsbIndoZLhvGNPDZ8P5lszxLhxYGCGbHx?= =?utf-8?q?BdTvVuNyDwAjwIk4FyxZYSgH5mxXO6J5KDXF/65a4wZINw+WaS+AP5cxyMQ8DCNQK?= =?utf-8?q?/EUfCqJ38azIJ5UP2H3nnzb4KzTkl23xOFAhgfHRT1MYLy+mKYFPHfceYmkidGrKY?= =?utf-8?q?8oMJMPwHv472uzqOsSEKBYejYrvmCT3cU1rOXWXR2vgLpg1aLZNNZn36sPxU1zfUM?= =?utf-8?q?njbEVNl+c6QrlCP4VwP58qbMhOsKX3insjp4c9hJ5sYnmxuQj3XVDPZehh5jY5/Eg?= =?utf-8?q?pOgzUkBEmwNk2a7jiaIJlOmFxTDiwkwUkrwxrw8T+5/YFDAPsC7ZMJIS13zGeCt0A?= =?utf-8?q?gXc0YnC3X5PhIHUbOIWnX/9JjGc56oNVH7vuzzx+OqbQX3DqExc6/elJysmNPLsrI?= =?utf-8?q?LNhDJ6VzKP/1VElxJX3fesdYyhtIewnHeyKIK0bS9RnzGhsGLEtuTr4NrzMvbMa/o?= =?utf-8?q?PQJlHuUHsEa+s5wXqDvWdvJ0AYBPxxdD7f3rZ+orhD2iSIbRykUib7eGIjrHzJ1Uc?= =?utf-8?q?HY+9TsJltDYZo6hQD8UIxC711SIlNCLMvNXdiQF83NBdtWKw51ONQoUfw5+y/Yoh6?= =?utf-8?q?IIqYwFJodXpB8THNxNoEr++DYDP+2wgAD9EegLDsKTSL2hVGZY+zCWo17X3uC+qvC?= =?utf-8?q?uJJuPmk6iMHi/dWsaEj8NJzrj3ZqGSvnmGJKPuzU6mi2NVwCfOgsyMGyrG4XiKHof?= =?utf-8?q?6dnyqUf2rOXjRiN5scafk23CjmhZxKCr90gnYsVGam2iOaWgpcbCmn/H3x5+uQDxW?= =?utf-8?q?2UcP16jxMibW?= X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: b7d209d0-5982-4a3c-7811-08dc8f0a9163 X-MS-Exchange-CrossTenant-AuthSource: PAXPR04MB9642.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Jun 2024 20:17:53.2471 (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: AkN85sBbzMxJopQ3Xs6+itDiq2dAuoc2dmKKDiVFZLqrCM7JSwDDxczx9jvgzNOjxGdnM6bY3HFXs0uJupFqPQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PA4PR04MB7997 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240617_133208_357292_73C7E38C X-CRM114-Status: UNSURE ( 9.19 ) X-CRM114-Notice: Please train this message. X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org 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 Signed-off-by: Frank Li --- 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 6e3ac3fc33745..ab0ed7ab3007a 100644 --- a/drivers/pci/controller/dwc/pci-imx6.c +++ b/drivers/pci/controller/dwc/pci-imx6.c @@ -954,9 +954,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");