From nobody Tue Dec 2 02:51:16 2025 Received: from PA4PR04CU001.outbound.protection.outlook.com (mail-francecentralazon11013017.outbound.protection.outlook.com [40.107.162.17]) (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 2A31433F365; Mon, 17 Nov 2025 18:58:42 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.162.17 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763405925; cv=fail; b=PIoXKASs+ORJ72fbZAZB3Aw5UM0C3+ncsUMBS3exfuJkcdyzDelvCNq6nbHLV8gRgp0qA1pprLLuP7fLDQ/3wCZ0DRLB1AmhzTd16EgwHhoemOrS3YPHa9ch3UjYv3oLsZ6v6/chfTcElCkQlmCx58f/K08oGx1OKkVSjbeud9I= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763405925; c=relaxed/simple; bh=ARPVaqVAWLk1VA6S3ScOC7ebUNYLCY1YIOO8jKmKuaQ=; h=From:Date:Subject:Content-Type:Message-Id:References:In-Reply-To: To:Cc:MIME-Version; b=ZGEwdFf6xZje92MMTjDB3Hr5F24tu+ej1T/L7gVTtQME0lCEkihLly/FozfMwPQWvO+gSUXeR1cCXaK1+RXFwykQ6x9KhKdZcpxhDYNPKEIOwy8RI9DPjWWoPGw15nzLPs4c5CGQif2Lj1YhtCnjpAdHxRXTlJioyTZX6eVRh74= 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=DADBkL+w; arc=fail smtp.client-ip=40.107.162.17 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="DADBkL+w" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=xWiMZzbWiRVnhl15GMyaiCmuhteMX3ny60WzZhDZuWhpWpdi5uy06uCXOGwM6fd4psc/jzReaZMbnD3pJz1DenEgEaNeMadjGyHvpaxvOao79zqZD2pfJ+qhhHpMOaoTx4L9/mu9E8aWKwS8U91Fjb5p9PI/nDzvGzvFOKSlO0DmEtXOmhZJ3pMtxLI+r08vl74Cwn5M8sD2Ev2AbQeN4M/YW1/8BnKAcY87+5ogI4Cr7hwXXPDAHQnziytVeqtxUfdGl/TIWHs20jmpjVpW2e0+iyM84ZV+BlGMFVWm8HLaZQP42jTcDLW4ZC3lYI8DpTMcQP7U/JfChVemo18V9A== 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=CE3W5LA1JyM4wuWE9oEPumUOCTK4fL3rPZoBerNt4s8=; b=KqTpK0n7J2jlQd26cRDg1dUuAAWoYQ8bIzlhJETnsNFa7Vu6NRN29t/l8SPXGrqDEYg6ihJ/5UNHk4jg7lpzDO/grtijErh1Um5gAwN2ToBfJTqsYkNd3JiTB6FinGOy6lQKOmWXCKNzx2NpEw/T1gAGdU+oXbqE8Bwh7VMVXplDsQQKfeok1ME0LuVyzM7BLlo2gQiDi7trSzWwz3WG90LccRaZPtKMd61hWbrRFCLjCwTCLLkSFU62ndYAZoRdik05jygrNnpKdYZDN9nhOkiOteozd2FJ4dNbtxt/LvQN8Fh5a9KrwGZQ0ShINtu2StL3TkVcoDrCkiamP2tfKg== 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=CE3W5LA1JyM4wuWE9oEPumUOCTK4fL3rPZoBerNt4s8=; b=DADBkL+wxz604yl/KsoaeZTjNbPvaYQ6C1oVzStP3sM/21lQeMa83Wk0lTatSq6YD0aTsFZUu2rmIlK05j2tZ/IPWtVH5zomtyVZMN+Q3oMvYcc3BUb+dcJ3eYBVrnf9Tzl/RVuqaWylm1qwq1WwpE30/KKS5EChAI/neJa5SiYajBbReaj3n8mSDtfYDCmCa3tr3nA7XtEqW6jsoMRcmj9HfvScl2ivHwCKGswfcaocUbHUrJUwb/jXQYx2P+zxyqO5giSqDfZxymtJvFohdXaSYDHcTU/yoVL4UkgohlUG0UEnuEZCFvook58VzAxv0JFv9u14Etg0vnAsYejqqQ== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nxp.com; Received: from AS4PR04MB9621.eurprd04.prod.outlook.com (2603:10a6:20b:4ff::22) by DU4PR04MB11030.eurprd04.prod.outlook.com (2603:10a6:10:593::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9320.22; Mon, 17 Nov 2025 18:58:38 +0000 Received: from AS4PR04MB9621.eurprd04.prod.outlook.com ([fe80::a84d:82bf:a9ff:171e]) by AS4PR04MB9621.eurprd04.prod.outlook.com ([fe80::a84d:82bf:a9ff:171e%4]) with mapi id 15.20.9320.021; Mon, 17 Nov 2025 18:58:38 +0000 From: Frank Li Date: Mon, 17 Nov 2025 13:58:11 -0500 Subject: [PATCH 1/4] media: nxp: use devm_mutex_init() simple code Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20251117-cam_cleanup-v1-1-6cd42872db79@nxp.com> References: <20251117-cam_cleanup-v1-0-6cd42872db79@nxp.com> In-Reply-To: <20251117-cam_cleanup-v1-0-6cd42872db79@nxp.com> To: Philipp Zabel , Mauro Carvalho Chehab , Shawn Guo , Sascha Hauer , Pengutronix Kernel Team , Fabio Estevam , Rui Miguel Silva , Laurent Pinchart , Martin Kepplinger-Novakovic , Purism Kernel Team Cc: linux-media@vger.kernel.org, imx@lists.linux.dev, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Frank Li X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1763405910; l=3593; i=Frank.Li@nxp.com; s=20240130; h=from:subject:message-id; bh=ARPVaqVAWLk1VA6S3ScOC7ebUNYLCY1YIOO8jKmKuaQ=; b=jvxoP+C/ukfiejtuwB20SW+/Pap/iMLcnypOXOCdMCkiU5zEx5TqZrKiadujr23K2wxLd5ZuW EGG4nzsJySyAp6hdtwl8OOufrNCJN9atEc4Y+EH0utAVH7CD7UfNhhr X-Developer-Key: i=Frank.Li@nxp.com; a=ed25519; pk=I0L1sDUfPxpAkRvPKy7MdauTuSENRq+DnA+G4qcS94Q= X-ClientProxiedBy: PH0PR07CA0072.namprd07.prod.outlook.com (2603:10b6:510:f::17) To AS4PR04MB9621.eurprd04.prod.outlook.com (2603:10a6:20b:4ff::22) Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS4PR04MB9621:EE_|DU4PR04MB11030:EE_ X-MS-Office365-Filtering-Correlation-Id: a5e3c3ce-a861-445e-4e0c-08de260b50ff X-LD-Processed: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635,ExtAddr X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|366016|376014|52116014|7416014|19092799006|921020|38350700014; X-Microsoft-Antispam-Message-Info: =?utf-8?B?QXdhczhoMjJ4dHNHNnVFK2t3Mi9zNFJXaExCOFdzaHY4QVNGb0JGbEladHdl?= =?utf-8?B?cVBLa052bGQ5d3dZL2w1d1g3N3daRjNuVm9Kb2Q5NzYzWXFScHVlVkhMNVVo?= =?utf-8?B?ZzhVdENGRUxIRnpqamNGMVErT1dvQUE4MXRMTFpEL0drVS9rRi8rS2tLZGFm?= =?utf-8?B?ZXg5N2FVRTliMlY0YVlTaExVUGZycUJncDczZlBjWTk1R25kZTBwK0ZoTmtK?= =?utf-8?B?YVY3cU9iTithR3VLSFFsSEtrNTIwR25PYVcyeFhBTVdBcDRvYll0Y041d1Fn?= =?utf-8?B?cmIweWJ5c2NVcG5JR1RGczNWR2o1SVBaTHUwYVhObXM2YU1WdUVhNllBUzlv?= =?utf-8?B?WWNFZXZGS2lleEpQdkVHS0I1Uml1cjdtdzRxOXVibXBpQkh3ZDBsa0lZK1pU?= =?utf-8?B?VU5zVWFwd3M4UHlwK05qak43a1A4RnhiclErWXhLNEtmdU5iMkVIOEFJd2U2?= =?utf-8?B?NnY0d004Q3dsUjhOT3ZUUktvd2o1Szc5Y2J4ZHZLc015eXlQbldNYWNYQ3Ja?= =?utf-8?B?dmZZbUhhRHBWa1UwVDJ2bGNlK2NqWmFxTEQ0WFF0Q3VhSkErcnBEZlpKK001?= =?utf-8?B?RU5acWxLRUdqN2Q3ZVRqdHNSZkx4VzhoOURGTjNzZEVRR2NQK0ZCc1FkRHV0?= =?utf-8?B?WWVJR1VqWUZ0WTJ3bGpqbndnMkI3ZDVnMFVkR2t5MXZEUlIzTUhTTmFYK2xi?= =?utf-8?B?MTREMjZwZEM1UDVHUnp1N2tEb1dJUlJkZ0NoNGE0ZlhhSU5KcUhHM3lCeXVv?= =?utf-8?B?a0dEb3Y2b1FISzZ3MVJWSmp0SXBVcHcvcHNFa2hiekJScktFWlpFUVRKOEdZ?= =?utf-8?B?SU44K2ZUMWNtT0xjR1o5cUlOTmUxZEN4aVViL1d4UFNEOUdrWDcreVJscDdX?= =?utf-8?B?aTZUODNuQU5wc3NCK09HcHlNazlHTS9zb1BzME15M25ETjdLZWpKb1NMNXVp?= =?utf-8?B?Mlhrc0FCQTEwRHZsT0dQOUVWWDgyb3BsNUFxSy9Zc29razRMVDJFc2cybDhG?= =?utf-8?B?NEJ4QndCS012RlRkaWEwTGpzYXorVHU3cTlZT3JmNURVVTBhN04xenRWS3Zz?= =?utf-8?B?MDhIN1czSmFsaitqdytsclUwUDl6M0loRTYwbVU3RE5KMmhRYzhYZUFRU0tR?= =?utf-8?B?dE1qZEo5d2RtV0lsdTA5ZnNKcW9RNUJ0Snk3NDBveGI4NytCNGZiQWJpTU1U?= =?utf-8?B?REJnZHVyYVZDUVNLcFZsTmt5ZFlSNDZnbWU1S2VXWjVDT2FiNVRSZWVXRVht?= =?utf-8?B?alZTSVRhdHNkYUlMYVNaOUZyR2drVUhsdTNRd1BOMjJOUmRVdTV1VG9rTGtp?= =?utf-8?B?RzFnWnFPWlErUVBOTkhWM3lnLzZrUmg3VkFobEZmVjNVNGRwWVVFMCtlOWZa?= =?utf-8?B?c0hNbWJLYW1weEpPZHU2KytVaG5UcVFuQm5Ib0R4Z0ltNVorY1pSTk5ZaFpP?= =?utf-8?B?WG1odEVSZjIvbEgrWnBsVTJGekZiK3o0cHYyNi9LbS9PRTRiZkFFZVZLM0Q0?= =?utf-8?B?bmlHVjN0V0tYTFAxT2tQbHNsY2F6WUkxOHpYUjlzRTNhbnVZc2twcjhvcWpF?= =?utf-8?B?eERNd2Z4cUR3a29jR0RrTGhBK0pLZU1xcEl3UDlIM1BRODVoRU1KaTQwK1ND?= =?utf-8?B?TzlJZ3crWWEyV0dreG1renFIa1pvdnRhYWRJYjNyRGxQSHZpOWNVd0pyTFkv?= =?utf-8?B?NHJXazNlczdycEIwb01ZVEovdFg1Z0lLK1BBVVlhVGY1VEp6eXd6dFE5NG9n?= =?utf-8?B?Zk9WUlhWTi8yMlQ4SitGSVRWYm9QNnpWNzZObURLU1dKNFFzS09wMVZMQWx1?= =?utf-8?B?Y25Fek93UG1uN2wzeXFzem9MMkdUVE8zT3A5dkhiYlZnVkxrRFZWQmNhdHB4?= =?utf-8?B?amhHVkxIaDZQNUd2NjFmQ2NRUnNHT3k0V09pbzdHZVZTZnZwblBKMng4Vzl4?= =?utf-8?B?ejVRYmZINzB1MWpkcFR0VkVTVmVmczhRbWdvNHNhTlB0MDBqM014VlNkb05F?= =?utf-8?B?M2RmRG9YZ2p4a3dIdzRrRkRTQkhHejRmU1pDdmFzV3kzb3R4VmdaczBOajdr?= =?utf-8?B?S1N5VGZCMVpxcVF1aGV6RzVaQThVTmZpT0V5dz09?= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:AS4PR04MB9621.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(1800799024)(366016)(376014)(52116014)(7416014)(19092799006)(921020)(38350700014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?dE0wMGJoRlBWWjNPRFFkZFdsb1U5S3ZXL0tiZGhTMlRRODNNWDNOTW5YbDVs?= =?utf-8?B?RzZIY3pGM0g4aXppTXdEVDBDM204cHhFNG9TZlhHazZzTEdqUEgzUzRma25s?= =?utf-8?B?T0dwY1pEb2xmL2I2S2RnQ1VIRjNRL2VTK0Nod0dxNkhUNFlUWmFFQkFCUDhE?= =?utf-8?B?Uzd1TlAxZHhOYUczVUpBNk9KZzJUZkkxOXRHekVLNVNUQ2FSM0dhaUZtNnZx?= =?utf-8?B?TE44ejRCTm5TM21DSlAydVVXamM5RFRmVm0wNkpmZXZuVEFkeS9hYlVrUlBC?= =?utf-8?B?RmU5dDdFdTl3TDQ4YWlTdnpEOE80SnVsRzgyaFUyQk5UaDdyaTVCUEtvL0Ro?= =?utf-8?B?VGVLQlVNK1YwTVgzK3JUWmd6ZkVPZ1dmZWxZdWlqcTBhMm9TbFBVTnhhcmpE?= =?utf-8?B?VFJQd2F5c3l5eVBTVy92ZEt1WFE4VWhyb0VuTFd4OUZab3BMNGNSeUFXT3BJ?= =?utf-8?B?bmYrNWZpT1d2ZWtmdXd2dUhxZDNhMW02VzRYSUFHenhzRWJHRXNOSTNnbFVa?= =?utf-8?B?T3JMTzV3cjNnU1hLU1JHT2hMRlg3MXRJWmUzL0IvTUZ3YmIyYmNzS2pua01u?= =?utf-8?B?RG1mOVVNRUkzdW1ucCtXc3VFaVNIYXN1aWZITzl6dUU4VnJhL2lsQUFwamtp?= =?utf-8?B?UzRocm5HT09SanRnTTJ3U2NTNExhWW9xYVZSV1N5YUJZOWpSejJ1WTFJcG5l?= =?utf-8?B?ZU1mb1RxNmR3WEJESXpubkgxYkhzdTNZcUZBdFB1NmQ0ZkdyYTNqZnZncWhJ?= =?utf-8?B?RVBaY0E1YWNrREZVMWQ3SEFwcWZadVNLWUlYREhrVjgvcE5WME5aTWpKWHFs?= =?utf-8?B?M2ZPSk13WDRLRFJLaE95czl4Y1hCdVRQaUJLek5BdEFZWVNiZGhrb0pmTjgv?= =?utf-8?B?aDV0cCtseG5iY2xDbVVqaGl1ZnJVT1FmOGpvbTFKcDArK0cvK1ViVklNKzJs?= =?utf-8?B?YmVHTjgwNEN5WVgzNkl2SjVRRGVsRi9xVlp3Snh1UjlwcFBMck83MVlzVjN6?= =?utf-8?B?ZVZzSzdJalZCZXIwSGNxeVdZUFR4L1cyamM4MkhQMHVLUDBsYWsvRllienFy?= =?utf-8?B?MzlBNDcyN1BlbTFwM0FOV3F3enVCTVlaVGx4V0k4dEJPREl1TnkxT0ZZdTBn?= =?utf-8?B?eEhVUENEWnpwQWxOZ0p1RmNYMCs1NHZMYk5NelRjQjRTeWd4eC9CU29TcnMy?= =?utf-8?B?ZXJ3cmlIUlhWd3B1dGRzTnhDdVJvZWFCejdlQTNoMkVpbG9WaC9mTzFWaXRh?= =?utf-8?B?S1pNd05OVjF6TnZReXhWelpveEQvcXB1UER4OVBzbGs5MGlrSkNJNkEwR2J1?= =?utf-8?B?ZUI4RVNNVzFCa1l5TEEzVlgzbWxtVERienNDMzBhR2V6S0ltQUNkT09qbkkz?= =?utf-8?B?emwraVhaUEYvcXRNcFdNbTlPSVovWmprcHZHSE4vcTFZS2pvaTZ6eHVPSzhj?= =?utf-8?B?QUg5YkI2R1NiRTM2UTUvM2ZwZUF3UG1JYmxSeENFZ1k5Tk5CQm8veFpCdENG?= =?utf-8?B?TldmaGpVUkpKYzJXdUVBaDNTZXpla2FBbzRmT3Y4ZThEK2d5RGJQMTh1RFVU?= =?utf-8?B?c3JpSzFMTjVYN0pRdURXNEoxY256M1ZMai8vaHJLcFl5U3JqMW12cXgrck90?= =?utf-8?B?aVlqMWRzTlpOckxUbEhYQnBGV0RVSWlSWDYyT2ZxdmRzWDJPckpQOEh1Nklq?= =?utf-8?B?SjNpV2tyUzFPd3Q2eEdtR1lHbUNZKzVvVXpOOEJjSHp1c1BSUVo3dkVodGF4?= =?utf-8?B?bnV2SVMxSk8yS29Yd3g1bXNEMVB3SGxwWktNdkI5T1Z3NlJZK3FTdWUrbzFU?= =?utf-8?B?b0p0VDBkVGFWeWhwOVJTd2VZRmQxeGhDbVBJRC9vMEhZcUxHZWxRVXUzTVVl?= =?utf-8?B?bEJrR1Y0emJFdEx1NDNJVXY0cjltcDU1RkdMQ2V4bnNkZjhpekZWWnBxbUla?= =?utf-8?B?SDFBOFg4Ni9yV3VvNUNSRVBPMDQ3NWFHVXF0RkVGd0RCZEh3dGVNWEh2Mlpi?= =?utf-8?B?NTY2Mk9UOXZCamNodWtFT296YnpMdC91MVl3bXgrZlRSQ2tjaXF0UlZ2Rkkw?= =?utf-8?B?Nkc5V20wZFR3NXVWa2pKRkovbzJlM1QxNjQ0WEN0cytnVkVyWHJxTlJlYUdj?= =?utf-8?Q?DCLZzusMEbh51KIqajthEhc5W?= X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: a5e3c3ce-a861-445e-4e0c-08de260b50ff X-MS-Exchange-CrossTenant-AuthSource: AS4PR04MB9621.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Nov 2025 18:58:38.0032 (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: /W0J2ly+y3jThEPSd3NTaA7+HM9toV0UisSwujLOhbvTkQSMaWRAeHIs0KDXQ3HolvtRJGZS0U6oUS90KB+kVw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DU4PR04MB11030 Use devm_mutex_init() simple code. No functional change. Signed-off-by: Frank Li --- drivers/media/platform/nxp/imx-pxp.c | 5 ++++- drivers/media/platform/nxp/imx8mq-mipi-csi2.c | 11 +++++------ drivers/media/platform/nxp/mx2_emmaprp.c | 7 +++---- 3 files changed, 12 insertions(+), 11 deletions(-) diff --git a/drivers/media/platform/nxp/imx-pxp.c b/drivers/media/platform/= nxp/imx-pxp.c index 3f9a67a6bd4d268841f85f9b69af03138300d188..32d39c8013c7eef1f9629f971cc= 74afecd463ac7 100644 --- a/drivers/media/platform/nxp/imx-pxp.c +++ b/drivers/media/platform/nxp/imx-pxp.c @@ -1805,6 +1805,10 @@ static int pxp_probe(struct platform_device *pdev) =20 spin_lock_init(&dev->irqlock); =20 + ret =3D devm_mutex_init(&pdev->dev, &dev->dev_mutex); + if (ret) + return ret; + ret =3D devm_request_irq(&pdev->dev, irq, pxp_irq_handler, 0, dev_name(&pdev->dev), dev); if (ret < 0) { @@ -1831,7 +1835,6 @@ static int pxp_probe(struct platform_device *pdev) goto err_clk; =20 atomic_set(&dev->num_inst, 0); - mutex_init(&dev->dev_mutex); =20 dev->vfd =3D pxp_videodev; vfd =3D &dev->vfd; diff --git a/drivers/media/platform/nxp/imx8mq-mipi-csi2.c b/drivers/media/= platform/nxp/imx8mq-mipi-csi2.c index 371b4e81328c107269f89da23818ab0abd0179da..0851f4a9ae52d3096f454da643c= fdc5017e000b1 100644 --- a/drivers/media/platform/nxp/imx8mq-mipi-csi2.c +++ b/drivers/media/platform/nxp/imx8mq-mipi-csi2.c @@ -1033,15 +1033,17 @@ static int imx8mq_mipi_csi_probe(struct platform_de= vice *pdev) =20 platform_set_drvdata(pdev, &state->sd); =20 - mutex_init(&state->lock); + ret =3D devm_mutex_init(dev, &state->lock); + if (ret) + return ret; =20 ret =3D imx8mq_mipi_csi_subdev_init(state); if (ret < 0) - goto mutex; + return ret; =20 ret =3D imx8mq_mipi_csi_init_icc(pdev); if (ret) - goto mutex; + return ret; =20 /* Enable runtime PM. */ pm_runtime_enable(dev); @@ -1068,8 +1070,6 @@ static int imx8mq_mipi_csi_probe(struct platform_devi= ce *pdev) v4l2_async_unregister_subdev(&state->sd); icc: imx8mq_mipi_csi_release_icc(pdev); -mutex: - mutex_destroy(&state->lock); =20 return ret; } @@ -1087,7 +1087,6 @@ static void imx8mq_mipi_csi_remove(struct platform_de= vice *pdev) imx8mq_mipi_csi_runtime_suspend(&pdev->dev); media_entity_cleanup(&state->sd.entity); v4l2_subdev_cleanup(&state->sd); - mutex_destroy(&state->lock); pm_runtime_set_suspended(&pdev->dev); imx8mq_mipi_csi_release_icc(pdev); } diff --git a/drivers/media/platform/nxp/mx2_emmaprp.c b/drivers/media/platf= orm/nxp/mx2_emmaprp.c index 02d57229b9b3a600303cc0429e102139385071d6..384a2672884e96d17cca542ef51= fbef62328b66a 100644 --- a/drivers/media/platform/nxp/mx2_emmaprp.c +++ b/drivers/media/platform/nxp/mx2_emmaprp.c @@ -824,7 +824,9 @@ static int emmaprp_probe(struct platform_device *pdev) if (ret) return ret; =20 - mutex_init(&pcdev->dev_mutex); + ret =3D devm_mutex_init(&pdev->dev, &pcdev->dev_mutex); + if (ret) + return ret; =20 vfd =3D video_device_alloc(); if (!vfd) { @@ -878,8 +880,6 @@ static int emmaprp_probe(struct platform_device *pdev) unreg_dev: v4l2_device_unregister(&pcdev->v4l2_dev); =20 - mutex_destroy(&pcdev->dev_mutex); - return ret; } =20 @@ -892,7 +892,6 @@ static void emmaprp_remove(struct platform_device *pdev) video_unregister_device(pcdev->vfd); v4l2_m2m_release(pcdev->m2m_dev); v4l2_device_unregister(&pcdev->v4l2_dev); - mutex_destroy(&pcdev->dev_mutex); } =20 static struct platform_driver emmaprp_pdrv =3D { --=20 2.34.1 From nobody Tue Dec 2 02:51:16 2025 Received: from PA4PR04CU001.outbound.protection.outlook.com (mail-francecentralazon11013017.outbound.protection.outlook.com [40.107.162.17]) (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 A772533F389; Mon, 17 Nov 2025 18:58:45 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.162.17 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763405927; cv=fail; b=Ggkw5su9VqzDrTCmfYqMDdAmo6qdNVjUzmWtuhpurRDD4hVd04yhAsocTU4VZzS7j1qzX9pRT7hTunoelsL14jQRCON+wAufsoY7nzloa6WOqrfZAtIDLaxTNQdqLKtBkBTDF8GWU3hl2FCnf3UFwvD9Co19HYAwbhdDpYfey2w= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763405927; c=relaxed/simple; bh=JE+P4oB+UnzyXanBhPbuK5EKzK7+Fkb9G9SYPXUoyH4=; h=From:Date:Subject:Content-Type:Message-Id:References:In-Reply-To: To:Cc:MIME-Version; b=p8TFj0ttRDshXlmBJSXw8FPcTpjj1OFViIqeo82jhOxHO/WSUE6BG66XXtJ+hxEB6eW1hT3Qo1tPf3zUskihwwcEeaDzKhUQXp077HfK/V+m3D42L4tYwYqmYEmHGNx63BfEnZ5EkLLgOc5n6ScM2+w3i5bK2ShReatEzo6lXmA= 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=Y3URr+Lu; arc=fail smtp.client-ip=40.107.162.17 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="Y3URr+Lu" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=kHiMu523vvHZ2ULgN+Dcp4F33tB8LvDeISA1jyYqeHV+lTsmsYMIVOeITHkYLs35jcQmF7Df0rzb1wjqG/IVw8CGYJQrxdGy2rMoKyHQf1/ZK7LbvgwDD/8QT1RpAYAqrJEq4hN6aVwqgxLXwH+hedCuhoJnoNWHrb9GGTKr6HmM2Ix0+BXdqq2PrBlVQH9suwhGZYAxXZvtm7SvCRPb9KvmkNeAFiBiMPoBGiBIIk6dKRdyvG6Knmrws4hRMn5dFziO64EQi5phk6VIs7bteZ369WM7gK/SxaxCY5svBrcEaTViN0P6J+1K4iPksDb2qY1zFprKd30RjPDGwzeGVg== 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=Dnm1U+05I79lqjr77e6KfZzcrtkTKalmesBDf3GH5QI=; b=ppNnuE83vb0Vas0WuK42vmUMJhqX/r88B5qgPyTql6sOujc1d54puObMLL+WuOyrdkmcUbGMvaahsxtsO7i5w8EcregX9I4701OlzkmoKvKARjU1YqRk8YZq6hRK/GhwuXDh2sM/XEEgu0UFPUakbsYPEN3MUZI1ZWfQlC9PlxNEFHR3cSiVyL3Mg2KJLmTnzU6aitAj5iM2VeV/RdIAMvYM8zk8Ey10XCLvcL/bUpJpKPu4EAyppY+Y7LmlQUahIIbHqLgogtAjEDgYG2oo8LqB+fOcYtN35on/pkKkqKAGaEvUW1qvJJGl+Pe7hZE1P/a5kv0+rXNcxFv9XTOxtQ== 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=Dnm1U+05I79lqjr77e6KfZzcrtkTKalmesBDf3GH5QI=; b=Y3URr+LuwMmqJc33VuDlULaWFGUjB2/y4NlK8HzP6KtEJK3zfMBL9kWUUyDF8XlN5Hy9qcPywhlNdGBKgmsf6czIensfTWWHQIbOFU44RMxo8crpJ43v2AJeXvnf7Sk5I5XIf5WfJh75Nfkc5xvhnYFEGu01naFYnowxWxSYRatW/LD9+uHf4qEjGD9JsxzUdBXdrctWZW+lfCvu99+biBmWn1nsKrNeaQX/chDaXeodHpjtSW+6Hb+kbZMLfVyJmH5zXPfkd4dpHJhXk/ze+6MbGsYT+P8Qb1BqtHMtVeEnrS5wmyvQm2Xt8ULgLbjAxg1s+1/z14AdQXYMyzEsBQ== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nxp.com; Received: from AS4PR04MB9621.eurprd04.prod.outlook.com (2603:10a6:20b:4ff::22) by DU4PR04MB11030.eurprd04.prod.outlook.com (2603:10a6:10:593::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9320.22; Mon, 17 Nov 2025 18:58:41 +0000 Received: from AS4PR04MB9621.eurprd04.prod.outlook.com ([fe80::a84d:82bf:a9ff:171e]) by AS4PR04MB9621.eurprd04.prod.outlook.com ([fe80::a84d:82bf:a9ff:171e%4]) with mapi id 15.20.9320.021; Mon, 17 Nov 2025 18:58:41 +0000 From: Frank Li Date: Mon, 17 Nov 2025 13:58:12 -0500 Subject: [PATCH 2/4] media: nxp: use dev_err_probe() to simplify code Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20251117-cam_cleanup-v1-2-6cd42872db79@nxp.com> References: <20251117-cam_cleanup-v1-0-6cd42872db79@nxp.com> In-Reply-To: <20251117-cam_cleanup-v1-0-6cd42872db79@nxp.com> To: Philipp Zabel , Mauro Carvalho Chehab , Shawn Guo , Sascha Hauer , Pengutronix Kernel Team , Fabio Estevam , Rui Miguel Silva , Laurent Pinchart , Martin Kepplinger-Novakovic , Purism Kernel Team Cc: linux-media@vger.kernel.org, imx@lists.linux.dev, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Frank Li X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1763405910; l=4352; i=Frank.Li@nxp.com; s=20240130; h=from:subject:message-id; bh=JE+P4oB+UnzyXanBhPbuK5EKzK7+Fkb9G9SYPXUoyH4=; b=OjG3Ikly1IMQd3r+WZb1ntX6sYCMtAyDtKP+y6H8kJRlhvaYHBKOYbvQDY7fcOwal3iRccoq5 rjbneGgwjm8C50e3azNeTstt3hHziQXmaKRpuek3p6isJeUSRPSkfac X-Developer-Key: i=Frank.Li@nxp.com; a=ed25519; pk=I0L1sDUfPxpAkRvPKy7MdauTuSENRq+DnA+G4qcS94Q= X-ClientProxiedBy: PH0PR07CA0072.namprd07.prod.outlook.com (2603:10b6:510:f::17) To AS4PR04MB9621.eurprd04.prod.outlook.com (2603:10a6:20b:4ff::22) Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS4PR04MB9621:EE_|DU4PR04MB11030:EE_ X-MS-Office365-Filtering-Correlation-Id: ce643d18-d005-4e2f-6863-08de260b530f X-LD-Processed: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635,ExtAddr X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|366016|376014|52116014|7416014|19092799006|921020|38350700014; X-Microsoft-Antispam-Message-Info: =?utf-8?B?anNBY0dYMWdMK2pZU0pjMUoxRVRnV0hSMVBwMW93RW9zcFRPV09yeUM4UnFT?= =?utf-8?B?NVRzYjV1eTlJZXJ0R2wzcXFRYzhuOHZzU2pPNnQ1UnlnbE9tV0RDMlZSa1RG?= =?utf-8?B?bUJnb2ZMQlV4MXZVQVpHMWtidnNCUkRFWmpsV25BTWJnQnU3NkRzVzF3QzdO?= =?utf-8?B?em52clo4TTVkS3hma1pQcXArSGkrQ2lvWWlHKzJsOXIzNURGVkhoQ05SRkta?= =?utf-8?B?TTBpS3pKWCtGeTJxSUsvWkhQd3FOMjhMb2VVa1hTSnF5cDUvaE9CZDFXd2RV?= =?utf-8?B?ZXdxcE05cHR6MkNyWDFHYVFOZGgyVjV2N1NibTFJTVQraTJRWlBwa29nVGVk?= =?utf-8?B?OElvQktGM1FRNEdZSXRCZnBQSUpZS3Q0ZVFjQThHYWZUcU9yUmp5b0pRUkNG?= =?utf-8?B?ZWFsaGZRM01SOWNaaUxrN1NobnBnallwdERzMlpubm53NHNVSkJpWit3N0Zo?= =?utf-8?B?OHJTZHg2OUR6dEVsRG1SbzJJZzN0b0txWUZWS0lrbDBTOUJXOTNGWjlWT0I2?= =?utf-8?B?WVNBUnBMNDBTWTNpODNnMVFDcVV2NmVwQkhpejRpd2hSN2RhMEh5ME50QlhH?= =?utf-8?B?V3hEb1pmSkxzemFKQjhHY3ZFTC94YlJ4OHFqTjVSTXVXcHFGYWpFRFRyQjVH?= =?utf-8?B?SDBuLzZrTm9oVWRNdjJ0c2FHL0lhVkEzY0Q3U1VzUng2RU1Ydy9wN3liSzRS?= =?utf-8?B?aHlkaStQZ0FKMUkzOWQvd01iZ3dhZ29IMUhtSXRmb090R0hmajRQZmt5ZjJG?= =?utf-8?B?ZEhNN0RpQXp1TmNPUGk0WWtxcU52ZmFqKzZaZklFbU5CL2lhenBxMyt5Vjdw?= =?utf-8?B?Zmg4ajBOWmM0aTNjTGQxWFdINnd0Uk05cVV2UitqNlZoZVIyUGRsS2dTT09R?= =?utf-8?B?NldycFBxQWgySmQ1ODFBNDBiaHRKNmV4aGU4dllMWDYvSTk4ZWdMY1JacDZQ?= =?utf-8?B?UUNZVlBab1hWbS9wR3dIeEhNbTllZWV3TXpzK04xY3BGUjE2WmtGcEtTWW5k?= =?utf-8?B?Y2RaRzFQL2gyM2ZXTFg4T0VUVnpiRzVHaERndG1iR2s0MmcyTDJaejl5dEhS?= =?utf-8?B?OEtUb0o3MzMvNUVpU1UyR1FpMEp1dmd2ekJTOU9jOXQ5T29mTHNKWm9vTysv?= =?utf-8?B?YlJTYlRVT285YjNJTU5LNGJTSHBFbjd3Sllsb0lWLzE1elZ6anJIeTlEUUJF?= =?utf-8?B?NDI5dzJhWS9kSm9tb1RKZ2VQczlrRFRtRGF2dFhxL3FJdG16cG5kcXlwbGVW?= =?utf-8?B?UjUycnRLbG0wUGpKbW8zaFQ5MzBudCs3Ymk3UXJJTXhibHZhU05uUTlLYlBi?= =?utf-8?B?azlmQ29WQkNMTzU5Tm5ScEdOcGJlMEs0OFI2NVZpVmRBbU11TnVmNGpmb3BK?= =?utf-8?B?TjQ3YXNkdTVWeW9JOFcycWJDenNVV1NMcVlYY3JUeFN2aVp1SXBuQWdHQUlh?= =?utf-8?B?UXROY0hscDNEU1JsZVhSYy8yT1BXdTFzb2RkU243Q2ZnL2hnMDdaTGFSckJp?= =?utf-8?B?ak9QNENtazlSNnZaWkJDSGRKTkY1dTd6R0ZUSHpFNEl1dDJXVlVzckN0eVhG?= =?utf-8?B?NWRjM0VDWnMvTWRWODVVZDY2dEZ5cHhYUjczM0tRdEhONnFxcmZBRUdsdUN1?= =?utf-8?B?MDIvM0ljZStKSmVrazhmUVdnUkwwMCtDQk9zaTdYRkdYZGpsOXEzS0VUUVBx?= =?utf-8?B?VlJCTitrMmpnNW5RNUFza2lDQTF1U1E0S29vUzUyQUpuWXFhakNlVU1DNW5u?= =?utf-8?B?Z0N2eWRVZGQ0dHVvZ3hzTHpFNnNEakU0eUVPNU5mTkJqWTNHalBUc09Vc1dE?= =?utf-8?B?V29jRDdrRFF6aXlwV1pYTGdacVRtNkJmR3BFWG0ycFQ3dnFYNjlEWlpTaTJD?= =?utf-8?B?UFNybDgxQ2svUEJhZTgvMStZV1pFWi9rdE5UL21MOHZGZE40ZkdhVUJFbUU5?= =?utf-8?B?d3c4SVl4UUVZQ0NudFpQVlhSbkpqWXB2a3RlNXN5VVpiT2ZyQ3J3bDAvZGNy?= =?utf-8?B?QnJKZmgxMFJhek55RktLMnlUbkl3SlM0VloxNGdLSXpVc2RsL08wNnprUUsw?= =?utf-8?B?V25WUEhoVStZT25HUGxuem5STldFNkxDQWoyZz09?= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:AS4PR04MB9621.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(1800799024)(366016)(376014)(52116014)(7416014)(19092799006)(921020)(38350700014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?OW05VDV3WldEZjc3TEwrTy9OWEV2QnM1VDZoWm9ud3NkQldWZHRFZG9VODFz?= =?utf-8?B?YVFJOThEVmJRcVRyQmFRblVhdVB0aUJNcytqd2hXYTNvekxjVncvbW1reGNV?= =?utf-8?B?L21mOGhWOGh0ZERFcXVDbnRPWjBRWk42SVBXSWMrcVlDREo2MWtyL3c2eXlL?= =?utf-8?B?ckZtaWtvQmRvTk8yaVJFY3dxYUZtaU9HbGZmQmVPRXRjUnl1TTZ5M2tZWU5V?= =?utf-8?B?c3FJS3VFYzMvNll0ODE2S1BEbk1vMW9VWEcxcjZVYWVEUnd5OUFGZkxaZHJz?= =?utf-8?B?QS9HM21ySHE2aFYrbHlYSndVUTNPdDFBYU1lMUxpWktMdWNjRGlxSlBUWEp6?= =?utf-8?B?U1ZjY21pMEc4L2EyRDg4VjdnU1pzRDk0VnMzdDFBdDF5dDRVUXU3VkVjcEpK?= =?utf-8?B?QVdRNkNGN3RreFpKUHB5cHZEZG1sRU56ZmQvakFQR1o3K3BLTUJObkhLc29r?= =?utf-8?B?U0FWNHh0S3JvNWVGOXJaWU5YdmZyVmlwNStqdWFRbVJwYUxBSFpKSlZoL0l6?= =?utf-8?B?b0tMOW9BRVYydGNKeUl3c0cxbVlZU1BYZVBMSUN5U0wzQXdkckgrV2oxY3hq?= =?utf-8?B?RFZoRHY1a0xoK3ZaODFxQUc2eFc2K1hMVVlvd3o0U3pyZVBBNk5JN2lGdUdG?= =?utf-8?B?L0JqbW5SNUdBRmd2dG0ydDdBZjJoVmJHL3pkUTZzdWhtNmlQek44VWYvUEtp?= =?utf-8?B?RENISHZVaVJTYWM2K2dyTE5GWCszdDRsWkN6TktPWW8vaWlwMmNpV1hVWXhG?= =?utf-8?B?aW1YRk9YTlRPMGpVTzYvWmJNVVdCUXpvMmNua3Qyekk5Y2JzTmxwYWRaSG00?= =?utf-8?B?Y1BudnNDbS9uQTVQNUk3QWNVcG9tUllSRTBUUnB5L1pwanVDbEd0TXhaRURB?= =?utf-8?B?aTJlMFVyY0J1MnRhWmNEZ0pmenJlUlZCa2ovYXA2bjBxTnNuNUJRek9wTkFX?= =?utf-8?B?NEhLSGttSnl5VUxWSjgrTHQraVJackNqMkRQclE2VEx3Uk5lRHFyWjJVMDF2?= =?utf-8?B?VHVjeHlvODhmS3BzeTBWWm9aQkNjT1NWcWc5S1VpS05ZcWxSK3cwKzBZbEFp?= =?utf-8?B?M3FiTms0Qkxua0lUNUFpR0IzN0FUbzlMYWJUZndXWWM5OStGbjdOZ002SDZw?= =?utf-8?B?VDdDUVlBcjA2L2QxUjUrR2NUR1NNaXBGTS9BYVVlMTB1V1VwQktUTEdjbU9Z?= =?utf-8?B?Y1dLYWpKYnlIeGFuRzgwS0kyZGc3cTYrdXU3V2lPOTRkM2NaM2kxMExCNkJ4?= =?utf-8?B?WWErdGNkMW1iUFE0ZlQyTjdFRWxuZ0NIMW5GVWErM3hSR2ZZdXpydk0xU1hG?= =?utf-8?B?MEdJQXFnb21EYTVKNzFLNVNnYmF1Q0FubEcvY2I2WjVPYmtvcnNYQytyL0dW?= =?utf-8?B?R0xLd25xOTZzdk1Zc2E3UVd1MEt6VVFHSHNGek5vcHh1V2R0c0lnL1B4MjZQ?= =?utf-8?B?amhzclI2eWpmK1RETk4yTDRva2VOaEpUdGhoSjhhcExkSGNGdG5Ca1Vzajl3?= =?utf-8?B?cHZuTiszdzEyY1Y1cU9QUXJjRHlDRHVWOEFrMmIySldFY09hVngxWTZOb2U0?= =?utf-8?B?MTBSZ1hwdXNlMXR6WDlSdmp3ZFI2L202Y0tOQU42ZHdwV01XMkI1Y1ZSQzR5?= =?utf-8?B?SWUzOWZPQnp0MjFGc0hhL3pBcmtScUU5c29oa1dJdXN5azBEMEdmNlQzNy8r?= =?utf-8?B?L1RmUWE5YjZJSHJId2lVdWp4R0U3K3BuaCthaDg3VmNlcjNHenREdDVlZ2hW?= =?utf-8?B?K0hybjhJNkRBaWp5eEZSV0NLczlCNXd6aXB5dHdQY3AyNzZ0R0NjL2JIYVVp?= =?utf-8?B?Sk5nSEJKcnN1MGpabUVublpBRDg1YlNnSzRTMG5KYURBOGRRQW9UV2N1WWF2?= =?utf-8?B?elhmb0xYR0ZDT1dvT0FUMDAwcUFBYk14MzlaNGpZMG9iZnN6Z1JiRzh6MnNa?= =?utf-8?B?TkpUSUpOWHhvWE0xalpSOVAwRHNWbWtENmI2UnBRZVY1eDRoUXZJSm9jMEZU?= =?utf-8?B?bDVzMHVhZjZET3U1YmptTzV2eGJCOUc1SWxzY3gzQ2wzRjBERkdGV2ZBcVJZ?= =?utf-8?B?djBUSldNTzB4VXczTmFOUW4zOU5lN2t4Y21YMnh2aW41YUpPd1BjTzc1Vzl4?= =?utf-8?Q?x/3JWeL/RXzXroGDbH8xoSRZL?= X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: ce643d18-d005-4e2f-6863-08de260b530f X-MS-Exchange-CrossTenant-AuthSource: AS4PR04MB9621.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Nov 2025 18:58:41.5139 (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: tgF8TYpvPVx0yApBg9fxZSlyDfTWO8XomeZ3vaa2efa9Q78sNEcu0CJZgMnWsJLyJACJTkqQsi0PXqjHnQ3zVw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DU4PR04MB11030 Use dev_err_probe() to simplify code. No functional change. Signed-off-by: Frank Li Reviewed-by: Laurent Pinchart --- drivers/media/platform/nxp/imx-mipi-csis.c | 6 ++---- drivers/media/platform/nxp/imx7-media-csi.c | 13 ++++--------- drivers/media/platform/nxp/imx8mq-mipi-csi2.c | 28 ++++++++++++-----------= ---- 3 files changed, 18 insertions(+), 29 deletions(-) diff --git a/drivers/media/platform/nxp/imx-mipi-csis.c b/drivers/media/pla= tform/nxp/imx-mipi-csis.c index 088b2945aee33731c565f049dd17721356300b84..ce93d868746f002c22e2f86b1e0= aa84ec1a76061 100644 --- a/drivers/media/platform/nxp/imx-mipi-csis.c +++ b/drivers/media/platform/nxp/imx-mipi-csis.c @@ -1547,10 +1547,8 @@ static int mipi_csis_probe(struct platform_device *p= dev) /* Now that the hardware is initialized, request the interrupt. */ ret =3D devm_request_irq(dev, irq, mipi_csis_irq_handler, 0, dev_name(dev), csis); - if (ret) { - dev_err(dev, "Interrupt request failed\n"); - return ret; - } + if (ret) + return dev_err_probe(dev, ret, "Interrupt request failed\n"); =20 /* Initialize and register the subdev. */ ret =3D mipi_csis_subdev_init(csis); diff --git a/drivers/media/platform/nxp/imx7-media-csi.c b/drivers/media/pl= atform/nxp/imx7-media-csi.c index 933a5f39f9f4c9b43ca8d2a1819d0145981266e6..82109e6884a4d931a84ef02e2bd= e41d0d7248511 100644 --- a/drivers/media/platform/nxp/imx7-media-csi.c +++ b/drivers/media/platform/nxp/imx7-media-csi.c @@ -2218,11 +2218,8 @@ static int imx7_csi_probe(struct platform_device *pd= ev) =20 /* Acquire resources and install interrupt handler. */ csi->mclk =3D devm_clk_get(&pdev->dev, "mclk"); - if (IS_ERR(csi->mclk)) { - ret =3D PTR_ERR(csi->mclk); - dev_err(dev, "Failed to get mclk: %d", ret); - return ret; - } + if (IS_ERR(csi->mclk)) + return dev_err_probe(dev, PTR_ERR(csi->mclk), "Failed to get mclk\n"); =20 csi->irq =3D platform_get_irq(pdev, 0); if (csi->irq < 0) @@ -2236,10 +2233,8 @@ static int imx7_csi_probe(struct platform_device *pd= ev) =20 ret =3D devm_request_irq(dev, csi->irq, imx7_csi_irq_handler, 0, "csi", (void *)csi); - if (ret < 0) { - dev_err(dev, "Request CSI IRQ failed.\n"); - return ret; - } + if (ret < 0) + return dev_err_probe(dev, ret, "Request CSI IRQ failed.\n"); =20 /* Initialize all the media device infrastructure. */ ret =3D imx7_csi_media_init(csi); diff --git a/drivers/media/platform/nxp/imx8mq-mipi-csi2.c b/drivers/media/= platform/nxp/imx8mq-mipi-csi2.c index 0851f4a9ae52d3096f454da643cfdc5017e000b1..75709161fb26a61239b94430365= 849e022fdc14f 100644 --- a/drivers/media/platform/nxp/imx8mq-mipi-csi2.c +++ b/drivers/media/platform/nxp/imx8mq-mipi-csi2.c @@ -951,10 +951,9 @@ static int imx8mq_mipi_csi_parse_dt(struct csi_state *= state) int ret =3D 0; =20 state->rst =3D devm_reset_control_array_get_exclusive(dev); - if (IS_ERR(state->rst)) { - dev_err(dev, "Failed to get reset: %pe\n", state->rst); - return PTR_ERR(state->rst); - } + if (IS_ERR(state->rst)) + return dev_err_probe(dev, PTR_ERR(state->rst), + "Failed to get reset: %pe\n", state->rst); =20 if (state->pdata->use_reg_csr) { const struct regmap_config regmap_config =3D { @@ -977,24 +976,21 @@ static int imx8mq_mipi_csi_parse_dt(struct csi_state = *state) =20 ret =3D of_property_read_u32_array(np, "fsl,mipi-phy-gpr", out_val, ARRAY_SIZE(out_val)); - if (ret) { - dev_err(dev, "no fsl,mipi-phy-gpr property found: %d\n", ret); - return ret; - } + if (ret) + return dev_err_probe(dev, ret, + "no fsl,mipi-phy-gpr property found: %d\n", ret); =20 ph =3D *out_val; =20 node =3D of_find_node_by_phandle(ph); - if (!node) { - dev_err(dev, "Error finding node by phandle\n"); - return -ENODEV; - } + if (!node) + return dev_err_probe(dev, -ENODEV, "Error finding node by phandle\n"); + state->phy_gpr =3D syscon_node_to_regmap(node); of_node_put(node); - if (IS_ERR(state->phy_gpr)) { - dev_err(dev, "failed to get gpr regmap: %pe\n", state->phy_gpr); - return PTR_ERR(state->phy_gpr); - } + if (IS_ERR(state->phy_gpr)) + return dev_err_probe(dev, PTR_ERR(state->phy_gpr), + "failed to get gpr regmap: %pe\n", state->phy_gpr); =20 state->phy_gpr_reg =3D out_val[1]; dev_dbg(dev, "phy gpr register set to 0x%x\n", state->phy_gpr_reg); --=20 2.34.1 From nobody Tue Dec 2 02:51:16 2025 Received: from DU2PR03CU002.outbound.protection.outlook.com (mail-northeuropeazon11011017.outbound.protection.outlook.com [52.101.65.17]) (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 A63C633F8DF; Mon, 17 Nov 2025 18:58:49 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.65.17 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763405931; cv=fail; b=K9UvLzjhk/fHZ391lisoS2OPgBXypc9MRSjvr6d+gvx+sVTOtDw69zD/hQQTeO3WVNA2p2CSMR6i85aSi2ijK1hNTA8vzTs9VsETt088sS6nBpB9D5XF+iDOZw91XOYFlryJQabM4itFehsdDAPpZ+HsFMA5OWPvH8M9Bd18Hto= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763405931; c=relaxed/simple; bh=grCQyCvg3WJlOSaaJek/zESbxo+7gl8Hbsp0Ig31L08=; h=From:Date:Subject:Content-Type:Message-Id:References:In-Reply-To: To:Cc:MIME-Version; b=BTDkiL6PfUtgM5p+7J8EXKR3an3nSPSVkgivFkJNytypoSw5wwtG9m+hhIuoGaEdxOKvCeH53L0LlaOdQXPPZMnRTP7RSrX2HjehF+Ld6X1cd+E8k634DO0OMALkI/lm3z8/2I7e02MpvINscK1UTKggfuNxlJXSHpsTC6HPIxU= 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=gHNi7jAj; arc=fail smtp.client-ip=52.101.65.17 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="gHNi7jAj" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=uyIBrWRKdol59Y/ONT6A4OmmQ5rOJXx2X7nbKnXqDX+DBUyNU84q4vH2ByaE6LEO7LrFjkjBg1pmEj2roZQrbFcPHekItd+zgmu/xKkZNxgPbRU6bapToY00sHmwMLFddPqNjt8HMt+yPjh1CapSJUhOGwvgBETdjI7PM/6fAseeoL+ql3dWcIXsMjJZYEWdN5uvDG3kvVUWJcPhODjiO3vWBe4vG1Lr7ZL2z1ZCXdKz5jy9O23IPeuWkPlyP7qdh3VQ91izpc/GxbwBG7/bcQX10JBCyCqn0QKAPeCZgxsWgPYfy1alJBPGAmHRpVaxMp7RszGGLuDNL6N3GbNuYA== 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=0uKo8yyQIFwaaspLreTnyvJGJ+r6TUa/sTX4zG4pUYs=; b=oOWA6WIfEJNLdthDVEG8y7va6COSo/MGXVksIqi3y4zfca83PaIKkxxEcOoStft6EmAv7JKjBrJrjiP0bWxYp7ke4JsqQ8Wd5Twompb2sATHNJCzjKsZF76hmBMjuAB1ZQanfzL9HjgvdPMTa4gGi56WOu8gnXDZNRYF+C9vaT8pDJVCQma6SpVYCrOpazRAC8vwdDrlZF3L0eGSgU4Rc91/pYJkhSZDNLImlFKNrbf5F5f5AJYzlGcR3tF86tMl59FuWugBxULeWYWfcOCotLPGNtIpKEfJsKu4FR9czfNmQUOaC9Dwvx2TWA0hfVBYeK89tJj9kqHP1TwmcGBcdg== 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=0uKo8yyQIFwaaspLreTnyvJGJ+r6TUa/sTX4zG4pUYs=; b=gHNi7jAjszYXbHWxw0B4NqrINAp6eYcuB/OrpbalpmhR6rn5jOCJa0Y5Hagjcy4wE/2tqhLYjBSQWUF0Ir+pcTUElXt2ed62LNCafOnqKE+5OwKOQsK9wsbZzqMFd71+wedUpc+QnDzFpy7bCTMax8jk7OuxGV+qNrj4DVdlIvTgT7rwYBUX3AG1cOlZvMDMdtmmLqT5YY1kIBy51TEnI0x9JLk6xgnFqLw0qwJdKHAt0JC8bARF9IhJ0YbwbZND+1yK4uqI7T3Q4GrRCBWeAD24/0TW5a/B3RYFwRDzeO3p67pv9DevZUf1/Bljbc0jsfn827vN3gO7PWUSb76+Rg== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nxp.com; Received: from AS4PR04MB9621.eurprd04.prod.outlook.com (2603:10a6:20b:4ff::22) by DU4PR04MB11030.eurprd04.prod.outlook.com (2603:10a6:10:593::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9320.22; Mon, 17 Nov 2025 18:58:45 +0000 Received: from AS4PR04MB9621.eurprd04.prod.outlook.com ([fe80::a84d:82bf:a9ff:171e]) by AS4PR04MB9621.eurprd04.prod.outlook.com ([fe80::a84d:82bf:a9ff:171e%4]) with mapi id 15.20.9320.021; Mon, 17 Nov 2025 18:58:45 +0000 From: Frank Li Date: Mon, 17 Nov 2025 13:58:13 -0500 Subject: [PATCH 3/4] media: nxp: imx8-isi: use devm_pm_runtime_enable() to simplify code Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20251117-cam_cleanup-v1-3-6cd42872db79@nxp.com> References: <20251117-cam_cleanup-v1-0-6cd42872db79@nxp.com> In-Reply-To: <20251117-cam_cleanup-v1-0-6cd42872db79@nxp.com> To: Philipp Zabel , Mauro Carvalho Chehab , Shawn Guo , Sascha Hauer , Pengutronix Kernel Team , Fabio Estevam , Rui Miguel Silva , Laurent Pinchart , Martin Kepplinger-Novakovic , Purism Kernel Team Cc: linux-media@vger.kernel.org, imx@lists.linux.dev, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Frank Li X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1763405910; l=1751; i=Frank.Li@nxp.com; s=20240130; h=from:subject:message-id; bh=grCQyCvg3WJlOSaaJek/zESbxo+7gl8Hbsp0Ig31L08=; b=fgYIPxv2W9rI4C5s9cWkZMDePsQvNUf6LyzmzPTCKoXb18u2/t3QAK1Xo0tPlpzx5mG8NlMZn Pbco6vMHjunBzWVj37ibi9dkDulvbTmVjjpmGE+nVZTTTICbl2WX9EH X-Developer-Key: i=Frank.Li@nxp.com; a=ed25519; pk=I0L1sDUfPxpAkRvPKy7MdauTuSENRq+DnA+G4qcS94Q= X-ClientProxiedBy: PH0PR07CA0072.namprd07.prod.outlook.com (2603:10b6:510:f::17) To AS4PR04MB9621.eurprd04.prod.outlook.com (2603:10a6:20b:4ff::22) Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS4PR04MB9621:EE_|DU4PR04MB11030:EE_ X-MS-Office365-Filtering-Correlation-Id: b55777dc-a967-4b54-4e28-08de260b5526 X-LD-Processed: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635,ExtAddr X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|366016|376014|52116014|7416014|19092799006|921020|38350700014; X-Microsoft-Antispam-Message-Info: =?utf-8?B?QjQ5UlZLOS9sczJFNHhZTTdWZXJKaUM3L25yTFFTc2hRd1FPaE9NVFNiZEFO?= =?utf-8?B?eFNZRzNMbCt1TWs2UjEybnBXZ3U5aUZxeGRwKzByNlZGTUE1aC9EMGRGN2Zk?= =?utf-8?B?WmxpVks5UTYycEczMlJ1V3EyUTcyTlg0SlFJZnhJUFE4Y0p5ZjI1S1FYaW9D?= =?utf-8?B?SGRuNUI0Qmh2b3VZLzB3WlhZeG1TSEdZMWo2ck12OHF6eUxhcVZ2N2ttVml0?= =?utf-8?B?VENLSkI4VGdHLzQxazE4cVlBdUxZdGVMeDVIS2pVN2FWeEJiWGM1T2V3am1S?= =?utf-8?B?b29KZnlrQmlMak1JWGYwNkI3Ky9tUlBkQVhPVm1rNVdza0IzT053bmtJR2Nq?= =?utf-8?B?MU9IMW9hOTJua2Vkbm11aFZ6VGRydU9Tc2U0clRaRDd6ajJMQTJTMjl4OCtu?= =?utf-8?B?cERsVVdQM0tlcldUUEZqZW40dFlGMThtc1JHZDZFelVNbUVQMFliYklPTUpw?= =?utf-8?B?VTBzZjN4ME80a2s1VjlSRHBWcUFyb2VFaEJwdFBISVp4TnVVeVpQcnVjdDk5?= =?utf-8?B?OUR2S1JDRlhsNkNOV0diRFREMkNZNGdEUnU2LzMvVzNvS0dBUEZycUZaL1JC?= =?utf-8?B?REFCYUlYV3AwaGFJS0xEa1ZyTkhqSG5LcllidDgwbW1TYUhhQXdVTndZenBa?= =?utf-8?B?Wk53NTFiR29jTUdXU0RscTEvQ29xdlR0UklKT1g2bW5FVWgrRzFCSWpIOWIv?= =?utf-8?B?LzVsM0xNQjJhdW1iOHpGYU5NMkc4dXloeFBtc1M1aG9KU2tQbTFEd3kxSVN2?= =?utf-8?B?ak52TVVYb1hQdWp6ZVd2bklNTFRaSlo1SlV5cnd4dWdleUE2bnVJem1CNHVn?= =?utf-8?B?S3Z0OEJGS0lFUDZEL2tOSklXZWx6cEs2ajJWd014T0k3Q0czNzlubElpNnpn?= =?utf-8?B?YnlRaWFQS3k4K0VxMDdubnBnZzBlMEU3clliSy9JZFJ3UWFlZmdINkdZS3lQ?= =?utf-8?B?QnQ3V2dQd2RsUmROWW1UeGxEaDE2TXRpM1RrYzFOVEZ0RDZ0L0FsaDJPdWkx?= =?utf-8?B?UXpEV1dkbmVLcmQ2b1hYakxFbXVoTHRaWU9FaGJ6V0JBdERaYnVsR0ZWdU56?= =?utf-8?B?YkI4VXNpeVdWemJVRU1SeHRqU2VUMld3Tmw4ZEJleExnS0VYdklLOUZ1LzVo?= =?utf-8?B?bkpLNXpMdW5qYnBvbUI0ejhzdlIzaXRMUjJCVUg2WmRxcTFHUjhpZU5HZG1P?= =?utf-8?B?TXVmM2dRTEpqNHV4WVlZV3ZZaUJBNHB3MklEa1pOeGQ4c3V5NkVDTXhRY1dB?= =?utf-8?B?NlgxRXhySGRqWGwzSkxjQ0RSUUEyK1lqb055Tk4ydWxiRTRhRFhsWk0raGVR?= =?utf-8?B?eUhzbnBkelpidk5FMHJJd2g0U3BlNXEyOFJWTlgxME9WWGVYUDRCbzRSQXQ3?= =?utf-8?B?T3pVVWxJQlRyb0RRMTFHTy9ZOWl5M3FQMEgrb1VqbmprQndyOWtESWN4UzJZ?= =?utf-8?B?NXBKUjNpYjc2Vlp3ZjErZG44R2xjWkwzZzNDUkF6eHdiUmZVZ3dHZ3ZVWDZ6?= =?utf-8?B?RG5oWHhxdDl6S1FHRU1PQm9pODF1SHBLVW1BT2h2WDAvRlN6MmZYQlZIeGdp?= =?utf-8?B?OHhkYlNpUE1oVDlRWDVOR203UjUrRm5OQ21BVUdsSzRPY2l2MjhsR3J3RlFr?= =?utf-8?B?cW5lTmo5cS8wQTk5RVVuSGpEV2FNOTl2V05CSGE0M05iTEVXdlFBaEUzMlBp?= =?utf-8?B?cEtWdnMraThHeThMVjNzUXVzTTNqQkFuZ0JtUktxK3hSSnl5OUUwaEl4WU9F?= =?utf-8?B?cVplbGxlQ0NGalNad0tabE1wM0VPMTFPWkREVnRwMCtWNWFmSWp3VC84NWYv?= =?utf-8?B?eEFZYjhCRlFJMkZGNHcyOFdrbG96cDBkZjlEWmhLb3hQcWZXcXM2SGNMUGpL?= =?utf-8?B?Y2QzS2lhSlJaU1pWbmRVb2ZYa1E2dmhxN0tlRHpBamxWUEVUS200NnlmNU1z?= =?utf-8?B?ajJLd1FVaFhWQkNTUjRDT2tXSUZoZjNPcldieFdJN0hUNURjTytXUlVheDlK?= =?utf-8?B?bFBDblo1UHVZUWVNWjFYS0NDcFY3aXRTSUJ3WmhTeXBnaEs1YVBFdFBTVFl4?= =?utf-8?B?VkRpUi8wSjBTZmlIUlAvc2x6WHJkdnFMK0xndz09?= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:AS4PR04MB9621.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(1800799024)(366016)(376014)(52116014)(7416014)(19092799006)(921020)(38350700014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?Z3J1MDdLY0Rtc1dWVW5JMlU5MGNDZjZsVzNLUm10ZUxuOFhYRXRtU0l5ZmF6?= =?utf-8?B?Z0FhVHdqeXBOaEM3SXQwNzBPV3pIRENoNUErelBBV2p6eUgrMUxkdmszM2xF?= =?utf-8?B?eUZDc3A4RG9VbTFjVytxY0U1b2ZwMFNycVFOd2FJUHhDZnBRVVhBYzRDM0FB?= =?utf-8?B?eFBaSk5oeEpzZUtLeDJiSlhwdlUxKzNiNERGSStYL0MyQmQ1cDZZclFHekta?= =?utf-8?B?aUwxN1pPUVBMWkx1TFVJb1NyN21MTE11UzFaSzlhVHZlMVFqMmowWEsxRnNJ?= =?utf-8?B?dDhDU3Qxb1NmSkVLRXZTNk41RkpLaWFxM0c0RFFYR29zaUxDcXhoc3U2aXlq?= =?utf-8?B?VXBPN0NWdTlFZVQ2cTBYLzAxUXBMYTdOY2NYckpXVkZpYzAvb2FTL1NtYlU2?= =?utf-8?B?a1NRS2RldTBtQnNqMlVkU1h3Ty9WV3prb1B6bzdmbEF4RjZueVJtU21pd051?= =?utf-8?B?V2ZhRFArSnBDMHFreDduUnZGZy9uMS9qT1hGVit0Rmk3WGFacjJqZ0pqU1VG?= =?utf-8?B?enpwa3E2VDZ6QkdVUU1qcHgwUThvOFpOOTkwaFI2aVRIU3haZFZUQkIxMmZY?= =?utf-8?B?bTIvdHZPRk5PRjdhSWRFK0diS2pVcE5oVGlqbjVzb2tZbThiSzJueVVsQlAw?= =?utf-8?B?Rm1SQWh5cjVvRnlrYWwxNi9Zblh3cjBkWlRlOXVXbkVqT0NLZm1yblZaWmUv?= =?utf-8?B?WmU2dmZaVnJtVHpVVmJZNEZzeU5nMGQ3d1FaM29xZmpuNjJIWG92ZCt6S1dD?= =?utf-8?B?Z3lKQ09rcVFuTjhqblBuS0UzSzMxQmJTUmI3VTc2VDB5VVExSS9uZEo3QWE5?= =?utf-8?B?RG9nY0lUVHhvUll5blEyWWVUZnZ1eTc1ZzJKRC9XQm00Mm5ucFZLajJ6ckpH?= =?utf-8?B?eUxEdlh5WnhaVUl2a1dFZkpOVHA0YjBQWk4xeHdJdklHbWdVNmNaU0wzd0t3?= =?utf-8?B?RWlPYnJxNGFRSXVVNkpVckpSaWFncWphNVRzTHB0S1dvR25PQTB2RU1udDNV?= =?utf-8?B?K0pibWtsQjYxc1hVaGY5c3dydGpHRFZWL0tuWmJZMTRxeG9mN0lFdlhMR0ow?= =?utf-8?B?NVRoRHNLai9HK0EwUnhLL3crYU41ZlBDWCtCRXRraXVuay95OThTb29zMkFu?= =?utf-8?B?aEJIVXJYaTJYRTVpREdTRmFxVTBtQktVYjhGZG1IajJuRnJUak5mOWNrYVFx?= =?utf-8?B?a0RGV2gwaSs4azMvWWJ5RlR5WitwMmRvcTJPZk9DaGhYa2RtVVArNUpQTjdO?= =?utf-8?B?bVF1R2haUjlYSjVaS0xVSWZQTDlScmtPei9PT2FFM0daL1ovYnlVN2p1TmVE?= =?utf-8?B?amdEZ2RKeTBEU2thbjg0cEF2UDcrWWMxMzVuTkJOTGRic1ZRWXNzMDZYcENO?= =?utf-8?B?VlNISjlUREc4eDk1RFJGTXlpOGRpbVNDWlV0MXZiOUNiUUVMc2RsZ2tMZUdy?= =?utf-8?B?UE52Z0FMVWtLZTB2Q0RRVHVFekViY2IvSzVWRVRRL2FJSTArS01ZbDFKMWx5?= =?utf-8?B?RW1ZSjl6WFlNMmplb0ZiSzY5a1Jaai9wVGQ0VGJYTTdBOGs0YnhmclpGVmI2?= =?utf-8?B?RUdzV1RDUjg3M2JHVlRvZUVLa0E1SFNWcTNQUmM0OXI4c0pqZHpTRS9rSGI4?= =?utf-8?B?cHdPQlBFZytScThIcThSOFF5ME9BSEQ5YzFBbU1JOHhPQVRFZVJNS1owTU1G?= =?utf-8?B?TTc4VlBWMjdiREYwd3lELzN5TmFMc21jOHQwWjRzNFUzckNIbDJjZ1Ziakh3?= =?utf-8?B?bG1WeXc4U3pISkIvUzg3d20wSmhEdzFzV2JycVExM2VhcnhLeEIvakR5eTNa?= =?utf-8?B?UG1KVTZtUWRVYm5pZlBhakJ6RVVoZnBJOU5uNW9pZ1RBZldNblNUYUhMWnBy?= =?utf-8?B?RXZRczl2akMzQ0VxTThacHFBSFV6TkZZZkZkZVdQZWNJWjB2a1FUODVTL1Ir?= =?utf-8?B?VnM4YXhGTnl5NjBvQTJ2WFRDbFhhWitEMTVWaWNMb2ZWWlFqWXZhYmIyL0tM?= =?utf-8?B?MExiZCthcGlKbXk1QlF1RWJVTHBtQnQ3SWNnUE9WZmJtQ01MOEpveHF5bmtI?= =?utf-8?B?S1NxYVh5Zi9BVTR6cXF2OWgxREwzTFNaTWdxcElNZk5zQVRFeGlHOEJhZExr?= =?utf-8?Q?h80Rm+5Z8+4J/TtHrUryBMlEQ?= X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: b55777dc-a967-4b54-4e28-08de260b5526 X-MS-Exchange-CrossTenant-AuthSource: AS4PR04MB9621.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Nov 2025 18:58:45.0300 (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: 6GruYzw9V4BdQ/eVCap2wng2x+1OHdebE7l3e4q4fu+RpbKWBBL8Mpm6aNPDUn+P/xOUO7aIq7BuZ7r6cWUsmQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DU4PR04MB11030 Use devm_pm_runtime_enable() to simplify code. Change to use dev_err_probe() because previous goto change to return. No functional change. Signed-off-by: Frank Li --- drivers/media/platform/nxp/imx8-isi/imx8-isi-core.c | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/drivers/media/platform/nxp/imx8-isi/imx8-isi-core.c b/drivers/= media/platform/nxp/imx8-isi/imx8-isi-core.c index c3d411ddf492eb27b372763ce5d344a90c6ec524..a884976ac8f8295120c404941f7= ee19b90723924 100644 --- a/drivers/media/platform/nxp/imx8-isi/imx8-isi-core.c +++ b/drivers/media/platform/nxp/imx8-isi/imx8-isi-core.c @@ -499,13 +499,14 @@ static int mxc_isi_probe(struct platform_device *pdev) dma_size =3D isi->pdata->has_36bit_dma ? 36 : 32; dma_set_mask_and_coherent(dev, DMA_BIT_MASK(dma_size)); =20 - pm_runtime_enable(dev); + ret =3D devm_pm_runtime_enable(dev); + if (ret) + return ret; =20 ret =3D mxc_isi_crossbar_init(isi); - if (ret) { - dev_err(dev, "Failed to initialize crossbar: %d\n", ret); - goto err_pm; - } + if (ret) + return dev_err_probe(dev, ret, + "Failed to initialize crossbar: %d\n", ret); =20 for (i =3D 0; i < isi->pdata->num_channels; ++i) { ret =3D mxc_isi_pipe_init(isi, i); @@ -528,8 +529,7 @@ static int mxc_isi_probe(struct platform_device *pdev) =20 err_xbar: mxc_isi_crossbar_cleanup(&isi->crossbar); -err_pm: - pm_runtime_disable(isi->dev); + return ret; } =20 @@ -548,8 +548,6 @@ static void mxc_isi_remove(struct platform_device *pdev) =20 mxc_isi_crossbar_cleanup(&isi->crossbar); mxc_isi_v4l2_cleanup(isi); - - pm_runtime_disable(isi->dev); } =20 static const struct of_device_id mxc_isi_of_match[] =3D { --=20 2.34.1 From nobody Tue Dec 2 02:51:16 2025 Received: from DU2PR03CU002.outbound.protection.outlook.com (mail-northeuropeazon11011017.outbound.protection.outlook.com [52.101.65.17]) (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 F23DB345CAD; Mon, 17 Nov 2025 18:58:51 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.65.17 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763405934; cv=fail; b=eZs7Ab4SIZpV3In+L5fcWONGe843sYpfgeo9PLNOLWZUFkaRrU9I/y3l+7JVM48XY2nV1xUDPeXfxlm7JV9E4gk2ZDslK3koIT0wPvb2H/VANf2l/jbAC1bJYbu1yoCfbKajD9oHJjoVNWXhzrKlILfpwto1BmkiyMxyhWDvxOg= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763405934; c=relaxed/simple; bh=YNPqdD0kd3pdtCVRYCUxeHy5zguOY4Bm/pVnyP+rdV4=; h=From:Date:Subject:Content-Type:Message-Id:References:In-Reply-To: To:Cc:MIME-Version; b=hRfKWuINRFSNhw+RG5CV6yb2Uv4f/tbhAOVVabLyiN69PhdkulA1/ciSS3aRpmFGCiAnvrsJjdfpmTWXutITm4rJcW3JkqgCG+E/PR1Aee11uupRr+4yT3H1Ep0r0BPjyxqFXZ61mQeq28UUQno3aXIQ8itSeiLmvBbRE36WRAo= 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=Acskasg0; arc=fail smtp.client-ip=52.101.65.17 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="Acskasg0" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=hi1s0OwnmPmW2tRxBR/M+2JfHeSruZoyHhABCpEV/70fe1PrGnv7UtzieGFA7Hb3eylW+JYPsyykW9DHNCYfJpOWLnMuHi0SA6idDymIilCLuEYfONPhTlomUdEHe4E/rIAutoVnHqd0/TSHafNTAwXBITvFCs/BaqQ/INDOSeGJWVbM3BY9xpvEV269aR1uaZ6IsqQbAY0t/9IJxseMpToe81ngIgTVg9MGpSaeA4kullD8dhBU4wN27Z7V1ZMbyOKAthSORfBJx6butSu1iMt4glrr3zzkitJ4sdlJhE1PEtIYnX/hqs6mB9P57TExnH3fz+S5dydaeoa6n/4Q7w== 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=HD/yjQP86hb2xgIO8HmcLBuFMjM29JNMeVd8HfBQ2mY=; b=n56eDLr45BaWuKGncvBzkz/3kuSTwqgL8lbFWpsabUF//VomvIsMxkRLFXBa0KyjxB38iVZQ8spgLMt4gE3/ZNxsy4OUASfCDgcnb/LPCYmDlnSLNqV3SlQTM2yT9kR2yGDecUG6ybj8JPmato4NAwRNUNKFe0/pirWX+jBVd/iqULAJuXpv/X9I7HpCoNODCF+1W0ISAIy6Wojo+tGluhxMcrN5virI4dI1tFrckcqFoqQMcQKzf/Lv4MaPY1YEIqtSs7uSCmi1SLv9mLO8KI/2CqS+1k6qw4Vge1sFOGQl5HZIXr49vTzem/phajZc9pbo+9ghaW3xSX6b8eN9RA== 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=HD/yjQP86hb2xgIO8HmcLBuFMjM29JNMeVd8HfBQ2mY=; b=Acskasg012CcQJc2aElYjnjMlzFbrUHkCQQLvIDKVPk/veUdE7PuHaeCjdaP7MkfqWA3++ZzOck+DBuWtr5A+l8zwVvIvazsSFD9HPuajj7OwnYRdAYtkc+1AAfwXhbKnNInWaCHHLfF4oLIyarHT4VSlfuSrQkpK2h7oHcT1JfzCApGIf4X/7jThTpJxe02NOomwUNqT3TYg3VunXEvUn+f8qxwM2fAIZnkAM+bc16QOv3OTbOH4fDK1BzDEZ7onru8DmTytZghU3jI/42wEJOcn9A3O06jy1uq/5xo/o13F5x+M6lSNmnd5RnAvr+2i1wuc2JFGJnLVT61TSNVNw== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nxp.com; Received: from AS4PR04MB9621.eurprd04.prod.outlook.com (2603:10a6:20b:4ff::22) by DU4PR04MB11030.eurprd04.prod.outlook.com (2603:10a6:10:593::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9320.22; Mon, 17 Nov 2025 18:58:48 +0000 Received: from AS4PR04MB9621.eurprd04.prod.outlook.com ([fe80::a84d:82bf:a9ff:171e]) by AS4PR04MB9621.eurprd04.prod.outlook.com ([fe80::a84d:82bf:a9ff:171e%4]) with mapi id 15.20.9320.021; Mon, 17 Nov 2025 18:58:48 +0000 From: Frank Li Date: Mon, 17 Nov 2025 13:58:14 -0500 Subject: [PATCH 4/4] media: nxp: use cleanup __free(fwnode_handle) simplify code Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20251117-cam_cleanup-v1-4-6cd42872db79@nxp.com> References: <20251117-cam_cleanup-v1-0-6cd42872db79@nxp.com> In-Reply-To: <20251117-cam_cleanup-v1-0-6cd42872db79@nxp.com> To: Philipp Zabel , Mauro Carvalho Chehab , Shawn Guo , Sascha Hauer , Pengutronix Kernel Team , Fabio Estevam , Rui Miguel Silva , Laurent Pinchart , Martin Kepplinger-Novakovic , Purism Kernel Team Cc: linux-media@vger.kernel.org, imx@lists.linux.dev, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Frank Li X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1763405910; l=5050; i=Frank.Li@nxp.com; s=20240130; h=from:subject:message-id; bh=YNPqdD0kd3pdtCVRYCUxeHy5zguOY4Bm/pVnyP+rdV4=; b=KexX+ebW9GE8ZzA6Qww9rFGMcjivsRHvV0E0/6frp+iMypAUZANiNv8QkNAMiUIyghivV/A+r KiKjzFFtV14DS0TbapIbyhdOSF0Ik01evyprHY2y5cEDXfpQK1OLich X-Developer-Key: i=Frank.Li@nxp.com; a=ed25519; pk=I0L1sDUfPxpAkRvPKy7MdauTuSENRq+DnA+G4qcS94Q= X-ClientProxiedBy: PH0PR07CA0072.namprd07.prod.outlook.com (2603:10b6:510:f::17) To AS4PR04MB9621.eurprd04.prod.outlook.com (2603:10a6:20b:4ff::22) Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS4PR04MB9621:EE_|DU4PR04MB11030:EE_ X-MS-Office365-Filtering-Correlation-Id: f6bfda3e-eae3-4566-d7b0-08de260b573d X-LD-Processed: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635,ExtAddr X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|366016|376014|52116014|7416014|19092799006|921020|38350700014; X-Microsoft-Antispam-Message-Info: =?utf-8?B?SXIxc2hadnc1enUyU1orZ0R0R01veVV4THUxbXFTV2JucUQrdUEwYWlZZXBu?= =?utf-8?B?N2R6SS9iRit0S2FmR1hEMzE5VHBQUFhwVzJwcW1lWXRVV2dwNWFPd2lzRWdH?= =?utf-8?B?ZWdXSnRib0htZ0N0bWROQk5pV1FOQU9HYld3VGt4bFlvVFd3MFJSQU1zWjY0?= =?utf-8?B?SlZGQkxxYXNmaWJnaUt2T21rc0ZrUWIweElETEtmTGdPTzRpNFd6a1NNQ2Fm?= =?utf-8?B?Si9TL3Q5ek02SHVRQWFteTJCa3BSTnBQTkZkSkJnMnppRnhPdk43VWdmMjBO?= =?utf-8?B?UTFKWGFvSWwrQXdJQVZ6ZnNYRUNIRE9lcTluaXkvQjhlS3BncmRRelF2SUUr?= =?utf-8?B?cnBFbUdxdmZ0N0x6dmExWCt6ajY3S3l2c1ZmdDZuanJqVS9ZSklyKzAwYkVG?= =?utf-8?B?Y29KOE5GU3E4YjZkSEl4QUNhSGg1RW9nZW1TcGNLMTl6STV3eUF6M2V6bFF2?= =?utf-8?B?aGt5cUZvODNCRHFPN0t2VlZwQTZrckIzYnZNL1RtdENKYU5tdXc5OG9QYmtM?= =?utf-8?B?eHY3WUdTNXZYUjdOYy9zeVhQWnEwcWJ1cFFBTGVQVjB6STBvY2JFcTNXSVlP?= =?utf-8?B?MHF5Tmt6TmNld0xGRlI2dVQweERBRG5OZ3lCMHFXSWs5bVhCQ25pNEtoZTR3?= =?utf-8?B?UFE4OVZOUGpuSjBOR0I3TVlMSEZ6b3BZeW1ndjQ1dGdmRUhJTFVvZ2Q4amhx?= =?utf-8?B?aCttME9RWTdSU2pTSTJ2RXFPVlhGUmIyaTFaMkthVGlMV2VZQWFEK25pYlFz?= =?utf-8?B?Qm5JVWlGSnVuamhBWHFiNXRjTnRWMitVRzhCeDRIQlQ4RDZRSU5Dam5WUFpM?= =?utf-8?B?Uytic0cwZGI4MHAwdks5cHlGYXBWbGJZcHdkRE0yd1ZoMFI1NXVpMDFNTUlC?= =?utf-8?B?TW4rWkptY3FLblo3TFlpaDNTb3ZQWUZxU2VKV0xTcndVTjB4SWREMkZ1VjF1?= =?utf-8?B?cm9SMVNWQ0ZMYlVSQlFtL3luR3VJTm42ZzRycTBpQ2hXTllsRzBMWXlxTHVm?= =?utf-8?B?bmw0MVI0dVlKMEZhVytKSmphVCtDYkZnc3NXNkd6aDB4TUpTVXVQQU9ZTU1m?= =?utf-8?B?K3grM1ZwZzBaanYrakdvOW9XTUIxbzZsS2V2MmZQUnFrRmVWR2xkbXlwOGgz?= =?utf-8?B?ZUFQQTZhT3FSZU9GRUk0U3BJdG9yY2R3OGpPblByQ29BSnFkR2JKS0tkaDI2?= =?utf-8?B?aUhNMTY0dGxWS0IzWUhGOFA1WDJ2R0xXeC9DUWg2VVl0b1FJc0lzTHI1dm0y?= =?utf-8?B?OWJ5ck9PcWFsa0sxSW85V3hQK0pXTkI3MmdPVHRTdW5rRE1WQVMxVWJ0L1Er?= =?utf-8?B?MEZCNjNwSnJBUSs1VmdjTWdMeENUQ0FibFM4Wmx5THNkRXp6dzZiUEtFUGdN?= =?utf-8?B?QjhBTGYwbzU1VEJLSmZxb2N3Qi9jOHB1U1liTGJ0UWN1UGxiVTdhdGIwVXNQ?= =?utf-8?B?RElmLzlQNDR5MDdtZnlYaVdyWk1WV3JFdTAwVnFJWXBvWldoMHR6SEwzckVM?= =?utf-8?B?SUdPZHlUZzF3aUt0Mjl0RkVIRHRZd3NpZFRaU0dmbWtyMGhBQkI5WUdxdUJq?= =?utf-8?B?U1B5VlFTWHJ3amsyWnRIRUNMYi9IeXBvdW53ZXVoUXFaUkU3eUF2UUpnb2l2?= =?utf-8?B?dG5rSGhJN3JUTEZ4Ui9RVnpyUUJHcHcvWkpJNFVZeHZjQ09OWGtSaEFoRTNN?= =?utf-8?B?M0U2OTk0TnNaUDA0UEZLZ0JsWG56MjNRN2FXOGhqbUdlQ3RFQlVZaU5FQWhl?= =?utf-8?B?Y0RIUlVkSXNZdHpqdFNvcUdBMUw0OUt0aERDdkVyN283L09SQlNucGVoZ0pu?= =?utf-8?B?WWs0bUl6WEVmcTZVVG81SmMyclhKWVVJRUFUdzhDZ1BsK0dvM1NZbVFkY1lM?= =?utf-8?B?VkNoSFc5ZVNIQ04zOVJrNUxJa2ZKcmNGbDM1cWwzYlJtOUhhNUV1b1oyNDNx?= =?utf-8?B?dUVEZE9HMFZvNkhaK3NaSStwQlM3dU9pYUJPV3V0TmxwR2ZhYVBzaUFldlJD?= =?utf-8?B?eWFpdUE5NmlpenJrZnJXNHk2V2c2bDNKQ1ZLdDI0OVF4SGdaSTZaUklTWVJX?= =?utf-8?B?RVlRMUt3Um5IWU1PQkJIazBhVDlvVUVmQzJEUT09?= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:AS4PR04MB9621.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(1800799024)(366016)(376014)(52116014)(7416014)(19092799006)(921020)(38350700014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?c01RN2FxZ0VmTmp1TFhHVjUyVGIrRG41U1FtQ3U1bG14TFBySEtBSzlQTk9P?= =?utf-8?B?V2VaT21jME9SK0RFZGh1MFM0VlNYWkh2Tm1UeXhRS0Vua0Y3Q2N3Nnl3SHRS?= =?utf-8?B?Rk1Jc3NTYTE4U1ppUkhack5lV1Q3b1R5MlNrR21vcmcyUlpwQnRraHE1eFNv?= =?utf-8?B?dVJRNjlBbzBCTXdRNGJ6bHZBNEF1bEYxZk1kRXYyeUNmQUxBWit1aSt3RlRP?= =?utf-8?B?ajZ1S1FVWnJ4NjdZaEtiV1FNRmhpUzI4aDdub0luRkYxaHAxcU9VQjFCbVVi?= =?utf-8?B?NnNoSnpXcGZHYUFkWXFWS1pRblEraEdwMGx6dlg2dDJCUG1XWXRlSkxvVWdP?= =?utf-8?B?enFGVkdPN3dKVU9HaUI3cU5SaEMvd2RVc0xmenRHZTNmVDgzUUlZTWtCWEUr?= =?utf-8?B?bDlZdzVoYlQ3M2FmMm4wcGR0TmZIeGJmN2h3OTY0RmFEZllJeGJUanZ6Nm1Q?= =?utf-8?B?QlBGVWhaZzZMK1ZPeDZHKzN3VkR4a1RMZjRhZlc0OWxDL2VTdWtHajBRYUhP?= =?utf-8?B?N0k0L21LcDlpQllscXN3UndyZnlseVNNYVJMZThNN3I2bXlmNFcrL2pFL3ZW?= =?utf-8?B?UlNyUWtYWmVjbC9HQlpVVHR0SFNJVFh1RGpyeHVURVRucHdqOXVMQ1VRVW9h?= =?utf-8?B?RVRCb09iQW5ZeHd2ZVZ2ZXFqTlRjcFl4NS9LaVdTMSs1MXJzK0xwUmFvYlZQ?= =?utf-8?B?WldtQ2FPb2Ewek5aN0JQdUFLc2hnT0xBUWRBK0dhNnB2TzZNeTBvU21IYVBT?= =?utf-8?B?NmtHN3pXd1ZFblFkdUpnV2d6N2k4Y1JBMCtxKzBCejNERmxYTnpTSHdwVDdS?= =?utf-8?B?LzZFSkEwbkttTmRCSlFuSmlWamRraWxST0tYNTNuUFJJcTUzVElnd2t3NjJk?= =?utf-8?B?MXo1NEhUT1FHNTFhU3ZoZHcrcHR6WGJNZnVDSnZhYzI4b1Ruc3RzR2I1d1Q4?= =?utf-8?B?K1k0VU05ZHNhQTFPWnBLR2FRZS9MNVB3eGxDRzZYcHB5b1l4azJwN0d3NVBK?= =?utf-8?B?b3ZORVA5Q2hySVA4OExMVGlkb01ZWDkrc2E2RXY4SG9heUdNR2YvLzR2Unk4?= =?utf-8?B?VUpkL2JmVnViQmZVeElmZnhNTitXVSsxQmoxVUZVVWd2cDFOaVlDQXM3b3Az?= =?utf-8?B?RVFld3Uzem81MEJLY0h2S1JHRmhSZFRaWHozRndlRzg4K0NrUW0vZlluUTJv?= =?utf-8?B?MTVKSzJ3aHJXV3p2M0JSU1lIS2MwOXdGeURSL1A1bWwvSXd4bVVKYjFwVWdM?= =?utf-8?B?aTE2MEY3QUUwckR2UVVHYlA5dERJK2p5TXpDclRaR2tYRFNyNVFBNDduTmxL?= =?utf-8?B?Zzk3Si81cVpTR2JpNW9MaXNhaDdQNkxNMmxyRUo1NlZveTdvTDc3TjdQUnkz?= =?utf-8?B?THhZaFc2STV1Uk80Vm1OVW9UQ2ZmdHIvR1NDcDZmUHByR0NSTVZiWTBCSUJP?= =?utf-8?B?aU9aU2M2RjU1RnVRK1FBLzFRRm5vVktna3l5Rlp5ekwvOUFYc3ptY0Mzd0tX?= =?utf-8?B?VGlNZVEzLzViaHVvUWQwRlNBdXh1Vk5CWmVRNzZSclQyWjY4cm1HVWR6aThY?= =?utf-8?B?Z2kwVVljQXdhTmdaZnR1bzZHRnordHZkdndrL242OHV0VlJiU3JSTXZRQjhX?= =?utf-8?B?YkozZXFPVzllZHRZRW93cDlrMlBON3l0KzZPcWtSNWpPRXBNWXhFNFFGaHpx?= =?utf-8?B?TXNQL2gxZWVXaVA5YWpGUmhyYlovVzVNUWxKU0kvZmtDNG1vd2UxUjJjQ2dB?= =?utf-8?B?c1hqemNJZXpwMkZ1cTAwclFRNkVWNUhKQ3lYa2FiODFjdmFIY1I4LzZycHFM?= =?utf-8?B?R1Y1TnVGeUlWUmQzeTBqRzR2R3MyRUZ5SFZUZC9KVlkzRVZsRmttQjI2YzI3?= =?utf-8?B?SVgzOGdnckJFaG5seHZhcisycEY3SzVlMVJ5ZG1oemNMQzJZVktzclNneEV2?= =?utf-8?B?d2RicWtuWlBPaDViVkpJektqMmlHOUFseitzNG5lSmZVZmlEYXZneDFBeXR3?= =?utf-8?B?bWduZ0Exc21SM0pmMjRqZ1Z6SGd5blFjREpvaGxheEZUYkdCOFJDbXFBSzNH?= =?utf-8?B?TUpndG8zRVh5MlNQTm92S1JVQVNVak5tUk50ckhwdXMrWVpNY3MyVXZWdzhK?= =?utf-8?Q?4jLP94QrmobICLZ5DP5LecZsA?= X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: f6bfda3e-eae3-4566-d7b0-08de260b573d X-MS-Exchange-CrossTenant-AuthSource: AS4PR04MB9621.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Nov 2025 18:58:48.7629 (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: rBx5HzVg/udXTJOioGJatsDNRgy0NBo+THLpC9IQ4cPdhctbQERdLBHcYU/iBv1ywS3U3RT/zRpcRP92MUxIQA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DU4PR04MB11030 Use cleanup __free(fwnode_handle) simplify code. Change to dev_err_probe() because replace goto with return. Add missed "\n" at error message. No functional change. Signed-off-by: Frank Li --- drivers/media/platform/nxp/imx-mipi-csis.c | 31 +++++++++--------------= ---- drivers/media/platform/nxp/imx8mq-mipi-csi2.c | 31 +++++++++--------------= ---- 2 files changed, 20 insertions(+), 42 deletions(-) diff --git a/drivers/media/platform/nxp/imx-mipi-csis.c b/drivers/media/pla= tform/nxp/imx-mipi-csis.c index ce93d868746f002c22e2f86b1e0aa84ec1a76061..d924adb406a30797b66f0094ab1= 7e98ad44fefac 100644 --- a/drivers/media/platform/nxp/imx-mipi-csis.c +++ b/drivers/media/platform/nxp/imx-mipi-csis.c @@ -12,6 +12,7 @@ * */ =20 +#include #include #include #include @@ -1349,28 +1350,25 @@ static int mipi_csis_async_register(struct mipi_csi= s_device *csis) .bus_type =3D V4L2_MBUS_CSI2_DPHY, }; struct v4l2_async_connection *asd; - struct fwnode_handle *ep; unsigned int i; int ret; =20 v4l2_async_subdev_nf_init(&csis->notifier, &csis->sd); =20 - ep =3D fwnode_graph_get_endpoint_by_id(dev_fwnode(csis->dev), 0, 0, - FWNODE_GRAPH_ENDPOINT_NEXT); + struct fwnode_handle *ep __free(fwnode_handle) =3D + fwnode_graph_get_endpoint_by_id(dev_fwnode(csis->dev), 0, 0, + FWNODE_GRAPH_ENDPOINT_NEXT); if (!ep) return -ENOTCONN; =20 ret =3D v4l2_fwnode_endpoint_parse(ep, &vep); if (ret) - goto err_parse; + return ret; =20 for (i =3D 0; i < vep.bus.mipi_csi2.num_data_lanes; ++i) { - if (vep.bus.mipi_csi2.data_lanes[i] !=3D i + 1) { - dev_err(csis->dev, - "data lanes reordering is not supported"); - ret =3D -EINVAL; - goto err_parse; - } + if (vep.bus.mipi_csi2.data_lanes[i] !=3D i + 1) + return dev_err_probe(csis->dev, -EINVAL, + "data lanes reordering is not supported\n"); } =20 csis->bus =3D vep.bus.mipi_csi2; @@ -1381,12 +1379,8 @@ static int mipi_csis_async_register(struct mipi_csis= _device *csis) =20 asd =3D v4l2_async_nf_add_fwnode_remote(&csis->notifier, ep, struct v4l2_async_connection); - if (IS_ERR(asd)) { - ret =3D PTR_ERR(asd); - goto err_parse; - } - - fwnode_handle_put(ep); + if (IS_ERR(asd)) + return PTR_ERR(asd); =20 csis->notifier.ops =3D &mipi_csis_notify_ops; =20 @@ -1395,11 +1389,6 @@ static int mipi_csis_async_register(struct mipi_csis= _device *csis) return ret; =20 return v4l2_async_register_subdev(&csis->sd); - -err_parse: - fwnode_handle_put(ep); - - return ret; } =20 /* -----------------------------------------------------------------------= ------ diff --git a/drivers/media/platform/nxp/imx8mq-mipi-csi2.c b/drivers/media/= platform/nxp/imx8mq-mipi-csi2.c index 75709161fb26a61239b94430365849e022fdc14f..94882568405db55593c5c51722d= b2233a64d53e4 100644 --- a/drivers/media/platform/nxp/imx8mq-mipi-csi2.c +++ b/drivers/media/platform/nxp/imx8mq-mipi-csi2.c @@ -6,6 +6,7 @@ */ =20 #include +#include #include #include #include @@ -717,28 +718,25 @@ static int imx8mq_mipi_csi_async_register(struct csi_= state *state) .bus_type =3D V4L2_MBUS_CSI2_DPHY, }; struct v4l2_async_connection *asd; - struct fwnode_handle *ep; unsigned int i; int ret; =20 v4l2_async_subdev_nf_init(&state->notifier, &state->sd); =20 - ep =3D fwnode_graph_get_endpoint_by_id(dev_fwnode(state->dev), 0, 0, - FWNODE_GRAPH_ENDPOINT_NEXT); + struct fwnode_handle *ep __free(fwnode_handle) =3D + fwnode_graph_get_endpoint_by_id(dev_fwnode(state->dev), 0, 0, + FWNODE_GRAPH_ENDPOINT_NEXT); if (!ep) return -ENOTCONN; =20 ret =3D v4l2_fwnode_endpoint_parse(ep, &vep); if (ret) - goto err_parse; + return ret; =20 for (i =3D 0; i < vep.bus.mipi_csi2.num_data_lanes; ++i) { - if (vep.bus.mipi_csi2.data_lanes[i] !=3D i + 1) { - dev_err(state->dev, - "data lanes reordering is not supported"); - ret =3D -EINVAL; - goto err_parse; - } + if (vep.bus.mipi_csi2.data_lanes[i] !=3D i + 1) + return dev_err_probe(state->dev, -EINVAL, + "data lanes reordering is not supported\n"); } =20 state->bus =3D vep.bus.mipi_csi2; @@ -749,12 +747,8 @@ static int imx8mq_mipi_csi_async_register(struct csi_s= tate *state) =20 asd =3D v4l2_async_nf_add_fwnode_remote(&state->notifier, ep, struct v4l2_async_connection); - if (IS_ERR(asd)) { - ret =3D PTR_ERR(asd); - goto err_parse; - } - - fwnode_handle_put(ep); + if (IS_ERR(asd)) + return PTR_ERR(asd); =20 state->notifier.ops =3D &imx8mq_mipi_csi_notify_ops; =20 @@ -763,11 +757,6 @@ static int imx8mq_mipi_csi_async_register(struct csi_s= tate *state) return ret; =20 return v4l2_async_register_subdev(&state->sd); - -err_parse: - fwnode_handle_put(ep); - - return ret; } =20 /* -----------------------------------------------------------------------= ------ --=20 2.34.1