From patchwork Mon Jul 29 20:18:15 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Frank Li X-Patchwork-Id: 13745672 X-Patchwork-Delegate: kw@linux.com Received: from EUR03-DBA-obe.outbound.protection.outlook.com (mail-dbaeur03on2067.outbound.protection.outlook.com [40.107.104.67]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 97195188CBC; Mon, 29 Jul 2024 20:19:31 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.104.67 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1722284374; cv=fail; b=fvpmuvEGkMNLKx8Chn6FRnqCENHt+gjMrbifVDGQDcQ84hN5YcxjSP7yOt96C2YJLBufjBU0KHwsZh1af891GoghMU575lCB5wWpfW34eHlT2TnyLTSAsnb8xCAMpTKjXkowYFLzSjPJXrXfoqAFU1eDN5HWxJLDXgM+fdAmjLw= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1722284374; c=relaxed/simple; bh=Sz4wSH9fJRxSuOtKT4ii9bZq5wdfSH0QeE8uwN+gSOA=; h=From:Date:Subject:Content-Type:Message-Id:References:In-Reply-To: To:Cc:MIME-Version; b=Zl5VXWUrEk6JMiz6CV3v6+nawDL4jouFNh90/rJLWF2O8KC07NhAbQ3ah4eu0nx+BC0WyLBlVH4OTD8b8HaNbW83XzeIGIIIy6Sk53S/jsLaMJqDByCdh4ieyGM592uXn/yglUyyZa0pN8zys4HlcjVuOe4Q8u3pCQmpD0voYdM= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=nxp.com; spf=pass smtp.mailfrom=nxp.com; dkim=pass (2048-bit key) header.d=nxp.com header.i=@nxp.com header.b=a92F3iMz; arc=fail smtp.client-ip=40.107.104.67 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=nxp.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=nxp.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=nxp.com header.i=@nxp.com header.b="a92F3iMz" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=osuSUH8dhrs+eQInmpCwxHGoy75n+KZADa8X+qPB8ubrr/q+iPqYzbdxWJFOtIhGO/n6Pn3KT5GhZSpfoSA3LBjz0NnXCmReMV7Lj5fhAOZKHO8qNl8vopWcR/CowZoEXNs8zV9hLD2otW/wHNIXT8kyiS7Ag6blMcI88efkjEnbBUGKc7OIN20umDfnNawq5ZvvgOFS/2JqAxqSNS11v0q47/fSUdUJQNT1N5Lvpn/fwOAKmB4O4+t3Rz/TWuVSv3VmPNwjjxg7tXiAU87M/edrMvGOd2zEd8OhG5p3sOhtzczMEn13ppYy4tnaHO0vhusI5PZNBYTaYDSmzhiBNQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; 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=YMwEaN6yeCcLphdNMKFyLxeCWmsveowSNo0XAum9u3A=; b=FgMkMZcHdwUSF3o5Iz7urnfICyVuoEeg8eZ7NxRGJw1ddjh2JLnucqDQRSxCHsK+Y2X+rkJDVDt0B8p1SudJ4smpaOnskPRJEEHHU91wJtqLX0/0aSI1mfbJm7TLET5SLJU+EdsDU30hJk8nnz7NrFAvTFF2jKrXzL5BipuKyncaOTQkeWFItTt6uXMrOD2BG4Lm7AhBFqc/mah6nmXoIdiVtMeyvmPU0sIsojNvSCH/PhI9Qn4i8tq+yKGPdmwQ23BMpevNHPboUIXfQjczlOThGCELNQETsQLHbEJO0eex8Kx/Zr9t84o8quPms5hQLKyyO/WDU6+UI+4mKa3mQA== 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=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=YMwEaN6yeCcLphdNMKFyLxeCWmsveowSNo0XAum9u3A=; b=a92F3iMzm2cWftEO95qj+MEIsvQPaHwHwvLuhKX1URZ/+00tOTzS7IMKLyaVfRiCRQV4+9fl7VZVDJOoGGEqOEQIGSp4p2+DhngpGy+PwUHmcWWk/jR5r9vIh37gZfDZF9FBVcgmH2cEZ6hGQvOaAhZxgd0RclQ8FQ6NTALVbUPaEkiirLxIhULv7f9p015H9SsxR44833W2jzsXxAQpsJBl5zlvTKQp6auIz0AErOzeEf7y4fckjwWwgisv2dwzj/aCSx7M85DFTG87HVjE4Is24dkhL5L93whaKkUo/SLm1SIgfrPDpTDtk2dXgxnMC0n3p4eCaRLZTqpUyGbwIg== 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 DBAPR04MB7382.eurprd04.prod.outlook.com (2603:10a6:10:1ab::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7807.27; Mon, 29 Jul 2024 20:19:29 +0000 Received: from PAXPR04MB9642.eurprd04.prod.outlook.com ([fe80::9126:a61e:341d:4b06]) by PAXPR04MB9642.eurprd04.prod.outlook.com ([fe80::9126:a61e:341d:4b06%5]) with mapi id 15.20.7807.026; Mon, 29 Jul 2024 20:19:29 +0000 From: Frank Li Date: Mon, 29 Jul 2024 16:18:15 -0400 Subject: [PATCH v8 08/11] PCI: imx6: Consolidate redundant if-checks Message-Id: <20240729-pci2_upstream-v8-8-b68ee5ef2b4d@nxp.com> References: <20240729-pci2_upstream-v8-0-b68ee5ef2b4d@nxp.com> In-Reply-To: <20240729-pci2_upstream-v8-0-b68ee5ef2b4d@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=1722284317; l=1048; i=Frank.Li@nxp.com; s=20240130; h=from:subject:message-id; bh=Sz4wSH9fJRxSuOtKT4ii9bZq5wdfSH0QeE8uwN+gSOA=; b=otQ/qzidAqYKVhiDPLASOsMjdg1AE4Xdv1KHAq/GPRkWZV0hbxj3xmDagbjVAYFjGZMjm4Wl6 OA/fMROuLhpAjkqgLlZ0XgDQPDVSus1fcPcRFd6WbrE1+CUWOf+B3+A X-Developer-Key: i=Frank.Li@nxp.com; a=ed25519; pk=I0L1sDUfPxpAkRvPKy7MdauTuSENRq+DnA+G4qcS94Q= X-ClientProxiedBy: SJ0PR03CA0069.namprd03.prod.outlook.com (2603:10b6:a03:331::14) To PAXPR04MB9642.eurprd04.prod.outlook.com (2603:10a6:102:240::14) Precedence: bulk X-Mailing-List: linux-pci@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: PAXPR04MB9642:EE_|DBAPR04MB7382:EE_ X-MS-Office365-Filtering-Correlation-Id: c552c389-46aa-4994-0ef1-08dcb00bbfc8 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|376014|7416014|366016|52116014|1800799024|38350700014|921020; X-Microsoft-Antispam-Message-Info: =?utf-8?q?b843YccISZjQy4Wq79kil4auaP7RXGw?= =?utf-8?q?gY/JCMjrD+2lJVE0hchfMz990059VAIk/ZWtt4Z8rCELPii2zj8U0BbJjPvoTLjxh?= =?utf-8?q?JeJf1qgbrChVC1KMxMBmMqjzOnQ5mBNO7P76TcQIMneWeV2MNgxE6j/rtOsc7zNK4?= =?utf-8?q?eQpqCAmD1/TaWu+AKoJVznFFjO43hIDna8Z5+vAjftLLeiwbLCNzjx+KNn4Lhx7gE?= =?utf-8?q?jPts9zZDK923b9UkN9k3UYM52ixVQiXppq1V6Zdc2v644kYyZmUOFHcWZFUnegv6P?= =?utf-8?q?Qwh1VgEPBfc5Y0rr4zjXb89uiBNdyKJci+gbz5RWshjshBytw6ZSMplj8LRpzn/sq?= =?utf-8?q?s+q+X7VsYeNsYGt4fC5LSXtVtnw73FgJuiYix6yV5lHS6OL8VUVPz0vXCdRmFTRj0?= =?utf-8?q?cu9G9CrL3YBXhgNL6JHMQvjAGhjrXDBn5dE/M3INsxqL9Y6iSikVAH67eVAy2aYE0?= =?utf-8?q?lbs/78m8GHF1aE/WoP3Faj7K42FR792RLDiyb8RSKRYHL4Jc8e8nrYbVhzJ4tK7is?= =?utf-8?q?RbjH6+iPQdu7QTO+2NNG492CYLa7zis8a45QILYZf/bE1ux7uvy1JwdIiZ8vDYB9l?= =?utf-8?q?WtOZmu8ow0uZ5+ICjmTLI5/3wT8Ukv8Rxv4mcrkronkLG6DwjnIxnXND7f32TL33w?= =?utf-8?q?wDe9JzcG7ryoaFpCKIdu2/cHeXLHnP+XO8rotkCNPTfYWvG84Zuqfh6rCoa3F2NPY?= =?utf-8?q?OtDxveOdNN+yPPb9XJMQhdAeYSNH5irA/rkMg0Ix372kRvhugjf3/9aA3IgyEsAPz?= =?utf-8?q?9TsaygWHCS6edbCin8igzIIr1rR/OhqcZHS2aMafIouGPi8aZQ+JR5TuWFS+JiMx6?= =?utf-8?q?bqCQ6hwqbH3Y0Ss77I7wR/CT63cGpDkAH1u4xA+wrBpuljym/Kcfwv69NiJRDZRwI?= =?utf-8?q?zcap6nxbZKCcKkuFoEZYa9HPh319NvQoZYYeDcNyYZUISHc7JRqDAziTvmupycBl9?= =?utf-8?q?ypMsmDNaWHr9dIDleX9MtuDOm9Y3lj+YZ3NsoBG6ERps74IIPDIhe6tocxJddUgoF?= =?utf-8?q?OTjloI1fvwPvnGdB7XJNGanyNQcibAtOS7JMKU3Unzilnpv33jmSKfne905MXw22h?= =?utf-8?q?VOhSfQiLvvzd4AlLsoPIbMer1jbyIFgJn84k0N9y70DjHL9GBKbfrIwvOzTjlnblo?= =?utf-8?q?VIljcv/22ET59WVIrcfbd2t8xbeBDsLsCPUa71u+m44ZMuhMs/M+CXkomuDJHUu9h?= =?utf-8?q?ZBnliwviVfPLRmbcoFI8UbN0SJLJJ42ZX2eU3njX8FZ2viNNdq01wQzreValqyQF/?= =?utf-8?q?cYnQJ0QtpWbV5msJ0N2saJmqmXI7qcIAlkd9N9AyOLILEqYIAjOwnfgZA8o0Np1Cx?= =?utf-8?q?bDjAiZRQuPR4oeTXq9om5tqn8zIOSAiZBSuXrUcmjzwJcEDDbpgucfA=3D?= 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:(13230040)(376014)(7416014)(366016)(52116014)(1800799024)(38350700014)(921020);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?0CaenXoqsnFKTeuxVdQQS7gD/xcB?= =?utf-8?q?2U1vBMB3/OpjOKsHkBVN/26S73+AmxouX5DPylqq/Qgxc2ZDxCVanS72uKDQu8Qv0?= =?utf-8?q?Ia3pXHRrB7G+Wy1duaJRhK569p09AtMTl276t8GKRNxre5qyayJOAfXZ1/hb1uo6m?= =?utf-8?q?G7TvpeTuP5oEuel03E13ychSvif3D7gbMHeSM8mqtTVKJ9gIDhTapcwcgr/6ziCdc?= =?utf-8?q?6O/5ohDJEPbEjtvILxBBnwkdhKp2aPjkCocy0yJkwu/eUYX/P/umgPqNXEm7vpOYL?= =?utf-8?q?hkiJ6D/3yDxP0uy5n58cMOlOjmghYx7qY9vEAFIeg5mV/1slYlG1YmmawTmcWSr/H?= =?utf-8?q?J2U89epoPK3tHTaMEoLEJg0SV+0UvDw73kL9UBfoccEXX1Rp3mwdLbTHRoxWx/PIP?= =?utf-8?q?76E37r1xCR+5n+A8ovgO6ipT14NN9L+5lURdSZc589ucOkEJiAoGUO1ojGwz4rujh?= =?utf-8?q?2nrua9FLHsrWqaFdUgPNrHxg5Wvvr9DWPoHf48jMnAo03QtykFPwKTYzu1xO7BRt0?= =?utf-8?q?l1Yritm5LwIF15IOUjax0lS0DW5atsIM5ZlecyLX8gm3jSt6QSJbJrMG76o5pVi0A?= =?utf-8?q?eQAxU/kEma5pF5hrt7rTJJig9ogisTa7uCFWTwopjle2BmqOtwW5vsPoj9qy4wZN3?= =?utf-8?q?rx8V/6i9mxew2b+9BxjkjqZkkxWq29IwLscgRgyPIOKNVervj9fHEf4NGGUocrM+a?= =?utf-8?q?KXQKiITHoYbuMlMHB/XDtDsWmfdQgyk822Bb3rdI9PBQLVPRvuzSf9nkNmPU547U6?= =?utf-8?q?fQ0I4u8yHhw0UDzp14xCQPGqkRJGCiAKIKV5MUrAXygXk1gYPVSE1iV8MCtTd6/7k?= =?utf-8?q?A5XE1AxPySc2NKdbSlKNRTj7uKn8bkG+f/crRf3DYLZacbZsSebyW4/UsvK8NmfYZ?= =?utf-8?q?WCcRG8dorx3JlpDzr36Qkej1FLbDR1mfwa2GV/8BzRCM4ZPi6sadFM9z92HESDMK0?= =?utf-8?q?Ov8qUM0tp75oy/cG5kKWVoVNRSr2540IyBoe6DlxN8f2GvsZMeIS7R4rgmUZrRfGR?= =?utf-8?q?6PR1H4pLaDQTWRCNgZ+HFmCCT+Ek3Tq9fv6pWm6Dz+eu9FMbBVX+kYDBr4A1dZoyM?= =?utf-8?q?z7Ej5jh5+KqecCyKLMnSZI3WTxjaJu9vW+q3sgbXE9SAtcV1785nCw8p4YBaQ9E7/?= =?utf-8?q?AsVVBjmVbiy4Hlrq9L1QdMquH3FM4PhudaP+5MuxewcZdl6Z1bbGwA6LPwG5AaZq1?= =?utf-8?q?ecQFmuzlV/NDKrKNJe4WhrjGyAkUUa2gMZpdH4ezoKUqnQWBKEw5UaqdZDL/4yxNr?= =?utf-8?q?NoXc/3okqKVGODn8/srSvmVKRvRWpbe7M80/0bx3wCYuImFRj2iLuULWz/1eZuZL7?= =?utf-8?q?V9HRnD89pYVhVHYDLFNgMwQK44yPmkIj+FucNWOS7jqij4l2VXVyYfeieBqHrL381?= =?utf-8?q?g77cvJ6DEuFG7hwec4pwcobGTS+LVNwTO1tYNnLZcpT6dwZ2W5EiIsFqsvgFnzhtY?= =?utf-8?q?rUPJ7mXPAYYrKTmmxV83GMhtJ1br4DKyi/Zg96B1niwZu7g64ctf6Gr00UTOaZA9K?= =?utf-8?q?kO1LIW246d1q?= X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: c552c389-46aa-4994-0ef1-08dcb00bbfc8 X-MS-Exchange-CrossTenant-AuthSource: PAXPR04MB9642.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Jul 2024 20:19:28.9188 (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: LG8Ets+4KUHaackq1yrkcliH+uKsJWIHL6bIexKc7Neie0E4CUYm9q3xLYc4fZ+yeWL+AMOwHEvVSX+YX/srIw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DBAPR04MB7382 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 6be32a93411b6..ccb7cdae32756 100644 --- a/drivers/pci/controller/dwc/pci-imx6.c +++ b/drivers/pci/controller/dwc/pci-imx6.c @@ -949,9 +949,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");