From nobody Mon Feb 9 01:12:09 2026 Received: from DB3PR0202CU003.outbound.protection.outlook.com (mail-northeuropeazon11010053.outbound.protection.outlook.com [52.101.84.53]) (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 844C730C613; Mon, 15 Dec 2025 22:50:20 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.84.53 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1765839022; cv=fail; b=aE1neLSjiFl1IVul/P5yR3gySvqOm3bEhmzCPg4sLXl5RfTEc4EkUj5Hgfc8M8tO5tSW4GNkuEFzgGo6PmlTdNLaaqTU4eMSeRC2jw84QlPVlJcK+Uzn4oxSf24djNuvknp2Ts8p/q4QCUyiyb/HoyZKu1f14xHZb/Nzv2kdnlg= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1765839022; c=relaxed/simple; bh=ARPVaqVAWLk1VA6S3ScOC7ebUNYLCY1YIOO8jKmKuaQ=; h=From:Date:Subject:Content-Type:Message-Id:References:In-Reply-To: To:Cc:MIME-Version; b=NSKAwTfy1NZSJCHU61rtWhpnsDP6+GYQ593NHvZmGQMbfl2G5r+joWFDgc88vxEjBMFe4ij7sFWVNOKZfpF9DuVXQecRlzgk3Jp858sVNeki/17gjQPqlylXXdHoijpkjdUeohpcJbFUstEniIHobcOL01X7AMuTj/79mQKvf2s= 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=a/iNkz7s; arc=fail smtp.client-ip=52.101.84.53 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="a/iNkz7s" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=u5g29gaYQ0HZCo0OBB1vysp5YwBYsLgxgmrTi68duAuTBkrQKzcAHgfL/NIzcpvA1NOiMjpBd6UzreB7zKC0wI9XW+R1tGy4vGxW2cOe3/7CJ7JEt4/Z5A9NyDoLG02P/yZbLTiMTliiAVArq1zsNOIISQFO/eBWpbR3zCBeEaA2nt0EUD1nCxWtQcAcMmjzKtbpwY6adljxGhqsKaL5mZ/mUIYzHJ1NGsSLc2MCWu1baCngFnpMOFFfDsnRxuNPGTNwtGXHgBUxAprYJjsrGZnVGQ8aQ2755cnNbIjDgksCxRC8yDlqskVq1f3I15jLpWyHETVImygw5UTfFXS5XQ== 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=q0N+DGZkLabHozQw+ikaHfBI4FXBjaUFdgCWXllisYWvLSGiWcg4i6dK5vBVkWjLdVpVJ9c4FohXsuUo7GpB8wx813JgotKyHdoEVImkl9Dr2HYEEeN/otns9ylMzPwE8DGrkAMQ394SJP+yohxjAYCpwzAnp+JcnwLI7LyGJAqvVxUPd70vjSGkvFyUyyy+cEjdoaG6MDWwqzXTIo7DA4tvtwaGLm0tO/88yqJNOTxnUfq87Sl0GkS/jMtW1etmwRwN+4jDthHeFjqEZb3u7ux4WANdPfPTUfF87oAwLRUD+PuUBrnCv1OI3BreKkUQWfgfdOTfVn9/C1Tpdhv2Tg== 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=a/iNkz7sY8u6o0GBuGzv6vhizQeyXUEG+lzXWeRKNvIRp/jFfRgSbK9Kx4LiFsGY4m4FoFzLq2+qG1cPcpshQ+ZlL7dyVWI5tQ6w9/E7W/N8deHKj8TPhUmJBPB4fJQsQ5nubLl81ion1yWDU3TFfvrrXfRW8KXXcBw/4b5hnRv2I9prekp4D31kKSyFEufYHV88CpctEv3oSI04tmlUfqM2c2Ssio4Je6aw0Rz4G02Z5KylmU4601oo20ARXB9KalkREUcl+lRB2nuqk7srOSutPsWCucLOvtosTN2AQmWKM8nE4PBkukO/mQ0OU86IeiQ9jTYmidNNvD7b9+FDaQ== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nxp.com; Received: from DU2PR04MB8951.eurprd04.prod.outlook.com (2603:10a6:10:2e2::22) by PA1PR04MB10794.eurprd04.prod.outlook.com (2603:10a6:102:482::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9412.13; Mon, 15 Dec 2025 22:50:16 +0000 Received: from DU2PR04MB8951.eurprd04.prod.outlook.com ([fe80::753c:468d:266:196]) by DU2PR04MB8951.eurprd04.prod.outlook.com ([fe80::753c:468d:266:196%4]) with mapi id 15.20.9412.011; Mon, 15 Dec 2025 22:50:16 +0000 From: Frank Li Date: Mon, 15 Dec 2025 17:49:52 -0500 Subject: [PATCH v3 1/5] media: nxp: use devm_mutex_init() simple code Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20251215-cam_cleanup-v3-1-a61995068f38@nxp.com> References: <20251215-cam_cleanup-v3-0-a61995068f38@nxp.com> In-Reply-To: <20251215-cam_cleanup-v3-0-a61995068f38@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=1765839009; l=3593; i=Frank.Li@nxp.com; s=20240130; h=from:subject:message-id; bh=ARPVaqVAWLk1VA6S3ScOC7ebUNYLCY1YIOO8jKmKuaQ=; b=1gWFoUZBEs5bYt//IN/CN8Fm2sL4mMzZqJJsf0or0zwShKEIu1bUTwkvHl6s4knV00uM28mtx OYjyyC2ouRQBUMjYhZA1cxHBx4bgktAgjvQ6m3zdhJyIac/wt7ouUsS X-Developer-Key: i=Frank.Li@nxp.com; a=ed25519; pk=I0L1sDUfPxpAkRvPKy7MdauTuSENRq+DnA+G4qcS94Q= X-ClientProxiedBy: PH8PR20CA0015.namprd20.prod.outlook.com (2603:10b6:510:23c::8) To DU2PR04MB8951.eurprd04.prod.outlook.com (2603:10a6:10:2e2::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: DU2PR04MB8951:EE_|PA1PR04MB10794:EE_ X-MS-Office365-Filtering-Correlation-Id: 42a68a17-7cfb-4d10-b322-08de3c2c5079 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|376014|19092799006|7416014|366016|52116014|38350700014|921020; X-Microsoft-Antispam-Message-Info: =?utf-8?B?T0ZEMDZmTWlZdUpDNnlrZHI2eUduMFc5R1lUcGticUpoSmlVdVZQcTVVWEFy?= =?utf-8?B?U0diWFNUd0xZdVBPWkxIYUhYcUh6Z0FHdlpLd093YzQyQktETERlc01vTU4v?= =?utf-8?B?QkxmQWRpcUdvbUlZNWlzMmtLbXF4MFdkOTcxWngvL2tKaUxITDZZSGFMQkhz?= =?utf-8?B?UEVvVnp1cnhLYXlDdGJWZ3Jyemp0T3JyR2JDcmxxWWdTc1V0ZUM4eE82RWE3?= =?utf-8?B?MzFDQkwzakIyaE9JMXZoaWdpcWRDVFFDcG43MTZmMTUxNGNQUE5qOGxTY1Mv?= =?utf-8?B?c0pRMFRmeXpianA1R0hDejc4Rm4vTlUyeXlicVdqa2FXa2RuN0diNVVoYVZr?= =?utf-8?B?TDhZeUZlRitLUU5MS2VCeVRiZUZSL29STEExN2pBbXpJWEtocmxMK3Z1NG9Q?= =?utf-8?B?b3lKc3RPVXBGMC9VNGVuamhHRVpGUHovU0VOZ05UQTkwUTBod0ZWcDhsK3hK?= =?utf-8?B?NDZ1UjNWZFFVSytSakhsMVJLZmN4c25mMmFGY0MySVNrd0c4Lzc2dHpVbkVG?= =?utf-8?B?RlNLUEk3ajYrbmFYVXRGbysvcE9LazlucHRpR083eEJDcDBsR3p6b2Q1VzBz?= =?utf-8?B?UHVwd2UwSUx2bUw0Z1FTYWdyejMwamUzMS9scEhNYjNJZC85R25sMHBMTURJ?= =?utf-8?B?L0kyaEc1dnFZaUhJd0lNa1E2N0hYZCs1MVZOQi84ZllKTFNHQnFVZE94SVhI?= =?utf-8?B?QWNGVFp6QjlCWXFIT2xsdWdVb1hCTG4wWS84eDFXVldoZSs0TVdDeEFuK2lW?= =?utf-8?B?bXIyZHRETjdFdzZxWGxjaTdLV2RrWm5nYmQxMjVyRHd2ZThvZ1dHamFTMzZC?= =?utf-8?B?SXQ1ZnZzdVVzMFB3cGxzT0xOVnZNT3JGU1JEell1cVRUemtHOVQ5NzNta000?= =?utf-8?B?Nk5lRFJDWmZiWHdXMDFzR0RrbUJTZW1hVlVlZjNCVlRLSzk2bTl6N3VMSGR3?= =?utf-8?B?RTFuaEtBQ3NScXdCUXVNMnRLcEw0N015eDQ0YUxBK1hIWXpWNmllOU4vUFJ2?= =?utf-8?B?d1JEWVNuRVFWMHhROGtMSVVjVXlPMXIvN3lZL0RMQ00vQlQ3TnNNeDFBLzda?= =?utf-8?B?SWljdDRReDVacmczRkxKN2hHVDNFL04xaEIrK3M0NFYvVmh0Z2dxdDV3SE1G?= =?utf-8?B?YzFCUC9YNUxsOWxGMTdvRFRReVp4enVKcC94S3Y1aU5ZMTJabzB4WnV2Qk9t?= =?utf-8?B?TGlxdzAzTnRtK2FrZU52b05KYjFFUmxRTEhwR28zWVUzQWpzNmtXTmVzR3RM?= =?utf-8?B?OGMxQXRMeDFnTWs5SVNVTm1EOWxZNDMxRUFkMy90YkExM0lHL3VQcEUyOURK?= =?utf-8?B?NzBqY1NZSWFlUzVuMVZrbGhseExvVFQ4RmpKTkFzMFlZc1N0cDRuZys1SHpu?= =?utf-8?B?djNMT2RHLzdZVHdsWDRqRmNkcW0yZVM0OC9yZFl1U3I0MDNIbkpIWFhsZ0wr?= =?utf-8?B?YlBkV3MwOFI3ZlBRSUF2U0IyRE9mVjkvUS8ydzFkTElTSFhZbkdRaGZ1YWcv?= =?utf-8?B?dDhKSVZoSkt6dWJ5ZFhEa3R4OHNXTGZGblpaOG9PYkYvQ3VLUzMvNzF2ZUMw?= =?utf-8?B?UGhTcFJIeHl5cEI0Q2ZhRXZZZGxkWEhMYzl5bjE5RklaNnQ2SGV5THptSTRn?= =?utf-8?B?ZnMxbmRNM2srdkdEZEIySGJNYmJwQ3dSUzljT2daNzdxUmZCaTAwRHA5blIy?= =?utf-8?B?QkxsRFQ1cTJkbDdqbDBuVFhQZTgvMmV5dFI2ODAzakdKZExMQ2pjTk1RbmhB?= =?utf-8?B?a3hlU1ZoVkJuOHdmbU1LV1RVWUFQNUY1K0RnQytXSWZ4L2hLdUNadFJiMS9G?= =?utf-8?B?WXNuNW5sWnQ3VFFSaEdjRWd5bnhmdDh6VEFVS1hlRGdFZDl4S0hMb2M2MC9o?= =?utf-8?B?bDVEdE5sRE10eEN5YTFycDBHM1dTSDEvdVZFRkNYeFNncjZKRWVQK3NxTHBl?= =?utf-8?B?UHBCeTZTMndBaHVLdWhLUHlIRmdYV0FYeWlHdTk1V1M4a0RadmZ1UWk3TXJ6?= =?utf-8?B?UXIrWHJRT2RPR04zdFVzQUM2ZEYxVXMzRzhlOEwxc1Bhc0w4djE3b1pqclRL?= =?utf-8?B?aGJzUWhMeFNoZ2ovbTdyR2UvZEpnR0lnZUVmUT09?= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DU2PR04MB8951.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(1800799024)(376014)(19092799006)(7416014)(366016)(52116014)(38350700014)(921020);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?WjgzK21WOExWdnRxd2pzSGI1V0FFaEJZNVVTRkprTU1LeVVXYklOYlpyNXUv?= =?utf-8?B?TTRHd0hZM0NvaTJoLytxWFBWQTk4Zk9pR0htOFA4d0dTdTRPbDNDQU90WUlX?= =?utf-8?B?c0pBNzlzYlNNZ1Nvb25FV2pDYlBuTmVDLzFvcVorU0VxYTFnRWF2eVJWd3RE?= =?utf-8?B?UHRUUEViN0JncE56MUp5bkxOVkU4elc5OE96S2lBdk1adzN6OFlzYXpQSG9N?= =?utf-8?B?RWIyTWZHYzBzZ0diSTl5T24wYS94V1BKcE0wUFRiZ1h4cmh3aW9PZmdBUTdP?= =?utf-8?B?Q3lHdFRYdkdaNllZMmtCa29BaWV0cG9Ga2F1OWMyZVgxTHpHZkZlUkRrMVY2?= =?utf-8?B?NC9PRTg0RjJoYjJIZDVVME43NTZoTkF5bWtoempXT09SL2JuTHV4MTZLZHk4?= =?utf-8?B?YU0rVXlYcThGTUFjMVhVb29JWmZFWG9Idng1cThhOXFNQSt4T0JJa1pobVR0?= =?utf-8?B?alQrN0JhSnhtaDgzN2hXNzF6aUdCbVpXQWhUeTRKOUZFQWRraWx1MVpLSmt1?= =?utf-8?B?NWVCSytSeDJxUEpqRG9QSEswbmZXQ1ZnZnhNdEhmRU0vS3Awem5TWVc0K1FO?= =?utf-8?B?RU5pVTBFUmNrc2lYU0I4b0JZMGg4MGNOOUJrdWpNNEF4bDBFVkd2QUVPcVQ2?= =?utf-8?B?dUhqZkMraERRWGx3S0hiYXppSWcrYjVUMjRkc1E2aEdPeGo2YVRpWjZnQ01L?= =?utf-8?B?MEtBNWdnalptWlNvdHJBK2NkUHBDVUhqRjZEeHlnTE1QbDhRQ255bDBIRTh0?= =?utf-8?B?bFlpTGFvU25VOWNkM2kvbzc2dHA4S21ZV1IxZFJFblc5cysrOXFsUXp2MkNY?= =?utf-8?B?UUdVaVhsQUpCQWJVbW8xbHpHQUFhOTlqUWRmby9rak9jUTlOZk41REp4M0tG?= =?utf-8?B?SzZRQzZJUllLS1psYjNWd2N2YTZBcVBMblFuQi9kY2hQT2tyNnhMZjlKayt1?= =?utf-8?B?WW5IMmdFT0RQeHIyd2dKbG9wMnlITVVtN25SZGMzK1dJcnNoOW9EZkw2d2JP?= =?utf-8?B?eWFydFNkRVNTN3gwclU4WjNaTEhsQ1NXVzNRNERFMnRiem44VG9jdFg4aEtj?= =?utf-8?B?R0NhTTZpQ3ZWZStwTVJHaWFJQ3F3T0ErSDA1NzdacHBWWkJKOE8yT2FHNDVD?= =?utf-8?B?dk0zVnl2cmFNa1E5YzNXcVg4VWJBb1NvRjZRU05HYS8xS1MycFgzNkZJN2N4?= =?utf-8?B?QUNyWkFaM1hkQ2hVV2lpcU9zeGxFQ00vc2pTL29jVHUyb0o5N01qMmZnK2M2?= =?utf-8?B?SW1jbmZHNThuYzNqRXNsTFlJNzMxODhNNjZMWk5qKzBIeDBuVG00S3dDeUpr?= =?utf-8?B?VldpOHo2Q0tnV2dzRG5veHZFazh2aGJjbW1wVjVobzhZdXcwL3JWK3lJRDJK?= =?utf-8?B?VmYzeEwyOHUvZ2FFR2NaQXV6eVN1MlBPYk1QamJsbERXeU5HdkM3N3ZQTW90?= =?utf-8?B?RDc2a1Njd0tCMTYrNU04QUdxTzJtVDMvZld6aElBNTAyYzRRQno3WHpmbGhW?= =?utf-8?B?WUEzV2xYZ2trRTIwWnU4ZkprYTJBeWJvRVFEd200bkt0NXM1YlVQY1h2YnFm?= =?utf-8?B?VHVCN3ZmNXpJM2FoNDF5NCtZRE9Hdk4rQ01NM3hlUUhVZ0RQNFlpK3cyZHhq?= =?utf-8?B?N3I0aS9udFZUTEp4MFlUMm01aDJkNVlBRlVhZ2pEYlUxU09MaUFxSGRrK2ha?= =?utf-8?B?eTdHc25JNTdaa2J5bGRRYzQrQVgycWQwOEZ0RTk2WlhFQUtQL1Vlbm5sMG9F?= =?utf-8?B?N1YwN0hHczhjUlVreklqNEh6RzFTNU1CKzhrTW1hQmZyUHgzY1NIZDh2VmlM?= =?utf-8?B?N1dia3NuUEljYXJSb3BUVU9XdGluZjFQWG83UzkzYUQxa2pNTWQvd1NmWTVw?= =?utf-8?B?SU50RGUyOW41TnhHckdTNlJrakVYNjkxK2JhSnZRaS9SdGlzYmZRV09YT0NL?= =?utf-8?B?Yk5abkpCeHR6TjMzejJHUkFvSmFTNFJnLzVZL3NISWhDeTNuWDUveVFVa2Iw?= =?utf-8?B?UEEwblBMSzlrcFJvS0lhUG1BT3V0d2w0OUhsMXErRGhmVU80ek1GdTIxTUJK?= =?utf-8?B?WlhIV29DbjJhem05b0xIRmNkYTFlelM1YlFVVlREMW1ZNUkvVTl2TC9RTTZr?= =?utf-8?Q?3FjWgMajEBDsi12KWzR10bTNc?= X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 42a68a17-7cfb-4d10-b322-08de3c2c5079 X-MS-Exchange-CrossTenant-AuthSource: DU2PR04MB8951.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Dec 2025 22:50:16.0685 (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: LDC7x/8RQXLmbPq/RPsoPJnPe2H96YYdYMrQzmj3cZxiX4fAPHO5ROgtAfF8LQ6+RS350sXeVxBoOPcxBpM8MQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PA1PR04MB10794 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 Mon Feb 9 01:12:09 2026 Received: from DB3PR0202CU003.outbound.protection.outlook.com (mail-northeuropeazon11010053.outbound.protection.outlook.com [52.101.84.53]) (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 C8FD132572C; Mon, 15 Dec 2025 22:50:22 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.84.53 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1765839025; cv=fail; b=LS7zQbltQK/jChjtMc3d4iNli0yVoFo2i4rQ5NlFuIUM2kDa70SXTe+lI/zQHNvLD+wix67OFaNhsNKdmGCNEQQZ2tUmdOVt2jxQvQ5Pbcv+Evp4RRWbErW8kWPFT9Py+WCvYvSFW4tFIMJ936ULFJTOm8cPr0LDE7TsGYrZbyM= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1765839025; c=relaxed/simple; bh=8ZRGC0HOcXdF4yY0Klkdzev0fb+EGZKR4sxFFWOvq/Y=; h=From:Date:Subject:Content-Type:Message-Id:References:In-Reply-To: To:Cc:MIME-Version; b=luoQKJ0uc4Zj/S2sX0OjM3OmimTrfQX5/ZR/fVe2WdV6wvWpUl5B5LWv1wnIj/+8RupEqSlksd99WeeewzKJyPCAVu22GF24rY5tjt3ClP84RGwuKKNLX/humQjp8+e1ePpgVKWoCou6WmhSBRK2kk029j1/rlGpvuYiU7/8yf4= 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=CeUOrhRK; arc=fail smtp.client-ip=52.101.84.53 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="CeUOrhRK" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=UoaZ0hQ8KTKJ1a4+s7OQxQAvu9OIGLJr/9ykc1d5PLiJD03rEr9XPd8pMjCJL/Ehx5zeGphxNZDpbvDnM91VZEUdPszKUtH1iBueUe/EZcqmQJamqoZCix0AebpfEuE9u02GzblLkceGT1ANYbYmDStOJzsnSoa79eewp/m9x48fY/B/0A2WXe3QUxOWvKcz+a8dvRoxtwkp4t3cTFLZQoQXhIKey3+cZ9yUd4tNHQ9PYG20FZDrknZCwTbyhlxyZjDMPdH5O8Yso06XZjP3aiybjlinmH5UTvaQMit5OIyDLdJo1fMfGAAGR/s/jI6jWku3kcaYZjqNn3B8vZOj5g== 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=08qB5mwk/VJd8IPFbwD0PBx2hVv/tdtoaLkQk4flIrI=; b=o1nndHf6NoayMSxHgOi23UO22bNyobH8gZJd+E3/UTqCVRCwkkBraS13Ot4SuJcc6wPt4SDS15B+3kYh8Uzu+C+kjlsR0hUlsq5U4YGkH48LOBmSutyV8dJdLOvXSUbKzRfF7rz2LXQi9+JNf1K1icDLIVy4YXEQnRA0f87QTMztzoRxU6YQYMn2smSgzw0mYPyt0zNhR9iRdluESWcd7iwrZwItR52td9kJ4M6oBkeQWGqpaSCASCwX1RddM097IUvrWf3DKk6tZw1U3sB9GFhOdgAUgCFqlwmrdGOUWDRAIqyTjfxZH81oGzqdzXPgEBKSTDNU6MPwT6ZHTFHNEQ== 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=08qB5mwk/VJd8IPFbwD0PBx2hVv/tdtoaLkQk4flIrI=; b=CeUOrhRKcApsWutNP9HHa4Utofz1LNsd6484i2gW64UBRZeZPUg/KR5q13lxDq7+h0dZyo4yCdkqzXvbvbm3X+fN4sTuIbddh0VZs/ToeT8ovThRYIbm17a05V/78KfgHSiLCr1KetR/iPWex1gip2VCG1BgKo6C17lxKuCfIIWJmTogBRHCvZp7XUm8gSLRjcK32fNYf43QKmRUXyzxgMtk5zviRZIPGbTtEnULaS/TykBhkwF3r9Fv/sRng2sgx/ULvEC7QiyoK1mptjo4v+FsX5VBDuzQTb48KbCl+rVgFy3dYQb7Mtkc/lDBiV0tmVgGgucfclNtIuz97xCEKQ== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nxp.com; Received: from DU2PR04MB8951.eurprd04.prod.outlook.com (2603:10a6:10:2e2::22) by PA1PR04MB10794.eurprd04.prod.outlook.com (2603:10a6:102:482::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9412.13; Mon, 15 Dec 2025 22:50:19 +0000 Received: from DU2PR04MB8951.eurprd04.prod.outlook.com ([fe80::753c:468d:266:196]) by DU2PR04MB8951.eurprd04.prod.outlook.com ([fe80::753c:468d:266:196%4]) with mapi id 15.20.9412.011; Mon, 15 Dec 2025 22:50:19 +0000 From: Frank Li Date: Mon, 15 Dec 2025 17:49:53 -0500 Subject: [PATCH v3 2/5] media: nxp: use dev_err_probe() to simplify code Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20251215-cam_cleanup-v3-2-a61995068f38@nxp.com> References: <20251215-cam_cleanup-v3-0-a61995068f38@nxp.com> In-Reply-To: <20251215-cam_cleanup-v3-0-a61995068f38@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=1765839009; l=5112; i=Frank.Li@nxp.com; s=20240130; h=from:subject:message-id; bh=8ZRGC0HOcXdF4yY0Klkdzev0fb+EGZKR4sxFFWOvq/Y=; b=dlxjs4509p/cFdKXpcgZNLUhTc+GDe8IqGdSEPYD1SVPOPavGRoX22V9/ndYxCCEM2odfj/Kw C17cLXPEoBNA2VfOoILJQzO7CRrT9DtMwkP2tp0e26ybN6aKEMxyJuk X-Developer-Key: i=Frank.Li@nxp.com; a=ed25519; pk=I0L1sDUfPxpAkRvPKy7MdauTuSENRq+DnA+G4qcS94Q= X-ClientProxiedBy: PH8PR20CA0015.namprd20.prod.outlook.com (2603:10b6:510:23c::8) To DU2PR04MB8951.eurprd04.prod.outlook.com (2603:10a6:10:2e2::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: DU2PR04MB8951:EE_|PA1PR04MB10794:EE_ X-MS-Office365-Filtering-Correlation-Id: b8d7d7cb-6dae-4121-b986-08de3c2c5258 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|376014|19092799006|7416014|366016|52116014|38350700014|921020; X-Microsoft-Antispam-Message-Info: =?utf-8?B?bDFaSEVSWFdUeGFCTWpXWS9pd3d2N05La3VyYkw5NmhPbkszcDlGaC91dlAv?= =?utf-8?B?cm9KNEE2dEZhc2lUaTlucyt3Y0pBWngwZ2ZzaHkxYytINzlEM1NNd0RPQ1dE?= =?utf-8?B?VmhHaE1pand4TTkzR1hmSnpZdFRDeEMxc3Z6ajJmK2k0cmZWTVE2WS9TRGxH?= =?utf-8?B?WFlyOTgvQzFwaklWeDM0ZEJLalkyY09Pc1RGa1psZHdkUldXZ0VZR1BhWWJV?= =?utf-8?B?dFFBbmtFNWZ2cTlQVHlpSDZuVmZqNUNINFhvVGl0QXY3eExkbU1LZWRHSkpB?= =?utf-8?B?aU5oV1FVbkNyYTZtbFZkdEx4Z0hRRFo4Y3gxUGNpeHN1UEtBMVJPVW11NkY2?= =?utf-8?B?a1F2eUZ3ZUlpVCt2N09WaitDaGhOSnBUQjlYQ0NRMHBRMzFXMHNETG5pd1VU?= =?utf-8?B?UThKRUlCelNxTWxTKzJmZU1xQ3JuMmU5eVZpNTdqOVN1WncvNUxNZk5nSGxj?= =?utf-8?B?aGNhYWw1Z1Q3RUlub3lZNVFBQUF5YWhJcjFuWlRTMXdKS0VOZXF6ZFlxMTA5?= =?utf-8?B?cHUzVE90U1QzRXAzOGRzblc5UE14bm5PbHBzcFFINUZ3L3B2VXh4RW15ZDFZ?= =?utf-8?B?K2prQ2RJRlcwZ3hQRFQvTE9CcnlhdTBwa3VnTi9aeWx1NW4rNFRxcVN1T3Ar?= =?utf-8?B?UmhSOGZFV3UvWWE2YzJzWVRJZUJyb2xjazByaXFRdldYWnhYRWM0Q2dJeXI5?= =?utf-8?B?WTZpbGRzUHBwWFVieVJuVis1Y3VleWhYZ0szVUw2d2UranNnRkNLOUlqSmov?= =?utf-8?B?VFpMZnl0STNXSURsRUx3Vzc1ZEFpeHREbk1JelRUcnRZSjAxMldXL2VnU09q?= =?utf-8?B?SytUdWdpNFhoWEhoK01YL2JrV2J1NHlLem8zMnZ0WERqMnkwQ3NnVkx3T0tk?= =?utf-8?B?Y3R2QzkvSHNpMWZLUEx1NU9ncWcyT3YxTnB5bU5QOTZib0Jub0tac2JqYWtm?= =?utf-8?B?ejFpTzhjMWxsQ0dpZ1NqVGlwMnlVUmNpVWVwdENqQmpwTnhLQTVlc20zUE5C?= =?utf-8?B?S0tNaDVkRFhkeWdrRm56d3ZGQjV5UldOdmR3QjhmUzVCSk9Fb3RBKyt2MHZa?= =?utf-8?B?QU04MHg0RTRyeExUNjJ0L21xZE5wWjh5SFlvOG1NNWUwOHYwRkl6UXp6WmMr?= =?utf-8?B?SGR0UVJXOHNOTTNpUFRrSEd1TFE3MDJzb3lybXlVTEpNSlplTS84c0NSVzVJ?= =?utf-8?B?RndkRXdmTmFMOEpMUk1pV2VvZHNQRCtwSy9LTU1hMDdlKytONlhJZXBLYXJ0?= =?utf-8?B?MnErYk5wZ041cis5LzNsaFlzMkNGZ2JuTTdFakNyOWNoNERZNVp1aDcrVG5k?= =?utf-8?B?TFFMN2xOc002UEMyTmd2NDZEejJYbkRzZ0hvdFJMeVdGVkl1RTVNMjZFMTdG?= =?utf-8?B?aWlWM1IwbW9rWjFOeUlDdFFubVN4QU0rWjJmVTYzemJSNjQ2QXNmdzJ0aUtS?= =?utf-8?B?VjAvd2k5TGtIYWVubmtQY00va1QrK2h2QTdxbGd0MGtxQ0tveW5RNFNpT0Q0?= =?utf-8?B?NWpvbFRrVkYzaVJhZkY2ZkhxaUN1b3dEVHRDZFFXc0gzUWx3UHU4ZTZsTVlJ?= =?utf-8?B?Ync1WDBhc2lKK3NFc2h0bnpXSWF6Mm92U3U0ckpqOTJQUWljV2w4cjhLN0ZF?= =?utf-8?B?bk96SmZlQ3VUWXJpaktHdHRDZC9SbEpjMWJVLzk0VmhWeEljYThleHRVdmlu?= =?utf-8?B?MzhFVFpXVHlwcWFLOHQrSEcxZnpuS3VweEJ4YmdqVjVlWWlOdVFIWjJ0ZFhD?= =?utf-8?B?dldqUm1YYllNSWl5REdNbVdlb2t1bDUydzJURmZEa3VGenl5NExQZllSVEND?= =?utf-8?B?TEdLMTBPdFFVMUtyaXBSQTFpRC9Ld0E2WTJ0eUNHWWVnaXNSVFA1a28rVU52?= =?utf-8?B?NXlQVFljYTRQSnFwQlFORHFUbHpFOGx1cE5YMm1vZkVSdDJqTEhLdlJpL0FL?= =?utf-8?B?dWJhK1VKVkFCdjBYTWJiOE1WOGVPYUQzVDl6VVdiTE0zZEY1K3NsUVA1VUpE?= =?utf-8?B?dWZDeGdMYzNyVzJxbVIxY0xEMU5qd1Y2WWEvSGhnYWxrc2gzRzNwby9FSTBn?= =?utf-8?B?T0JDNERhK1Q4NDRIMHRMVEhxQVNVUUxhV2kzQT09?= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DU2PR04MB8951.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(1800799024)(376014)(19092799006)(7416014)(366016)(52116014)(38350700014)(921020);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?YVkvV0ZScnJHVkR1Z2V5VzloeG5nTGlXYnpMN1REbHkrTW1OZTg0R25SUGxo?= =?utf-8?B?aytJS2xFQjVHTnpHdUdzVUJkRFVlcFN2S0gvRzkwUEhWUUR3YmUwS3E1SU5s?= =?utf-8?B?T1lqL29CS1orMzBMbVRFQWNSSlVJcFBFSUJ6bDJFWlJZS2VSOU82RDZwSWI0?= =?utf-8?B?dnhwT0hCK2R6Mkc3TXp6Mkp3b0Z2NUhyT0psZ24xMWVlT3FQYm1Ha2pGSzl6?= =?utf-8?B?MVFxaTZVVDZ3dXdNdVYwSUx4Tng2OGx0akQ1ZEhXKzYvazFYSUxLcm5rNUtB?= =?utf-8?B?czg2dEpoaFc2eGJ6WGwwZU1xRjBzcG8xd3RnTHhEandmQ3ZzQ2YyOU5yNzkx?= =?utf-8?B?aTlZUVdpNkNYVkZQQzYwdm1BMXlGSnBTd0JIdFFrT25ycHZpWHlUN0trOGx1?= =?utf-8?B?WmtHMEgrd3NpTWFjcFkwSWU3Z3JMaDNPSktHVVZXaHdBWUlGRGFvMnVqMW4w?= =?utf-8?B?Z0RXRDZ4OVIrVG5UaytvQ2syYm5BMWZWOXo1R09pMENOZ3FFSTM2ZVZua3R0?= =?utf-8?B?K0FNR3Y5YlVvUzFDTG1JdExtM29wZHdzUzh6akxzdjhQRERaVUZldksrRjMz?= =?utf-8?B?MTlwMS9vallVRVhWOGh2SW41ZFVya1VGNE02dXZ4eWdSTFlZNGxrcUhUQ2M1?= =?utf-8?B?NFQ0ZEl0NzZxZGVBR1BkZXl2WGR6U1JsL3lPQnY2d3hZeHZiT3Q1bmo3bFRp?= =?utf-8?B?Qjl0cGYwY2ZMTlY0b0JuL1MxUDlZc1JrTndwcjFMbXdnOVc3YXUxSUh2cTBI?= =?utf-8?B?YU5FVzdIamtSSTJ2WTc4NDBGNktHNGZYb3hiQmdiQ1NpZ0xXSlNlNkluUUF5?= =?utf-8?B?N2VKRnBpWUdtak8ydFNIVTlGNHExTStOczNiWnA4OWNBZ3I5K252R0N6K0pk?= =?utf-8?B?aE5rdmh4UEV5S0NhNUpBYnd5dzJRNDFWWDZ5VUU2ZFRrTmdBRmozenlCNnVV?= =?utf-8?B?Qk84alR1VFZ2bnpJa2lCOUFiOHJoT0lPV2wrZGNscUJFQkpDNXQwWVh4Y0JK?= =?utf-8?B?NUJoTjJrSFpuS3d4S3VqQ0FoNHFicjNheW5uSnZyamZTVk9Gb0FEMzV1Y2pF?= =?utf-8?B?dndzRjNpK0U3aEdoYlVZWDJkenRTV05uOGZqTnJjQ0VuUCtpUU1aUzNSa3Mx?= =?utf-8?B?LzJoTWxKbHlqbmJpUER5L2lrQVBYbzVwT28zU1NNcVVIYmZnM3pPYzVjR0g2?= =?utf-8?B?aU5LTm9KYzRGNERTWFRzNjRHYXl0dHBlcllzRi9VWEN0TXozY2ZsMStpZkl0?= =?utf-8?B?bmRGV2NwYlJjazJmaG1KSU5TMDRqWjdRUmVDRjFmMXpOYXZLdGJUNjU4WE9K?= =?utf-8?B?Z0xBY0ZNMFA2Y0M0VzJFMGorOVJkUytUSXZQcVRUQ3U5d0NJbmtqVUNUTEF0?= =?utf-8?B?ZGJRR1BRbGdmenhqeHNiRFdqY2V3ODUvQjZjcU5wcUJvV1VETUNJT3RueFgz?= =?utf-8?B?YlFIODJNRVQrWGhpMG42aTl1SzlxdEQ3RVd2ZHlXS2wvc2RhOVlPejBHZHZw?= =?utf-8?B?UGU5WWRXelcwVTMrU3JRbW1KcjNneUYrdWgrbU1tcTlZSzBHWXY4MkdhQTB6?= =?utf-8?B?aFpzOWZXK245WTNqdmJtU29WSlRVemVkUE03UFF1V3JrZ0hHZ2hQMGVYY3NU?= =?utf-8?B?V3hOOFNLN0NmOXdWUTRJbm5xaDBqTExpSnZ0dWR4emluOUxneEY4ZXNlVEpT?= =?utf-8?B?K2E0a3dwSS9aV3h1dWh5SzhRaDBtb1F2V05ES2taVW02dk5vVjg3cGtjc05E?= =?utf-8?B?TTdkMnplRWhjTE9aVVJGZEo4VTAvbFMyWGxlamNhVDB2b2U2WDk1U3c4REpx?= =?utf-8?B?WTVlUStzYitKVDRLY3phOTk3ZWNKMzBjbkt3QzltWmF3WFZ2alZZbFZEb0NW?= =?utf-8?B?OHQycFQzZTlVWW1RVzd5WkhjcndzNEVwT3d5ZlVDZWxCMWFqVmFTL1pkNUgw?= =?utf-8?B?OXJVVmNCVEpRdlk4Q2JwUEhudVczRSs2b28vNitWbHJEU1lOdXRpaTFBdmRn?= =?utf-8?B?YkhJVzhINk9iZGR0NmtNZ2NvVCtKY2tZaFM2ZGUvQ3ErMjBTN2QyZ09aamtJ?= =?utf-8?B?WDUwTEVST0VvODd2RDlmMklsSFErYlhZT2o3WjJFUXlEMTFoMHE2a21TWE12?= =?utf-8?Q?H8q4ENRk1xqEmrtqU3NvZxGwM?= X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: b8d7d7cb-6dae-4121-b986-08de3c2c5258 X-MS-Exchange-CrossTenant-AuthSource: DU2PR04MB8951.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Dec 2025 22:50:19.2149 (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: ags5Pm8/L/7zumBCdeAgIhkEad6d6FyPPrVsA5Z7y8fowOhCcpWlRNXmzP4FosLKqy/98bA5dTtZ3xylXyF5pA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PA1PR04MB10794 Use dev_err_probe() to simplify the code. Drop the explicit error message after returning from imx8mq_mipi_csi_parse_dt(), as the error is already reported by this helper. No functional change. Reviewed-by: Laurent Pinchart Signed-off-by: Frank Li Reviewed-by: Alexander Stein --- change in v2: - add Laurent Pinchart review tags - wrap error message to new line - remove error code print in dev_err_probe(); - drop error messaage at imx8mq_mipi_csi_parse_dt() --- drivers/media/platform/nxp/imx-mipi-csis.c | 6 ++--- drivers/media/platform/nxp/imx7-media-csi.c | 14 ++++-------- drivers/media/platform/nxp/imx8mq-mipi-csi2.c | 33 ++++++++++++-----------= ---- 3 files changed, 21 insertions(+), 32 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..7ddc7ba06e3d4e007013821f67d= 783898a15461f 100644 --- a/drivers/media/platform/nxp/imx7-media-csi.c +++ b/drivers/media/platform/nxp/imx7-media-csi.c @@ -2218,11 +2218,9 @@ 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 +2234,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..a007c582b4d91660a97910a6a0d= 53c9b6fcd73e9 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\n"); =20 if (state->pdata->use_reg_csr) { const struct regmap_config regmap_config =3D { @@ -977,24 +976,22 @@ 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 %s property found\n", + "fsl,mipi-phy-gpr"); =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\n"); =20 state->phy_gpr_reg =3D out_val[1]; dev_dbg(dev, "phy gpr register set to 0x%x\n", state->phy_gpr_reg); @@ -1017,10 +1014,8 @@ static int imx8mq_mipi_csi_probe(struct platform_dev= ice *pdev) state->pdata =3D of_device_get_match_data(dev); =20 ret =3D imx8mq_mipi_csi_parse_dt(state); - if (ret < 0) { - dev_err(dev, "Failed to parse device tree: %d\n", ret); + if (ret < 0) return ret; - } =20 /* Acquire resources. */ state->regs =3D devm_platform_ioremap_resource(pdev, 0); --=20 2.34.1 From nobody Mon Feb 9 01:12:09 2026 Received: from DB3PR0202CU003.outbound.protection.outlook.com (mail-northeuropeazon11010053.outbound.protection.outlook.com [52.101.84.53]) (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 68E81327207; Mon, 15 Dec 2025 22:50:25 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.84.53 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1765839027; cv=fail; b=r6pCnisRV6CE48IAUqIc2pz2RSn5O5+P0bMn4lrfbMaINJ50M/S5yjFuQPrSMwPtGdysHMcvW+poOvE/US/jjlMrKAijZGVMAhYgPEnW/8tdmcoosnQJi1+aEO+siw1C5WQtD9aVI/qtuIuobJ8VsSEhHrwtG0UMSDSujGB2M38= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1765839027; c=relaxed/simple; bh=yPwnUBOev/x/308wqg/c0rNtCFlwwv3fG4kMS/h4VvQ=; h=From:Date:Subject:Content-Type:Message-Id:References:In-Reply-To: To:Cc:MIME-Version; b=ij7XkaQ2exUfBHWyB1xlWSHlSOit8O2kKhejhWNSAIZsE+N1GnCzBsl0x9FoYMVnLEXWmmFpwfoIlRpHY5mLqrKLJfJkio3cpkpfooZqWr++J24O89vjAFAk7+8GY1w+r9hSBMiEBpMKqX1JJ2KMT+55bbxUYI8BxNBU/T0i7cs= 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=Q6SiTCzs; arc=fail smtp.client-ip=52.101.84.53 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="Q6SiTCzs" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=juOrX+rvi84BOIYkofAI5/ptuHGo5+3u07DucBwjhYivxLw2Da3teVwJMMklUdhwgirmwgtEb2MEshtbXqp/xneunh3fGnldArVKB7ReCvQVjVFZ8S94Gliq19WxeTaBf40jGCrzeWnF8TVYOFeoZxcARr+iJwWn+CQXMqVESBQ3ugn5NM3Mq+afenGtyq1OB4GlEXSI95gS611BPQjSsHtHBkx9gKvXHb5w4xwhXqpTzNsAWa+KQZmLfh6srUXOKm+K55NcfjNd4rCwhfNhMAKMzA73RV7RwFuGmIm2IVFPr2INaN47tqHNZH3Cv9pGUwmPi/I+jUFqNSw4mtsaNg== 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=nzPs5H92nXDeok0MjXa/DcPz5kXR2XdL8jcuKSirt3E=; b=AbL/zZsQ4yGf9f7MV+wAh3WmIIfdv8PVmWfjad5s34jnQMwSc7ojQinIo/aiZ4MsrqYJhBbeJOTx4YGmTxAgo6+t+r3LaugLW36ual1Q2aWTTEqwyg2hboGKblB09sBKxghFLt96EW/mOAHpqdNWBCFiYqgEJcdxkaeyTpkyU1C8G0HiOBcYwA1dxkm7rW+xsLHPmv2PWjsItMp/9ZxYzFkmOCWmgZ5DBlAOaOuuMlcXLkQYdZniURTd0A1Bwu5SVJzkyza9He89G2E6+nl+0jBqn09y6gbD98ufl+ewzJRluJ5wM382Hi4upa/pLULkJK1o4yXOvDynlc9tbpIbBw== 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=nzPs5H92nXDeok0MjXa/DcPz5kXR2XdL8jcuKSirt3E=; b=Q6SiTCzschE2nlpQ7e/Tier3YZRG09GSSI6Ga79IXYufL/8td+fIo5fU4GXtv9HWDdT0PcurJtcPwugf4Y+r2LMqLwomJ/Lk3HgYLFvNnht9uKGEMo/CqT96esiL4zWwTEflHuLKkmSsHZbI9ITkkIO649hEt+XnB+5iTxC7dibhRXnlPCntxS5JqifrLVhIIThQk5gGWnDEuVd/j4F+A3JeH5TEx8bE+u4XqOceW8SdU+HrOawG8BR3Dk60NxPLPQSFZZ4eyq9m5/fRsYu5/mxlsX+Ai0cUwy7JwnNsXJ2YytVypXS+DMDVRQsEFR+MeLX3A6TFV1HFNNsUxhFAOw== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nxp.com; Received: from DU2PR04MB8951.eurprd04.prod.outlook.com (2603:10a6:10:2e2::22) by PA1PR04MB10794.eurprd04.prod.outlook.com (2603:10a6:102:482::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9412.13; Mon, 15 Dec 2025 22:50:22 +0000 Received: from DU2PR04MB8951.eurprd04.prod.outlook.com ([fe80::753c:468d:266:196]) by DU2PR04MB8951.eurprd04.prod.outlook.com ([fe80::753c:468d:266:196%4]) with mapi id 15.20.9412.011; Mon, 15 Dec 2025 22:50:22 +0000 From: Frank Li Date: Mon, 15 Dec 2025 17:49:54 -0500 Subject: [PATCH v3 3/5] 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: <20251215-cam_cleanup-v3-3-a61995068f38@nxp.com> References: <20251215-cam_cleanup-v3-0-a61995068f38@nxp.com> In-Reply-To: <20251215-cam_cleanup-v3-0-a61995068f38@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=1765839009; l=1806; i=Frank.Li@nxp.com; s=20240130; h=from:subject:message-id; bh=yPwnUBOev/x/308wqg/c0rNtCFlwwv3fG4kMS/h4VvQ=; b=Tgd+U6JGS18KsxvCWCId9Oz8TGU0v0paDnSW3Yzas8uywhIj2gPwFrPk2xh/T4Mr4I++ocgnW 6NPENyx2+ywBhXfEb873TCJ7BifWyJ0zH/7fCApiY/RVSMhJsxJpw7r X-Developer-Key: i=Frank.Li@nxp.com; a=ed25519; pk=I0L1sDUfPxpAkRvPKy7MdauTuSENRq+DnA+G4qcS94Q= X-ClientProxiedBy: PH8PR20CA0015.namprd20.prod.outlook.com (2603:10b6:510:23c::8) To DU2PR04MB8951.eurprd04.prod.outlook.com (2603:10a6:10:2e2::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: DU2PR04MB8951:EE_|PA1PR04MB10794:EE_ X-MS-Office365-Filtering-Correlation-Id: 6bd12951-152f-4dfa-dfe0-08de3c2c542f 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|376014|19092799006|7416014|366016|52116014|38350700014|921020; X-Microsoft-Antispam-Message-Info: =?utf-8?B?KzJVelJWcjBWd2pzK0xNNzdTMDJkejNBNUc5R3dDcDVpK0JjTUxQeUNhRXRM?= =?utf-8?B?SXF0cmpRL1l6NXdFYW54WFJpTFVKRjZVVDl2a0hoZkxIRkZTalJsNnZiVSto?= =?utf-8?B?ZWJhWW5JdkFCbzY2RGFhUlFVWjlZd2I0NXhaQVdidnpuOWVYb2RvZDJSd3pN?= =?utf-8?B?M0JQZnNva0E5aUgzUDBXU1lCVlVvWkh4UitiVVZOZDQ4VnJqWlBLbWFCRytF?= =?utf-8?B?WDB0UTR4TWRRQXVXT3hPOVhpbit6d1MvUlhPbGFIOUNnZHgwaGppM3ZFWmsx?= =?utf-8?B?TDZVVS9EOVduU3BubVNRUGFxOU1kd1ZENUFRbHdQemdVbURTU2F3UEMvOWs3?= =?utf-8?B?bDFhT0d2R296M0Y3ZDhsOXdUU29RaFBGNlo3N1hoZ1JMWXBDTktmRnIrS2Vy?= =?utf-8?B?dm80SGNNNm53d3lSK1F6akQ3dkx2aEhFUXVlTnNaWXN3ak9hV1pwclVHWVVx?= =?utf-8?B?Y1UzL1kzLytZaHRHeHdCNzllYkdHVHFiYXhVUG5xZDVtNEFjbUxEU2NiSmdC?= =?utf-8?B?RVRKQnZBK3pYUW5xWnl1MnQ3eExvQ1I4dWdBaVlvMXBteXc4U0dPTHVKUjhq?= =?utf-8?B?OWlyUll4QndObnU0VDAxTXJJdzBkNmp4UmZXUld4MFd5SS92UzFWWWlzS1A0?= =?utf-8?B?V296UjhqQzlQZkxid255dzZYU1MralVnQTNnL2MxT29UNkRUdXhyYXIwQTgv?= =?utf-8?B?TEVaU3NTRWMzNzVsQ2dIVWlXL2VBM0ZMcXNRQmN6WUlBOFJsNDRjUjBockx5?= =?utf-8?B?RjBUS0p1WWQxRDBtK3p1MmlYSXU0dzRGYnJzUjAwQTBLN0ErbmJhNFlEMVYv?= =?utf-8?B?Qm1wOWMyYVMvYkRSWURWNjBpQ3Vod2FYb3lJUXdwMCtoMHdpMVBCYmlMSjJN?= =?utf-8?B?cUFrYlFPWldkdzJ3YklWWmR6bGIrbm1YTk5BM1Vzd09DUlNuNURidlpWV1ZQ?= =?utf-8?B?VUg5dklKVWZ6QkdQWm82ellhb1hHTVJRcWF0aXVmSmJRZUNMbjQybFhHN1kz?= =?utf-8?B?TnpjbXRkY1FPamVZaUtKTEJNTDcxOExONUhaOVZoS0hrVGRLbG1ON2pMTkJC?= =?utf-8?B?eVZFRi8zdGpNWnhUUVFTODNibzBhMmtjYVF3Sk10TU9iRlN4OUNBV09BcTg3?= =?utf-8?B?ZTZ3eTViS09XdVEyNmZLRXBXWlY4MWxXcjF2b3RFbW1DcmlBYkxIOUJXdTRJ?= =?utf-8?B?VjlYZmh2a01SdGlWZFdiZC9oc0kzdzg1K2FWSk1EckQvYzNJNmFma0h5eVNm?= =?utf-8?B?cTFranlSYjVqTElabXpHRzlvRzVCMXhMUUJ3OVE2cWtJTzNWbUEybVZ1TS9Q?= =?utf-8?B?RFZRc1VCUk9KeDYyNy9YdS9mQVR2dk5wSVZ3Um02OGNjSmI4cE52cE9McUN6?= =?utf-8?B?aTRqYWNqSHIwUlZsRTY0eklONkMwb2h6Z0U1M210NElEanFFSnpYSEpweSsz?= =?utf-8?B?OXlQajdLZWc5KzdIQmV3djRuU01SK2dYNEJxcjU4WVk3MVBrS1p3TnpOdEdE?= =?utf-8?B?TkNjUElTS0ZXd2RYTUpjTmM3aGhrMEROMWt2QmFIZ3NGb29GWUlpV0QvZnRZ?= =?utf-8?B?SlFRWExmS1BSWXFZTHZoRlI4NkRiRnpIOFJ5YXlSL3p6K3daWEtGeGJKaS9B?= =?utf-8?B?enhuUmNGa2xPYlZhVG5jUWRkMVM4NzhLcHlnRUJjemdCM0ZBYjBQbjhtcjVQ?= =?utf-8?B?WVRWM29VZVViN2pPc2hHd0tqUXhDNEFUaFlFN1c3U0p3ZWFLR08xSkN2NGFN?= =?utf-8?B?OUpTK0wyQlRGS1l0bEQyWXBFRDNvb3BCOU5hWnBuWmNSR1NvSjkvSlFVY2dX?= =?utf-8?B?blNUUlNrTENhaEJGcTZVdDFXLytCSDl2dVdQYTh6L2lEZW9POWpHR0lwWTNO?= =?utf-8?B?Mm81MzJJMFVpQUJtdWxwamt3bStkRG04VU03TWxtcW8xclZsNmhpS1RFbEJl?= =?utf-8?B?QUozVUxEQ1E4Si9HanUwYzZLOUlyUGtrUnJqamIvZGV3bzM5VTNkN1UvTk9C?= =?utf-8?B?SCtGZ3lSODdUNDN5ZVpUQzI2RWFBZlBvcjY4R1g2YnVjTlFLT1RPRkJRWFR0?= =?utf-8?B?eEpmZ1B2SGduYzBTODJXZlh0c091QVRCNXVXZz09?= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DU2PR04MB8951.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(1800799024)(376014)(19092799006)(7416014)(366016)(52116014)(38350700014)(921020);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?N2VFMkJqWFFkU3BJQmxseW4zRlBLSXZVZVpWbW1zYUdUN3NGSXM1QXh1YVN6?= =?utf-8?B?NmlCaDJBbmJ5UzU0VnhSWS9YZ1VGaVIvOHFyOVFFRWE4UW1CbndPNzlleFky?= =?utf-8?B?SWxMWDhlc2hGLzYxNWU4YTdueTNLYUV3aXFJTTg3elEyMUI1eWdlNUpCSmpl?= =?utf-8?B?WTFkWHlXU0FiRWFXUStoL3ZrUG82UjFvMjh1WHluMEdYakJHWlh2dW9XZjRH?= =?utf-8?B?aTJldHN5Q0gzWUZ6ck9DN1N3RkpWd1YwU0hTWjMycTVobHpnZXpJQjZYd1A1?= =?utf-8?B?anNzWi80cVhMMkJuU1dEalVWSFpZZ0I0Si93UFh3NThvcFI4Ym9SQkh6Zks3?= =?utf-8?B?Y0NxQmR1dEFxOW5CMEhxWG50N2Nhc29QaVlyYnk3Wms0dmxDaU50STNnNEEw?= =?utf-8?B?a2dyK3R6b09yRVB2ajd3S0MxZmREejFBeUZudUlRVUhud09HMllPalJLdWpu?= =?utf-8?B?NW9zdHJLR3NxUjBkbjVFeWhKK2w2T0ZGZVVnRVl3RGMzSm05QU1wNGc5dVk2?= =?utf-8?B?WG9EL1N5eTdDUVZwdDVnL1BId0ZHWGZlb242OGtBZ0lEQmhocmduOXg3VXU5?= =?utf-8?B?Q2paVDJjRXBoNE1NQVdsTXJJSTJNSXgwTEFLcER5cU4rbGlzaEdDM2FIck1i?= =?utf-8?B?WFRhZUw1RzI0TmNTL0NxY25lNUpJbG1UZlE3K2RPVVk0b3daVDBIdDZxTkZm?= =?utf-8?B?bzFRbWRPM0RzeGNxOHVjYzg3L25lWThERlRtbmRYSERGNERZU1BzSzI0UlNQ?= =?utf-8?B?MzJPTFplQkF3b0hsblNqV1FBZ1pqTmxTUUN5NFhzSTFUUGVYQ25LZjlqOWRp?= =?utf-8?B?NjdlOHJLSVVaMUVQZ3hkY3o5M2dlN1UyWnN3NlZ5MkRhZHRRQVU3b0VZYVl4?= =?utf-8?B?QlNjOHp5V2ZsQVZ4VFdqbG1HL2VwS1FWYkpiNXZ5K3JEMDY3OGdNRCt3Wkgy?= =?utf-8?B?UitJTDh4aWkzcWNQUmNlSWd5clJQZWtlZ05WaEQ3UC9oUE12M21hN1ZpZkph?= =?utf-8?B?KzM3c08ySVpCemxUQUtQU3pSaC8vVzMzMUhzMlhVTWVOVW5wbnM2V042cHM4?= =?utf-8?B?UWcxNmRCUVBMTXRmRGswdlV3aU44djQ5WEVjR1FnV0xtZ1BwbVZMRVNGK0RK?= =?utf-8?B?b3k3ZlVYdUFxeUVKd1NtOWNmdkxxd2lRTExwZ2hXdGN5aXRoaUNLTFVlRGE3?= =?utf-8?B?akRGMGtIWVZQUTVoM1FKZW5CMlRqQ0VKVXB6RkZzRW01SThiejVKNU5PTjNy?= =?utf-8?B?aDJMbVd4Tk14OC9ZMURDcHlmNGtLNlZPZFdweUlyMDRnZm52eThQQXBRdEo2?= =?utf-8?B?Q0pVRE9RbVNaL1g5UnoreWRhanRoc2ZKaElSNndyOGIvcDFVbUc1ZjFCYVEw?= =?utf-8?B?N3l6Y2x1eVdIQWFQbEQ1WVpYSkhzVlNDbjc4V2F4dVZvUHZrYWV3UWVBZGta?= =?utf-8?B?STNIUkpRU2l6K05NNVROQ08zUzVYRVl0TVlhc3owdnZzSmlIMmRaRmQxUzE1?= =?utf-8?B?KzhWWFBxcWlMQ1h0ZlhYZW9VZUs5bUF3YVRWQ1IwNVRlZ2xwVFpUNEhtZDBn?= =?utf-8?B?cFNmaG9wUUNiRXJIVi94ZWl3a0FPeDV6QkVLOUhSRmErdGRuWFFQZVVsdjBL?= =?utf-8?B?UlRrM3dDS0k3SjE5OVJ3NVJHMG5nYTN4SGhpRVd0cmJqaHQ1V0JPYmVpYlha?= =?utf-8?B?YU02QUNTQVJ4RVZSUm9KRVcyKzQydEYxT2pLMzFseUtTWmRjeklWaHFyVlEz?= =?utf-8?B?V09ZcGZWUnZmbTNOYmxCME1vTTg4RVpZUlZDakVJRmQ3TlV1Vmd5WW4vQ0lr?= =?utf-8?B?U2JGNTBRY0UwaWpEUVpualJ2T2QzZUc4U245eDN5RlZ4c3ovN2hJYTdzdmJW?= =?utf-8?B?b0ZLZXBmK3ZRd0hkZFJ6WWlYYVhRVEIzS3I4N0puS3V4ODlIMHZJZjhER0lB?= =?utf-8?B?cW1rYVc2cFpZU3lDSjdjb0ZXanpTNWlkUFNDY2poRjVxSDByalRWRElVZzBy?= =?utf-8?B?RVcvaDFKVm5kUy83VDlHV3pOYUh1ZlM3NUxockhNZ3Z4WnZjL1BTVXZyejdL?= =?utf-8?B?RmRzOVBJYlNPSlRIdzFkZ29lQXNjZmR5eFd1T0VMMCswNS8wYUltUEZZZUJP?= =?utf-8?Q?yIg3jYNxSWWkjd1PQKud67kmP?= X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 6bd12951-152f-4dfa-dfe0-08de3c2c542f X-MS-Exchange-CrossTenant-AuthSource: DU2PR04MB8951.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Dec 2025 22:50:22.2904 (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: UXv4k2w7ZdUzxf4XBGMJDVN8EI8RZXlLI9AySmzz8j6t5oHQvpm2Nm9rY2dR+BOXR+sQuD3dr0r4FfKBc0Zu9g== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PA1PR04MB10794 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 --- change in v2 - remove error code print at dev_err_probe. --- 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..486092511d1f9381c250ddcf844= fc74c61a789b7 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\n"); =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 Mon Feb 9 01:12:09 2026 Received: from DB3PR0202CU003.outbound.protection.outlook.com (mail-northeuropeazon11010053.outbound.protection.outlook.com [52.101.84.53]) (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 19CFC328B43; Mon, 15 Dec 2025 22:50:28 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.84.53 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1765839030; cv=fail; b=QHK7NJG/GgNMO8U04PpfgAZAgnQImBwncY/A/o5+SPrWBylSe6aGpSQ6swGKAQWXraK0XcMfMYQmHjTB45zmXrUrT5h8QZak6ZEddUPTC8vqmDT75DwZivQXeRYQuNObLn+5CVaB2kLoUyHhWpNgQJMVnZd/yE3Ro/SpC79igzw= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1765839030; c=relaxed/simple; bh=Ak9aTBV1odt9+DYbyvjd8hjlmc6MWJpYvfaY1F9/1Ws=; h=From:Date:Subject:Content-Type:Message-Id:References:In-Reply-To: To:Cc:MIME-Version; b=VCJlWKEFQdsPWlI9Kq32qUTRzzixoMlnT/LpU4M1Sl3AivX0faC+3169vUdEoC4ZUGPrHjW6kHhKcxAWtuabmTTuT3k2I1K2tBAyIOQvMVLa691+5tTIzBtGacnwcJcRdd7gUmBw5/XqZ5ytYR5+KeNdcT6vM/Pi45oq6tOKByo= 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=CdCIaoAF; arc=fail smtp.client-ip=52.101.84.53 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="CdCIaoAF" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=CKYbwIti9vmWnGDGAq1A0X7jjDwgkYw5fEkAKBw1R1vtRIk0jTVDWQF9Y8JEaAwAAOxrCj/eQPQw6MMqJFaoHykFbiP3ThJI0gX5mXO3dQ2CraZWqChGhBTE4yZUKZkExgslBFToEB8BhSbfDvjUZ/yGsMUeO3S7ByCw9UBkJwwOclC4CH75zYF+x6jKWoMeImR8RuvwifkdK0RRbpwcG+kNTmQHdkqKnj8B6UahsoDn6EOuYumxBXPJZ1G41p63QZZkOda3zpuLSz19z1cuDzqGvBholsEOk2tQBR5mbYgTH1kCgucpCkvIIUVrNkyslOyMhm6oejTxYpiaBgw3Sw== 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=39a6rvM8PrBKT3cOM8LraxAEnxBtsALHjKOSvJwMzxE=; b=ScaoXkSCp0YXKMpiFoLDC2VdtBn3JEvIPl5e8PBAcBWYJlK7IRLRK9vacm64LTgu/5qjyle6BTB85LCZw5Z30GbnjC5qrAUnUjdIk/+CvlDadlimC1JSWA4MAltnNP+SIe1E6ldkCvnTUF7dJ3npuja1zZZq0gIwAoRlMlk9PzCC551ujNeDgEkuO8nN2TTrfXyZhAf154TNL1iaN03quHjUDbWyv0bMQBZ9oNtwky/3tqmtPuOkFIDhPFH16OPepgUI8FE61bZojwYPKbKaoFp3/YCVyKNtT5Ggqsq/Vf/xwNRmNJ2UtZlkBltZIlnX1qDEWEA2eW49wjIprEkZPg== 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=39a6rvM8PrBKT3cOM8LraxAEnxBtsALHjKOSvJwMzxE=; b=CdCIaoAF/Apu2A3LTLB6uH9g13LZBpL0kbhDadQZhoEJ06tfh2EGFjEdx32a+Td7rsYaDAcqY5xFec6zgQ1iU7JfBLXVeakzv+FiwPF+7VU4LXLI6vzxYLxnzT9qsXFe+S9raAWPV9kiSEHlBDEDmtPDRX7kpqEd2OrzMqeROXwgfDJCZh8eOGxsHoOd4lks2Ukd2s119cSSPMIjStxamLaSdzRa8sHeyguraJVMzNhYOOisPl57kph7K48RsGt2ydl3tz/vVZJEaQzSp0TpcuYFR8df36E5mZDaY31p5xVI/MrgHsrajoaEL5ZYLXeoh6TCTq0SHjfVJgfQ/UdvKA== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nxp.com; Received: from DU2PR04MB8951.eurprd04.prod.outlook.com (2603:10a6:10:2e2::22) by PA1PR04MB10794.eurprd04.prod.outlook.com (2603:10a6:102:482::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9412.13; Mon, 15 Dec 2025 22:50:25 +0000 Received: from DU2PR04MB8951.eurprd04.prod.outlook.com ([fe80::753c:468d:266:196]) by DU2PR04MB8951.eurprd04.prod.outlook.com ([fe80::753c:468d:266:196%4]) with mapi id 15.20.9412.011; Mon, 15 Dec 2025 22:50:25 +0000 From: Frank Li Date: Mon, 15 Dec 2025 17:49:55 -0500 Subject: [PATCH v3 4/5] media: nxp: use cleanup __free(fwnode_handle) simplify code Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20251215-cam_cleanup-v3-4-a61995068f38@nxp.com> References: <20251215-cam_cleanup-v3-0-a61995068f38@nxp.com> In-Reply-To: <20251215-cam_cleanup-v3-0-a61995068f38@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=1765839009; l=5228; i=Frank.Li@nxp.com; s=20240130; h=from:subject:message-id; bh=Ak9aTBV1odt9+DYbyvjd8hjlmc6MWJpYvfaY1F9/1Ws=; b=h8TqheMmTygmjYeRNKybrm+Q2xf2xYIvKkIE8KOjs0wX3vzC1vSiFHYOhqUEr5WDyJrBNHFvC henfV5X1APXAv18XiXuNNTUqB4WrscITDtlnkQN+v2WUSuO7FzVxKVv X-Developer-Key: i=Frank.Li@nxp.com; a=ed25519; pk=I0L1sDUfPxpAkRvPKy7MdauTuSENRq+DnA+G4qcS94Q= X-ClientProxiedBy: PH8PR20CA0015.namprd20.prod.outlook.com (2603:10b6:510:23c::8) To DU2PR04MB8951.eurprd04.prod.outlook.com (2603:10a6:10:2e2::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: DU2PR04MB8951:EE_|PA1PR04MB10794:EE_ X-MS-Office365-Filtering-Correlation-Id: 3e74eabb-0b82-4889-80fb-08de3c2c5603 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|376014|19092799006|7416014|366016|52116014|38350700014|921020; X-Microsoft-Antispam-Message-Info: =?utf-8?B?RkNqUjNNbGNVVWk2KzZ6bnBMakJNTzJ2QzQ3TkVveGp4bnl5aWgyRVZXVGJy?= =?utf-8?B?NjAxQkZCdW9ONHRjU3d1T2NQbmVGZ1haY0duVExRaU5UNUVjak9Nc1RTUG43?= =?utf-8?B?MDdJOG92cEp0NnpTcmR0QUJwQ2RUSlhqa2lNaVFKUVRvY3NXd0J3NTJhU0dv?= =?utf-8?B?cTZUbHJYRWNEeEJQSWdYQ3JFaDNWTnhXU1JaOXY3d2p0cWVhZDlYSEJKTEVk?= =?utf-8?B?UGtUNEpZOHNBQnVOVEJSSGl5S29EOWxocW8ydGpaSWY0cktUMitaM2JxQzlk?= =?utf-8?B?WThJL2IzQzVQMVU0R2c4M3JEb1VGcnhYTGlwckVBZVRmRStkcmllbnF4YU8z?= =?utf-8?B?YWJ1aDlCbDlONFNoQWlwanlkcmpJNUhzc0RVS1c4MHZZRzdHMWx0VTdudVhJ?= =?utf-8?B?WnBxdG9KSFkwYktQOEhSOW8zV1UxazBmeHVOc3NsRWhKcStHSWtwRlhqS1VX?= =?utf-8?B?YXg1a2krZnQvMFk0UkxvdmZrOVVqTFowSWZSYnpKanNBeSs0dnBFOHlUSFlh?= =?utf-8?B?ZFVFMmo1Wm81aHFsSkhVVG93TUVTUGpzY25sT0ZKMFMvWWx6aFppbWF0MFhZ?= =?utf-8?B?dEhMSSs3S1hDZFkydHU5SVdlaStzbyszazR2UGF6K2Zia3diVDVVcnNrNU40?= =?utf-8?B?QlNIR0tPTVNib0JQNTY0bXJPdjY2WDNldzVQNEk5RHd1ZWFWRGpiVk1RQkxY?= =?utf-8?B?dVV4S2I0Z2ZuWmpCSzBFb0YvTVFZalNRcXVhNkY4OVBrdlZtV2FIUlZtMzJw?= =?utf-8?B?N29VLzRydFExMnBoNUc3ME1oMmxYRTlZSG5WZGhkSy84cFFadnNKcHFta3Js?= =?utf-8?B?SzQzKzQ1dHpCZHVWeVAyY25TMkRVQ3g0cDlwendBSU5jQUxqdTBvUFJ4TjRP?= =?utf-8?B?YkhTZkxlejZOUmlLY0xPaFBkTFdKWTkwNXJya3dFaWVhbnVZYkVvcGptSjNX?= =?utf-8?B?Sk5DRmpDQy9HajZCOWY5T1BEYmVFNUZFUUI3L2RlQ0x0ckNWMTBjWlB5Z3Y0?= =?utf-8?B?aU1Pai8vbTJURUZ3d1VMWnRMOGRhYjZIMzM4Sm9QRUtXV0RKOTNTOTJKN3VJ?= =?utf-8?B?VTYxV3ErMS9XVlZPbk5FNXdkSE5oc1FMVFVVc2l1Y0JhQXErem1HVDY0NTAr?= =?utf-8?B?NXRvUlcvaWxTK0h2TDdaVzVSL0h3R3dxUDNpMHc2cUdUOWFSa3hCNnIvVDc2?= =?utf-8?B?M3pSeE8xSUg5VzdLRms3YnJYNHNScjBYUWw4K0RxQ2pyZENQZDlITzVVUFpN?= =?utf-8?B?OEg5NFhXQkpZYUtJUkhCcE5WdzZrMmNRbWpoU1NjSkVGVUtSR1J3VFRPbjNI?= =?utf-8?B?SmMrMFRQeEFaM2JrZXExTUx3UFlBZ3Bqdjg0VHJsREtLOTcwRjE5TUZaMzJV?= =?utf-8?B?bEtBK2dTMVRBZWowT0VVd01HYXY2NExXYVRIQ3dHSm9OWUZYbERvdEhqSTZN?= =?utf-8?B?Mlp0OWJuQXZlalJVZ0FDanFVcnRIVUxleWV3Yi9wWmNDaEFKcUgvNGhYbDVj?= =?utf-8?B?UmJidnFVVEFERlZqODNxZFNySjdvQk1FcTRBUXFGVG9uNU5MMGZqeUl3eW1s?= =?utf-8?B?MkhGUnhBLzJ4THYvaG9yZVRydEttZUdHcStIMnkzdHRPdkVXTmhNZGFSSnZw?= =?utf-8?B?OFh0Y3BxbDQ2OXRRdHR4SWlpTTV0bHpWek9ZdytONmtRTG1MZHc0dDEzRExL?= =?utf-8?B?TDFUN1kvNXRFbXlmN3pOcEZBTGhiWjR5dE1sNmZoaUEwdk13QSsyemFXMSt2?= =?utf-8?B?aS84bm5PczYvcnA5bFpiRitqY29jc1BvaHFwQTBKNThqdDlLcVJZS0diL2Qv?= =?utf-8?B?b0VzWkJJdVhJbnNTMWZ6QU5jRGw4VndlcmxoOGlwN2tYaUtLcmx0NThlVlFN?= =?utf-8?B?eWRyK1JESUhJQXAydkg2elk5am9HWkxWdS83Q0hhMmJEQzMybDliSlMxTC90?= =?utf-8?B?dm1MTkI2R2tnNUt1WUNXcnpnQTg3d2VWQ1pTa2h3Zmlob3htSWZBZldJWFpQ?= =?utf-8?Q?BPFIAlM++vNRZdWRNUsrGuC6thzg0M=3D?= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DU2PR04MB8951.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(1800799024)(376014)(19092799006)(7416014)(366016)(52116014)(38350700014)(921020);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?Z3c4bEVrZVhjdTlGNkRhZ05lM2lpa2d1RUNuaHN0U05ma09YVTZuYmEzZWhX?= =?utf-8?B?NDAyRkVGOTFXd2NoZFA3VDM0R0hGS21nbkMxeEdxeDRrR1RXUEd2SFppb1dk?= =?utf-8?B?OXMwbzJoNFVnclhWdVA2dDdRS2tBSEZvRmsyTkhPNHFJcStmUndJaWE1ZFc4?= =?utf-8?B?NzRYL3poWkJpeTRMWitwK0VpSm5NQy9VeHpFQnBpamo0L1NVOXJOcm9tQUx2?= =?utf-8?B?R2JaRlBqbE81c1RwbE1td3ovRExpMm41TkZ5Wm9yNzdkZmJvRWdzWi9NTVQ3?= =?utf-8?B?bEgrY0pYZWVUTWd2QWI5S0p3aG1COE9FcXBOY05HNFJodzBpM0pTeVdKai8w?= =?utf-8?B?VXJSak52dXBzOHhxcElKMzQrSGtPVFE5ckp5SVUxOWRZaGJiVCt0L1owcHBM?= =?utf-8?B?ZnFCNkdTRXdNa3IrSUhpd2YrWlFmQVRuaitsL3E4TTdMMUpnTVhKTWFlMUd3?= =?utf-8?B?aDVHQ0VrdnNFZmxSdzA0M1Y0QTZBMFBmSC9Scm1JelVUeXEzaXJVNFp1Mmtm?= =?utf-8?B?TDdWWG95RWZFb0FJR2Rqa2lQbTdTcW16R0lNb0txdXdOcHJGcExUcFBURVIw?= =?utf-8?B?QjdMN016NXRYZ0ZaOHJRYTQrSmhVSDM1cnRaMmdIa2ZHZHVSdHhOVnUrUTFR?= =?utf-8?B?cmYrSjArb0Q5eXd6d2ZSZHVFWXFvQVQ3dWRwMjdtN3FPVTJ1Q0Z3RE1HWUNO?= =?utf-8?B?cWhva0lKd1hQMUhSajRvd2JsSlR3TUcwZDVUdWpNQjBwSnl5MXZ2R1Y0eDZX?= =?utf-8?B?Y1IvTUNFUS8reUl1cHcwS2lMQ2xtK0I3Ti9pcnBtT3BQbXZxTmttU2huNzJw?= =?utf-8?B?clY5M1ZKZXFYVFhQcG8xM2VJUVlvblBCcFhNNkkxeGZJaVBaTXlZbnZEZ1Jv?= =?utf-8?B?UHJ2QWdPZk9ITEVDcysxdTZ0OFJNVTFrVTdMWVduZUF2S3ltM2Q0UXNpcEN1?= =?utf-8?B?akVnUklYSSs0STA3bmlKR3lMOUIwTDFyMkdJTDUwQzhLYm15VW9PMC9PeXl0?= =?utf-8?B?YkNCTkxNRlVISVVIWkV2eUJ3dEJ3bU5oVGNPdlE5SDQ0dTVvRVFKUUJRbTdI?= =?utf-8?B?dXg2YWQ3QURCSktLeDBRRS9tdm5tVTg4OTZBZUVuUEZqTTEyVTZMTHFZM2Uw?= =?utf-8?B?RFFZRzRkT1NoTUlBcFhjcHZOVU52NnU2ekRwVWx4M0hiMUxPVHh2dnJYWHIz?= =?utf-8?B?Y2tIWXFoWUp4eDNyUzlYSmc2bmxMNVZzcUllWU1YTWM2SWpNcmt1Znh0VGtz?= =?utf-8?B?dm9HYzdCYTBiTjZBWXBvajY1ekRVTnlCSXpmWVZxZXpGR0QycmgvR1Q5ZGRR?= =?utf-8?B?QjkzOTdKc3ZqMUcxUW5IUzl2cGRabEtrYzFxV3ZNYXh0VmROK09TS01iaWhK?= =?utf-8?B?L1BEYkJvNWRKU253TWJIMDloaTVXTWt5bHVzT2owU0gzSGxvSTR5RGZ1U3hx?= =?utf-8?B?RGtBeURVMWhQTGo2TE5kVGEwZUxaMzBlWXVWS1BNR2toRGg3Ym43MjN2cnJW?= =?utf-8?B?cXZRakRjTWt4dmZZdHFITzBOTU96Q0J4ZHdWV290ZnE5cXVQclhoaDZWOVNV?= =?utf-8?B?QUg5Z29nUUZIRWRQODVvbkdQOFJPYkhCWjBGZ1h0UVVnZEJnNjNKOU10SWVD?= =?utf-8?B?WmdNM3JLak5ra2pjdDRvRDlmZ2k2OVhLcnRwbXBFMlE3UEp2cFRObmRXNUNV?= =?utf-8?B?WUpQZC84Rk44dnNBRnNFaFIxRUw2Rk5POFF5amdXNmd6eWR2bFhlYWN1cXgw?= =?utf-8?B?TkV6dW5TaDRLWlVTbWJEVExuZWwxUVdBQnRRMFRjdzFIZ1doVHZtaDFhOHk5?= =?utf-8?B?SHVlRVIyTUxlYzl0bGt4OVlRbjJ4Y3Ard2xsY1JraEN4UTlSTmFBMllVRlpE?= =?utf-8?B?U3AyU1N6MGtFTTUyb1VJNjFKVVJBMldOTkowVC90VHhpQTIvTjRIMnNwaFdi?= =?utf-8?B?RkZ6UWo1K054Q1F5dE1GcHNTMFQ0TitkeVRSMU1QMSt4ZVVDRDNaekRQMWdD?= =?utf-8?B?Q0UxclBpcVc1K2VTbnd5cm5OYlBMOW9PL3V4bTlnSW1TdXlWdGc3bkNvRWUr?= =?utf-8?B?ODdNMDBMVEt3T0YrMnUxaTRNQkZjNzU5SEU3ZldHc0hHTTB5SG1YbEtHYjlk?= =?utf-8?Q?QOftNS7/EmF9uCbCaAsMEDS2V?= X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 3e74eabb-0b82-4889-80fb-08de3c2c5603 X-MS-Exchange-CrossTenant-AuthSource: DU2PR04MB8951.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Dec 2025 22:50:25.3263 (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: ll9Qh8/tVcz9+/jRndZ7uYwQ0Q84Yi+azDYqPo9Jjrh9kWDgElmAzN5Jx9nBSMTD5QQylC/9QwnF+SZ7mFARxQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PA1PR04MB10794 Use cleanup __free(fwnode_handle) simplify code. No functional change. Signed-off-by: Frank Li --- change in v3 - Rollback to v1 version to align guide at cleanup.h. - Ref similar link Link: https://lore.kernel.org/r/20240904044825.1048256-1-dmitry.torokho= v@gmail.com Link: https://patch.msgid.link/20251208020750.4727-3-krzysztof.kozlowsk= i@oss.qualcomm.com 452e0adff2618 Input: iqs7222 - use cleanup facility for fwnodes 52776177d8b7e Input: iqs626a - use cleanup facility for fwnodes 9a540b67a9c26 Input: iqs269a - use cleanup facility for fwnodes cc3b18f9fedec i3c: master: Fix confusing cleanup.h syntax change in v2. - move variable define to top. - remove dev_err_probe() change --- drivers/media/platform/nxp/imx-mipi-csis.c | 25 ++++++++---------------= -- drivers/media/platform/nxp/imx8mq-mipi-csi2.c | 25 ++++++++---------------= -- 2 files changed, 16 insertions(+), 34 deletions(-) diff --git a/drivers/media/platform/nxp/imx-mipi-csis.c b/drivers/media/pla= tform/nxp/imx-mipi-csis.c index ce93d868746f002c22e2f86b1e0aa84ec1a76061..9a43fd1eb0bcee7ac0c47f28ad8= 9012de45a70d9 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,27 +1350,26 @@ 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; + return -EINVAL; } } =20 @@ -1381,12 +1381,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 +1391,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 a007c582b4d91660a97910a6a0d53c9b6fcd73e9..550f9f725cc18fae910282ad72a= a1dde37af0b47 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,27 +718,26 @@ 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; + return -EINVAL; } } =20 @@ -749,12 +749,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 +759,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 From nobody Mon Feb 9 01:12:09 2026 Received: from DB3PR0202CU003.outbound.protection.outlook.com (mail-northeuropeazon11010053.outbound.protection.outlook.com [52.101.84.53]) (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 E324D328639; Mon, 15 Dec 2025 22:50:30 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.84.53 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1765839033; cv=fail; b=sdj5dvB3lazmLuJj002fsfSe2oA+3Tg9jRZCj0rUrxHOu8d2ZpXomw5oUk4RKbAzkprUaL3vyUIpXbKRvqhBWjduH04XIW4bi5YYJcvJ95hvYfVf2XpCwnkDNJ/1J0HCayj7xM8iQ2EicmUt1q4zgc/isF7cJOFbqaAHNTGMNdo= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1765839033; c=relaxed/simple; bh=7gY1+YaE8rhALfvIfekwAg5NRw/rBENV0gFy0TCAUrk=; h=From:Date:Subject:Content-Type:Message-Id:References:In-Reply-To: To:Cc:MIME-Version; b=QC+3je7zsNb4jwJfZ0IyXCYz8RrtVFCgWEpVpi8Ap31VSHQVXdpJHEl2AYpWOOICm0Hqe/7yYtgvjlGZzPUSAOXZA7QIJGuyN/vKBToLjymVJTk/ZLOqqMqLJouCBYaYL68JrIGdr/t/gMxNfAWfVsF7SFgvrjm2wsIzvaW+lL8= 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=JO6gahvX; arc=fail smtp.client-ip=52.101.84.53 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="JO6gahvX" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=X1i8F4HqBYDCHl89umbEuhMZxqCHjqCnMhMNc/8Zy9a7F/GihvztmEnwYKlgOuEMl0SRpoumLHN0cTTQ6cC0MsQC83fTSgFOO+aI9BVi4n2BgEFETdSgO+u7I5tp4jbX10/cvu9A+bipE+ysvTAEV+W/oYsSJD4Esu3upM2jg7ntPXVJMtWes/lS4Xr9pFI4H1kSCrJWQB3GViHyXwPE0uaxe7MrpBksA3w2DIzGyKwMEHM6OW4NsNG9cQxAlVE2lB/a5M0eJH7pXvt9iNUeoOoU+LS+auySiJBBuX7WguJVtAQb5HQpU3/BP8Atwsk2qtKq++pmuuURWxbWBXyU0g== 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=ftLQxKwVe+XCJnaNRJrxhRGrrOr4EjiRt7qhYKPdkvA=; b=M6jFo0XtA+wHtYXoIglg313Mrch6A2Sk3n434ZuvHzqR6qb0YM1SGiPRVefWD8GWtAP8xi/+XTs5h0eu9CfPtvxIKviQDdIw5dxNpgpNooQ6v0okwk+AtXs8ZkdJ6uUUr1phN9Qlh/oTXuei5nhjKrFFCgiNDQNeeCcjbDWXDunIs+JKQ86uD0xlO1EOf97MnHj7/WuIJ/ixRsJWwEjBMOSQdTMZAhCeZThvdJ092Thl1xNKJm2sbR2tZZfkBkAfsHoiQHKaDzZ9dYiBBKED4EzNlTfm7H/bGVlYkSgX8nD/6JdzCUFKr/UtzmXWAqtGcJdM/AIfQd2Yqh2NzSvJCA== 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=ftLQxKwVe+XCJnaNRJrxhRGrrOr4EjiRt7qhYKPdkvA=; b=JO6gahvX5E/8Y+EHvVhyWQ6AolA+sUV0BCFY7bf4RftV+uvui+HDd6bGxab+RlxnfJG5WWKH42h68fWiBzzrAfiotsPx0JoKI21lioyrA9IFmuBkQXKp1OQuSl+zqwwoeBr8rmXRRBQjNumMIOl9iWY8KT24TofROZj/VMs3tdR+E+0tbR6J3Gbxq6ef4kEikYgEkPf/wteTbzYaDBj6SnRNP3z2yTwVSYSajdwnU6KC7MBhJDn7bkM4ET76/5U+/yyzcbhzKcc7bzOO2ZeP5b4gXKNOa8gv2xniwSdk9YWNBnQbGbPD/llIFyYASyErzWWby6BzkWQR1ExW2ZNDTg== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nxp.com; Received: from DU2PR04MB8951.eurprd04.prod.outlook.com (2603:10a6:10:2e2::22) by PA1PR04MB10794.eurprd04.prod.outlook.com (2603:10a6:102:482::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9412.13; Mon, 15 Dec 2025 22:50:28 +0000 Received: from DU2PR04MB8951.eurprd04.prod.outlook.com ([fe80::753c:468d:266:196]) by DU2PR04MB8951.eurprd04.prod.outlook.com ([fe80::753c:468d:266:196%4]) with mapi id 15.20.9412.011; Mon, 15 Dec 2025 22:50:28 +0000 From: Frank Li Date: Mon, 15 Dec 2025 17:49:56 -0500 Subject: [PATCH v3 5/5] media: nxp: Add dev_err_probe() to all error paths in *async_register() helpers Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20251215-cam_cleanup-v3-5-a61995068f38@nxp.com> References: <20251215-cam_cleanup-v3-0-a61995068f38@nxp.com> In-Reply-To: <20251215-cam_cleanup-v3-0-a61995068f38@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=1765839009; l=5116; i=Frank.Li@nxp.com; s=20240130; h=from:subject:message-id; bh=7gY1+YaE8rhALfvIfekwAg5NRw/rBENV0gFy0TCAUrk=; b=pTGptWQ9JfwkPrUblMLkZxplLJ0wgtdmfogC+BcBEhWOnr4+KYyQzWgE4/yRYNzY5ucNlhWDq 4gmQzhHtr+KBbZ55Df3VhvR8WadpW0G74PaNmgDF4rGrPuyHOk500ld X-Developer-Key: i=Frank.Li@nxp.com; a=ed25519; pk=I0L1sDUfPxpAkRvPKy7MdauTuSENRq+DnA+G4qcS94Q= X-ClientProxiedBy: PH8PR20CA0015.namprd20.prod.outlook.com (2603:10b6:510:23c::8) To DU2PR04MB8951.eurprd04.prod.outlook.com (2603:10a6:10:2e2::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: DU2PR04MB8951:EE_|PA1PR04MB10794:EE_ X-MS-Office365-Filtering-Correlation-Id: cd1a076a-ceab-4501-3a43-08de3c2c57db 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|376014|19092799006|7416014|366016|52116014|38350700014|921020; X-Microsoft-Antispam-Message-Info: =?utf-8?B?bEFGOGgvS1U3Z21nZ2NPR0RNZGRabXoxRFZKdVZVYmcvTHBrRmVtci9mQmZL?= =?utf-8?B?b1lNOFlyajNZcHpEa3B2UjQwcTNFaEFpaXZLaXBDU3RYYVo5bDN6Nyt0SFNI?= =?utf-8?B?Z3QxR0k1ZUxURlJWdHJMMUlrcFlxTUxseU1HUzd2aVhwZlFsSE9tTEI4cDkx?= =?utf-8?B?Vks4R3ZQRlk5bmtla1prRGtXOWdMTmJBTnRPYmhlbXArTENWQkJsVitIT0Uz?= =?utf-8?B?S2wvT0QrRzYxV25Ib0UzbXN4dGxDSEdXQnRQVlRQdXQ0RHA3cFBXbDZGOUQ5?= =?utf-8?B?a1BCb2lvSVVTZnBCT0tBaEt2MWZtZG9NSytBZzVIY0pMcitIRHk5VVdlNTZI?= =?utf-8?B?bU5kODFQUUVzUVRPS3BMSmlDcS9najByclR1aENqWFBGUnVxMDFVUkZXZkdK?= =?utf-8?B?YjFOcmR2OUdJak5KTjVVTGRONVlDVXp1cXlmbS9LMWsyaGdrTVFsR0x3Tnk2?= =?utf-8?B?Uk93SWVYWnQ3cGRmT2N2SnVxOUFwUWZCRTkxdi82MkRlRGFQck43aEdYQkxj?= =?utf-8?B?OHp0cFFweThVL3NTZnpvZ2VobHFuNS9Qc1hXS3FsZEIyejdtMm5BQXZNbXdJ?= =?utf-8?B?L2ovQjV4YXVMUWw5c3ZrSXdaWVoxaHlRbW9ieHdNbFFDUU9lVWp6K2hsQ0Vt?= =?utf-8?B?YUMrMmxHZVo5dGlHRHFHTFE2Znc4czlKbTBkYTh5NG01YUt5RnVtNXBTODhS?= =?utf-8?B?L1pPMHNUY0JzeWd1Nno4SVMzSlB0YjlsRWJFdXY3OGZNZnVRNnI4UmVUdjYx?= =?utf-8?B?dUJmdE81MVNMTHUvdXVFVGdwR3Y1ZU1iUUVDbzdBMWs0ck1MSTBob1FCMWhk?= =?utf-8?B?SWNwendZRFVTVWNndEVLakU2SFBvMVBrdnRGRHRpWG9uUjdQeDBVRTR4ZFIv?= =?utf-8?B?TXZVaXN3aEszdUxNQTkzMVNtRkcrcURBV2U1ZCtUeHRNOHJGbk1LS2w5dDQx?= =?utf-8?B?YStaZXNMMndNY3hJQ1VZTXhEMVhzNjZ6MWxPWTEzZ3VmTmJ6dkNNWGFrMkVD?= =?utf-8?B?cmhLRlpiRGRlVkNETGVxOFJpeUYvb0NmZGMzWVU4MWN3eit2NHBTSmM0Ri8y?= =?utf-8?B?eVRUMTlVdUdCazhDNVpVaU9wMDB4SFdGNTZGeTREOEUvT2xVemthdVVBd3Rs?= =?utf-8?B?cTg3TG8vSmxBQitraHBJK2tvY21zVXpycWlIbjc5V3E2d2g5Ui9ReThPMFlJ?= =?utf-8?B?R3o1cU5rNXc4a2FtWnJ3MElZOXVBeWJpOGl4YmE1WFd0V3BrQi91YVJtRHNp?= =?utf-8?B?c1RCSmZCcE1HK3FOZ1ppV1BiMjJnanYzU0lvanlPMkViOGdoU3VBdWdIcmRL?= =?utf-8?B?UmlWVTlLZSs2NEIrdzNaYUhXSUFBSFpoclJBWWhWVDdDMGNoMEg4a21yd21u?= =?utf-8?B?a1BnRURRZm9BL3d2T3ZrSkZlUzN6SHo0YnlIa0paVk1uMGF4cld2SjRVNkdE?= =?utf-8?B?T1NpckZ5S0pjOFZPZEFmc3JKb21BZHhhOVFlSndDQlhqTEZWWFV0cncyQzBy?= =?utf-8?B?Q01IYzRRa0RzYVE2Tjhkcm1WR2RJSW4wT3JNOG4rYVh3K2xDQ3p0WlJid2cx?= =?utf-8?B?a2JXaTFmUDFvVnl3bjRZcWpxNmhyM1lBSU9jcUlCTnF1TFJzeGo4ejlPMitZ?= =?utf-8?B?VGgvV3k0MWNsUHVLNFB1K3BsZXduYTU5Mm5wWTZ0aDZmbjN2QWJ1TEM4cnl5?= =?utf-8?B?QkppNDVrM0pBVmN6SGc5WmJpTGt5b3ZFcmFuOFNHc05EZ1lNQkJ1aFJVTnoy?= =?utf-8?B?NHFGRm5aQmhrZHRkK1FweUtQL21mb1VSaUM2V2pNZ0JyZ3BuSTRONWNVVS9t?= =?utf-8?B?NjBNcDRZSnNoRlkrTnBUNFY5c212MnFweFhicUJ6TCtTdVhMMytQR3NsZmVZ?= =?utf-8?B?a01iVDc0WktWeHFNY1hVOWJaK0FBOHNreUhadU9sTE1OcGxOY3B5Tk0zKzdW?= =?utf-8?B?bXUzbVVuelg4eVh1NTZOTm0yNWY0c1RGZ29SbHlRcjF0NEg5Y2Q3OHU1aCtI?= =?utf-8?B?OURHdE9MMmZSbDE4WDZTelY1THEwUy9JSSs4dmNHUzQzZEZFZit1YldLdFdB?= =?utf-8?B?ZkdvYTNDbm1Uem9kRHdQSE9aQVB6ZERNcG1RZz09?= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DU2PR04MB8951.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(1800799024)(376014)(19092799006)(7416014)(366016)(52116014)(38350700014)(921020);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?dFcycnVPVnpBczNwNjZwK0lUSHR4N3V4a1FQQXM3cEJVWmpnWUF1ck1jMkQr?= =?utf-8?B?bnA1OG9QbjcySnN3bHFNd2dvUVMyZ0xWYmp2a1pvYkYzZWxoNHhKM3lERlNS?= =?utf-8?B?aDhhWXJKWmp6ZjRSZWtEaENoZVBMQkJWcW1xYitZSmNURmFmUzc5RUlMK2Jn?= =?utf-8?B?bjNGOXZUc2NNZGgwSVRycmJpWnZzN3VEaTdwMXZwYXpjdGU2QU1lb00vQnJC?= =?utf-8?B?ZVIveStJY0tvUnE1RjIrMEI4K3VqamhubldWU1RpMGhMSjcwVVRoYW9yQk40?= =?utf-8?B?SHpLSDNyWVdUbDl5cjkvNm1QTjJZZ3lMSTUvZ0FiMGNxM0Zic0NrVCtpV2hW?= =?utf-8?B?QUw3RzVpVjVOS2NoYjNuTGVsSHNrVS9mS2JMTzZTUlBKTFdOKzdnQjJra3ZS?= =?utf-8?B?Y0FBS1haWnFVTkZyZ1NtQnNUUC9uMGVsSGJFNHgwbXcvNlpreDh4QUE1ZkxV?= =?utf-8?B?YSs2TWpBT2ExWVZvc1JJc1hDNmtlVHByNDJDcXZoWThMeVY0VjU2cGJ2UGZE?= =?utf-8?B?NXpNVU83MGJ1ZmxyMEV5RXpzQnVEQnFLTnMwWWJFVjZ6cEJKZFh0Ykk2bkR0?= =?utf-8?B?T0VOWVNUOHdaRjZXcVZLTVlPdjJXekx5Q1k5U2toYWRhcDdWNGwrYWd4bms5?= =?utf-8?B?M0pUL0tKbU8yeWxJYlUxUkFHUGdvc2c2Z213bTBlRXZQcmNNbzJLUFRFaTJI?= =?utf-8?B?amtRdlZtc29JUnZWaXVNaHUrMmxPWjZSTGF0bmE3cE9KTU1mOFN6aTcxazRx?= =?utf-8?B?ZVJOeXFSY3lvNld5MTlxT0JwNitVR3YvZ3dwN1prNzlBMFU2L1JVRnRQcFZY?= =?utf-8?B?Y3krLzRWUHFLb0xRZGdDZW5iTVdyMk5aTUlxN1dVRG1USFhCazFDa0Q3azlE?= =?utf-8?B?aWxEeU5kbUMzQk1hYkpRb3RJb1FKR1o1WUg0MUlLSmd0clUvbXNzZW5oNVZW?= =?utf-8?B?QjNrcEY2UWFwQ2pwVUxnUXdjbmlMYXhIUTRneU1DYVFNZnc2MHRkVU5wTUgx?= =?utf-8?B?bWVQbTZORHpla2dlbXd1REk1YkduQ08yd1oxT3FmZWlIU2FHNFlmbThGZHNZ?= =?utf-8?B?czBIa0E5QXhLaUk2N3pONExDY00xTm43bStVTEZYUUsrTlpvRTB1eUhNYTQz?= =?utf-8?B?WUFtcytBbjRTV3ZnS3RIZGJ6ZkYzQWF0MG5IZnppT1cxczRhSXVsTXBDdEtv?= =?utf-8?B?WU02MGZieGw3cUxsaFQyRjFPQ2lJUDZSSmxTTGNlQi8xbzJISHhkU21CNFhO?= =?utf-8?B?MW1VTUYrSmZNQlVROVpseW9NS1NsRnp5ZjErd3hETzBJa3FaenlPTENqV1VU?= =?utf-8?B?U0ZrRzNBcDNrVks3RU15UU1PV1dYWTVkdnlyMkRIa05RRmJCa0Z1MWVwV09R?= =?utf-8?B?dktXRlhQUFlkaGhYTWVYWGJNVkFSU1hMODVEYUpaL09ienRqSitxSlpnK3p1?= =?utf-8?B?Zjk0UzQzQVRwNzB2M0ZDQjBhTjdnVklMRExGbWN3YTcvYjVFZDU2ZEVwN1dV?= =?utf-8?B?WDkzaTRJSXBoV2Z1SXFUbjNHTnprbzR3QTRTcnpaMHIxNWpBSEhVb09aNnBi?= =?utf-8?B?ZENocjB3NFdkNVJYejE2RDVuNXd6a0VKZVN3SXBZVVBLNEU2c0RIYnh2SmJK?= =?utf-8?B?MG9kdHEvVUZMRTROZWFIOWdna2U5bUZGSXphVmxkeUYvdVE2NnBvTEFpT1Q5?= =?utf-8?B?Z1dpOFBZb1pQRjJzMm9HdTNlRml3MVhGL2hHNEUzdGFVYzFMU2c0MkxDa1RY?= =?utf-8?B?cFZmNFZsK3ZFK0JjczV5VlVhVDR4c2l1Mk9hcmJ3TkhsV0c2Y1hvOW0wQXU5?= =?utf-8?B?c2cwQXZ4dUNOdGY0RUpZNHNMTXdPVDd0UnBsS1dSblNjRTNoMXpyZUp3WWtR?= =?utf-8?B?VGh5cm9BMTdpRFExMHRUNmIwbWFTSTdYZ1ZHQnNWNjE4U0Evcm91bTBkUG1r?= =?utf-8?B?eXcwdWxSVlhYQ3lmUU13Y1BsVURZZFlwNWdlMEt5L1kzdFpuenZweVpCMURm?= =?utf-8?B?cjM1NzZlUGdUeDhobXgvdllpajVVT1pWcWI5VUlidEJnajJOaUtGeDR4ZlM2?= =?utf-8?B?WVNlK3lWUW1tZTJUaWNPL0hrdnQvQ0w0aHFwRjFyeURFSmI2a3FTbVZGaHND?= =?utf-8?Q?GU7jzI3BhrGrJdmf3A1a1f+tN?= X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: cd1a076a-ceab-4501-3a43-08de3c2c57db X-MS-Exchange-CrossTenant-AuthSource: DU2PR04MB8951.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Dec 2025 22:50:28.4309 (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: OA4PsOVfiT2GFnNTJkjOY7IFrl89ji2pBYes7SqD2xugt6mRaZdJGnGpXh6SyuQOBRd8m9mGJRAGKK7yJdH4Lw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PA1PR04MB10794 Add dev_err_probe() to all error branches in the *async_register() helpers to provide clearer diagnostic information when device registration fails. Drop the explicit error message after returning from mipi_csis_async_register(), as the error is already reported by this helper. No functional change. Signed-off-by: Frank Li --- change in v2 - new patch --- drivers/media/platform/nxp/imx-mipi-csis.c | 31 ++++++++++++++++-------= ---- drivers/media/platform/nxp/imx8mq-mipi-csi2.c | 27 ++++++++++++++--------- 2 files changed, 35 insertions(+), 23 deletions(-) diff --git a/drivers/media/platform/nxp/imx-mipi-csis.c b/drivers/media/pla= tform/nxp/imx-mipi-csis.c index 9a43fd1eb0bcee7ac0c47f28ad89012de45a70d9..85098824f4917b3cda3aa71c4ed= 0a41939283e12 100644 --- a/drivers/media/platform/nxp/imx-mipi-csis.c +++ b/drivers/media/platform/nxp/imx-mipi-csis.c @@ -1359,18 +1359,18 @@ static int mipi_csis_async_register(struct mipi_csi= s_device *csis) fwnode_graph_get_endpoint_by_id(dev_fwnode(csis->dev), 0, 0, FWNODE_GRAPH_ENDPOINT_NEXT); if (!ep) - return -ENOTCONN; + return dev_err_probe(csis->dev, -ENOTCONN, + "failed to get remote endpoint\n"); =20 ret =3D v4l2_fwnode_endpoint_parse(ep, &vep); if (ret) - return ret; + return dev_err_probe(csis->dev, ret, + "failed to parse endpoint\n"); =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"); - return -EINVAL; - } + if (vep.bus.mipi_csi2.data_lanes[i] !=3D i + 1) + return dev_err_probe(csis->dev, -EINVAL, + "data lanes reordering is not supported"); } =20 csis->bus =3D vep.bus.mipi_csi2; @@ -1382,15 +1382,22 @@ static int mipi_csis_async_register(struct mipi_csi= s_device *csis) asd =3D v4l2_async_nf_add_fwnode_remote(&csis->notifier, ep, struct v4l2_async_connection); if (IS_ERR(asd)) - return PTR_ERR(asd); + return dev_err_probe(csis->dev, PTR_ERR(asd), + "failed to add remote fwmode to notifier\n"); =20 csis->notifier.ops =3D &mipi_csis_notify_ops; =20 ret =3D v4l2_async_nf_register(&csis->notifier); if (ret) - return ret; + return dev_err_probe(csis->dev, ret, + "failed to register notifier\n"); =20 - return v4l2_async_register_subdev(&csis->sd); + ret =3D v4l2_async_register_subdev(&csis->sd); + if (ret) + return dev_err_probe(csis->dev, ret, + "failed to register subdev\n"); + + return 0; } =20 /* -----------------------------------------------------------------------= ------ @@ -1549,10 +1556,8 @@ static int mipi_csis_probe(struct platform_device *p= dev) platform_set_drvdata(pdev, &csis->sd); =20 ret =3D mipi_csis_async_register(csis); - if (ret < 0) { - dev_err(dev, "async register failed: %d\n", ret); + if (ret < 0) goto err_cleanup; - } =20 /* Initialize debugfs. */ mipi_csis_debugfs_init(csis); diff --git a/drivers/media/platform/nxp/imx8mq-mipi-csi2.c b/drivers/media/= platform/nxp/imx8mq-mipi-csi2.c index 550f9f725cc18fae910282ad72aa1dde37af0b47..f63e0fb1f3091d560dba10dec92= 523fc74fb6384 100644 --- a/drivers/media/platform/nxp/imx8mq-mipi-csi2.c +++ b/drivers/media/platform/nxp/imx8mq-mipi-csi2.c @@ -727,18 +727,18 @@ static int imx8mq_mipi_csi_async_register(struct csi_= state *state) fwnode_graph_get_endpoint_by_id(dev_fwnode(state->dev), 0, 0, FWNODE_GRAPH_ENDPOINT_NEXT); if (!ep) - return -ENOTCONN; + return dev_err_probe(state->dev, -ENOTCONN, + "failed to get remote endpoint fwnode\n"); =20 ret =3D v4l2_fwnode_endpoint_parse(ep, &vep); if (ret) - return ret; + return dev_err_probe(state->dev, ret, + "failed parse endpoint fwnode\n"); =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"); - return -EINVAL; - } + if (vep.bus.mipi_csi2.data_lanes[i] !=3D i + 1) + return dev_err_probe(state->dev, -EINVAL, + "data lanes reordering is not supported"); } =20 state->bus =3D vep.bus.mipi_csi2; @@ -750,15 +750,22 @@ static int imx8mq_mipi_csi_async_register(struct csi_= state *state) asd =3D v4l2_async_nf_add_fwnode_remote(&state->notifier, ep, struct v4l2_async_connection); if (IS_ERR(asd)) - return PTR_ERR(asd); + return dev_err_probe(state->dev, PTR_ERR(asd), + "failed add fwnode to notifier\n"); =20 state->notifier.ops =3D &imx8mq_mipi_csi_notify_ops; =20 ret =3D v4l2_async_nf_register(&state->notifier); if (ret) - return ret; + return dev_err_probe(state->dev, ret, + "failed to register notifier\n"); =20 - return v4l2_async_register_subdev(&state->sd); + ret =3D v4l2_async_register_subdev(&state->sd); + if (ret) + return dev_err_probe(state->dev, ret, + "failed to register subdev\n"); + + return 0; } =20 /* -----------------------------------------------------------------------= ------ --=20 2.34.1