From nobody Tue Dec 2 02:18:52 2025 Received: from OSPPR02CU001.outbound.protection.outlook.com (mail-norwayeastazon11013056.outbound.protection.outlook.com [40.107.159.56]) (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 C7E16302170; Wed, 19 Nov 2025 21:34:43 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.159.56 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763588085; cv=fail; b=KSwtRBCkas5N2NaPwH2s77euGJF1oX5520CGLZbn2P9lw1nkTmlzxl8d66fSVUTNwgZvfQnoFmc7cjgqI40SezswfSJ7N732JLMsGL7t5Sgh8X+YH9229N5PrXTWYGFb8pVVJTwu3fRTqp3BhXIgrojP4FD4dMylRZApaaTJ/pk= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763588085; c=relaxed/simple; bh=ARPVaqVAWLk1VA6S3ScOC7ebUNYLCY1YIOO8jKmKuaQ=; h=From:Date:Subject:Content-Type:Message-Id:References:In-Reply-To: To:Cc:MIME-Version; b=b8vDDdzfrFbiE7aU8aisi7TtMU2ISA3hEEtK8irzXdD4poYUHBVRBacxtNYcqO1O0jWlCMBhZe6YQR5WFpdAWTzj568F7xaA3M/g6IWk+Oz2qwlvB8mimHM284gJ8Gc6gnvsh6XsEK3xQVoJFBy2mnRiXunHa+LJvCev5EywHHI= 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=fjmyDpkx; arc=fail smtp.client-ip=40.107.159.56 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="fjmyDpkx" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=vfdRTJgDrCoZV39yLDbHIsWiZN7xs7cYtR0MGTa8Izp7DqIAflBLsVOagdFUgUBhH1fCUxNzoNyGl9zAppq5DGpIU5nzoTip0TvI3HO3lCC5wspH5szySCeNtMC+KFBYVXulOzgBDrQp/uifipDo16mFA3/T4DzwG8CGMJyuX6896Ar5Oc0J5tMdJf5AyWYLRBdOtTnLDOuAZOYBryOD1mtJZj/N821DrdwEAfXTjtZDgUbp7EMiFpuGoNkg2V/uMnXg1/9nm/iSImXmZbUL4zBk1cjIbzLhx9BI4wVD3KJYlXWymMq0kwuPnzHsjHGF5AxAswFmYiqplpddGSa9Ig== 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=dv1Rkjk4KU14oZHnlmT+JBY2ju7q5HbJ1uoi6cglXHIjG/I/DqPYzgVC21TDxahXSp/whkn3s/+3KG4p9CbwTjg+G11qwY9TmfuTD+krjAydLHN9miL3Zhs1nmM7d74H5DdTs0cF9Tcztqw/r0KsMC7/NNThtyzWHjv7A8/w+JLynT0UuTlSTGtRr3Neiv4vjZ7whUcnVFxmIoXMdUxBwIDisi2Rpiay50cykF+3oWxsPhh8LSUo+IUPnrV+vSaT/9WU+UAS4U3dY9+i4F/qeej5h/VD95AWYVeyS+Jc3C5GEbeJg4tSi0xLMEDq7HOZ+kVTKbqqKxtbM+n5zRkGDA== 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=fjmyDpkxalH36h2+VHAMBQEA6SVsi/osJ2Q4RuEAm4UxznpAtvSkyXkHBtxNtu0dyjgiJ7mKUQG/U9wb2AL0DEM2hZt9lmB9TeY4McSjQelE5MScLMPG/cSvHAC/cYUe30VP51kqjQIUWhLGpRzKioyAlhnDUL+p0gpqjW+DcRvc0/Vfdd9u23KbddAb41N4T3Miw7K2R24sREuqfRgMpboVERbA7/LZEPbQxaTIzSQleAyWZBSDn10t3ZSnqvX4jJzwR1/IpQQa8wfZm7pplPYt9fujFvQtcVGdTIRAclqc8G/Pn1O3pLllbFt4fOgw1lcB7HlcKZjR++AnawAcDg== 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 AS8PR04MB8433.eurprd04.prod.outlook.com (2603:10a6:20b:407::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9320.21; Wed, 19 Nov 2025 21:34: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.9343.009; Wed, 19 Nov 2025 21:34:41 +0000 From: Frank Li Date: Wed, 19 Nov 2025 16:34:24 -0500 Subject: [PATCH v2 1/5] media: nxp: use devm_mutex_init() simple code Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20251119-cam_cleanup-v2-1-df732cc83ff1@nxp.com> References: <20251119-cam_cleanup-v2-0-df732cc83ff1@nxp.com> In-Reply-To: <20251119-cam_cleanup-v2-0-df732cc83ff1@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=1763588074; l=3593; i=Frank.Li@nxp.com; s=20240130; h=from:subject:message-id; bh=ARPVaqVAWLk1VA6S3ScOC7ebUNYLCY1YIOO8jKmKuaQ=; b=Edr2M1OFgteUJ8Oc1jeOv48lUgqV0rdgoenkH+Sr76F453ASzF40Y+k8LadXgHJJGg73krV6H XhSO1z31qEKBx2c8yJitojlRbR+sZ7QQQHJggk+sNs//6WoLlC1vl5U X-Developer-Key: i=Frank.Li@nxp.com; a=ed25519; pk=I0L1sDUfPxpAkRvPKy7MdauTuSENRq+DnA+G4qcS94Q= X-ClientProxiedBy: PH7P220CA0043.NAMP220.PROD.OUTLOOK.COM (2603:10b6:510:32b::12) 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_|AS8PR04MB8433:EE_ X-MS-Office365-Filtering-Correlation-Id: 9f0913d3-c7ed-4919-6f28-08de27b372e8 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|52116014|376014|7416014|366016|19092799006|38350700014|921020; X-Microsoft-Antispam-Message-Info: =?utf-8?B?S0MxU09oSVRZblRPYlZKTDR0V0tlUlVxeUNzK29idWdvWVh5aFlaRlBjb1h3?= =?utf-8?B?bXVkU2FaYlNuS2tmVHhRL0dDQVZwc3pYZWhHUTkxcEJ2d1Y2Yi9IRWZMWmll?= =?utf-8?B?NXliWFFIVFlORmIxS25lb1REdVJBOWczWmVDUklhay9pUjlETXN6YlB0MjM4?= =?utf-8?B?TmZYOUJYZkEzdCtGVFgvNVRLWGdmNGhBTVpDSmtwN3FXa3VYWVJLTzRRQmtK?= =?utf-8?B?QjJDU0pIS2M5Y0twaFYyckloZ0FJQng3TXVid0VKeks3YWNqaVpTTm1TWGpi?= =?utf-8?B?K0ppa0drMVpobWtBcnd6MWtycnRjaE1CUkZvZGg0YnBKVkd6eEJqVXJ3cmhI?= =?utf-8?B?NDlKd0s1d2pUa3J5eWhBd2IyMTg2U0NpbUtOczhMM094eGFxeUhTaFBLZWVT?= =?utf-8?B?RlhRUGZtSEMyTjVrb3hrazNDMDN4eExiZDY1M0dXRkNSai9FOC9tNlpIMEla?= =?utf-8?B?Ri9YRHRmZGdiOE15ZHdUNENsSXI5bW5OOEcySEJaRkY1czhyQmt6K2RiR1Js?= =?utf-8?B?aWVDTUF1RUd3VU0xWVNPeE5TeG5lODBienpUVzJsZ1BnV0Z2dmdDeFJFS0lx?= =?utf-8?B?VjVpbG5RVjdBTGlWbTR0SDZKZ3JzZy9JSEozcmpOV2x0OE1JZFNJcEZydGpr?= =?utf-8?B?am5tU01tUW5XVjhXNDRBWGhodG1DMDU3WmZCL3BYb0ljQ3NvWm41a256TS8v?= =?utf-8?B?TWljNWRVaEYxTFl4Q1lGSkJhQ0JvbUQvS1FNbm9HOC9LSlFITVBzbkpIWTBj?= =?utf-8?B?REJBVkdpZW1YSEJaRW9JdUNLeTJzSEo4M2xzQ3dyVDJGNWxQQWZtWWhveGk0?= =?utf-8?B?T1c3TEZxZXZ0QlQwT2xVTnJ1TG1lRythMTEvZVl3OHJ6RnlJSDdPQWFieUhz?= =?utf-8?B?MlNubll1ZmNabjlmU0N4WTdia0M4cGxNNlZjRStvNnJrM0lta3d5M3V5Q0Vp?= =?utf-8?B?K3B0VlM1ZHlCVmpoSDdyU3k5SjZKblRxWCtPNWFxMVpSU0djQkJIVkFyT2E3?= =?utf-8?B?dUt2YlhzajczSy83SVdRdVhLcTh5RjRwVzBUem9lbnNiTlYzV3RtMkhCTHI0?= =?utf-8?B?dzRtdzU0eUg2M1U1NlVaT3dMcUtEeXNRVkNQQ0tvc2FlTUduSkg3NTljQmR4?= =?utf-8?B?MTN3eVhzbkl4ZFdVL3dIT09XWmdIVzltTW80QmdrUjBRN0dyS3hmMVphSHdU?= =?utf-8?B?VWZRSGM4Y0RzK3ZhOHhkWVJyNkU3NDdlNmV4akQzellhY3RHekV5ZXhpUmR4?= =?utf-8?B?czRJL1B6bGgvLysvbnc1NXp5S0swSFJjVXc0bnpEd3k4UWJlYmZ2ck0zRkxT?= =?utf-8?B?L1dJVmszTWQwTnJueHF3T3pZTFM2NjlNbVBtQzRhcDJ1aXVsRWlGekxWNGtD?= =?utf-8?B?Q2J5ekMwM21QLzIrRnB2bjdjUVFqeTYzTGNKVUI4Z2Q3NXVGdUZZOVREUTNW?= =?utf-8?B?NElpK0tBR0RtNlpkRGZOWENwbVdlR0RvdWxLazYrb0M4R0tFM1ZyVENGbjA1?= =?utf-8?B?QWlIelpKTUp6emVQU0VzZlMvOEtiMTFpMXJ0cFpxeXBXUG1jUGxCNW5ScUg1?= =?utf-8?B?ekRMVzgxQnFQUEVObEdHWi81NXRza09jaGh0ZUtDWkhsYUJRT1lJNHNmUDRI?= =?utf-8?B?ZG84d0JzZzk1R1Vab3E2ZE5lTHg4U2Y4V0ZDWlFNTGpNbG5WdlF4cnlORjI5?= =?utf-8?B?cG45Wjg4WFRxWUpQczdBOUZpUzBCbjlGVDBJeHJ5Q1FlQXIrUDRONFFScnFV?= =?utf-8?B?WitKUlJJa2ZkZjE2V0dNWGlHc1ZrWFQzOHc0VTNWM29WY0VraHMzdTRpVEdj?= =?utf-8?B?VENEYVNjcDhSKzdRYm92UXhMa0dRajcrZEhJWElEeTUza2w4SG9Pd3Flc1Fl?= =?utf-8?B?R3RzeXB4MXZBaFArT3RtR01KdUlBRkJPV1dnOCszcUoxeFp4RS8rUnNHckFp?= =?utf-8?B?djEzbjIvOFlPTWJrS00vVDkxYWdkWkdTTnkvNlp5TkZTdXFOMEtrM3hmNUQ2?= =?utf-8?B?YW56d1lNeHMzL01tN0ozbWY2R3o5bERWZFh6Q3BFdGZDMFo2S0dGYWFLbVlB?= =?utf-8?B?ZDdxaUx3WEtHUlJ6QnBWK0ZFekpWNytNNHVYZz09?= 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)(52116014)(376014)(7416014)(366016)(19092799006)(38350700014)(921020);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?bzhXV3RxMTRaVEVDb3hoOEMwQWhuREgrcXVKOGkrM1ZSV1NXbU80dWlSVEdF?= =?utf-8?B?K1NXMFFsamhYbk9NdzAwbWM0WmU4MnBWVTZHdWc0UG1yUWw2TEV1bXI2emdB?= =?utf-8?B?TFd2eStOSXNwdXRReU8ySktZQ2ZqZ2NPaUtDUVZXaFB3WE93R04weGpNL0tP?= =?utf-8?B?UTZabmtmNmh4ZUZQSVlCV1VqYnBubjBkVHRKVE1hbm9nY0pYYkNFd1Jrd1hH?= =?utf-8?B?eHBxcVJCNHpxdEE1amhBVHpDQXhYck9POUxORFJxQXoxSjNlOFAzbTB1Nk9p?= =?utf-8?B?RGJUdEJraEFlcFI5UlFMT3dHSnlqeEFna3pzaDlYRmVWbmU4MFFsU3NzcUpW?= =?utf-8?B?dzF0QVJXV3Mydkcwc2x0NVRTYXZXb3ZaNWdxd2hnREljd2Q3TS9WY3lIdnBJ?= =?utf-8?B?MkEwOVhCMDJqTmh3eUIxMG1laEROZ2hzUnNwUVcybmFjcFFIVWNUQjdlc1oz?= =?utf-8?B?UGhkWDR6SXM2TEx5dDg5cy8va2xobER5SFFYWlBGSGdvVGtNODdkZEIrS3N6?= =?utf-8?B?MjNjR0VaOWFqdktId29qOWd4N213d29ENndGRkoxNitWbit4RWR6TDh2c3Qx?= =?utf-8?B?eUYxaWRrWW5mOEpFTzNpbHYxcFdYNTJlNDlWUEhGenR6TUc0THkyQ2lncTRI?= =?utf-8?B?M3ExenhBaVE4TjkyTU5KY2Y4dmxWaXBqeGxMY1IzV3NneE1pRDc4d1RCcytG?= =?utf-8?B?L1grNTJMRWZpbEdZT2dQam9iMUZaVWNYb3AwVjB5QWdtNTY3cC9BN0tlL3JW?= =?utf-8?B?bTFVNFQzLzVTZVhneU85cm5yL3ZHTWJUTW14UkptcUZQb0NpN29IZEc5Z1NW?= =?utf-8?B?Q09ZRFFHL0tiWXo4aHQyeUxSWTlLWE8zVU9LWDdjb2YyOTlOWDFjdG5HbU1V?= =?utf-8?B?dXVDU0NBeEE3S2U0dU15VE9jWTN2NXNRUEp3VHUvZWhrTFA3eUJ0UEtpenJK?= =?utf-8?B?R0srTHI2QytkWXJjOWRGaGxYaHFzbUpqVGZUOTdDVUpnMFpLRi9TZHJESThm?= =?utf-8?B?NXdTdUY1VXJaYzF4enhZb2JsakFMZDQxZ2ozYUJORnd1aCtMdzBrRTNQUVhj?= =?utf-8?B?MG9YQ1pLMnM4ZkovdkQ5cTV4WU5lcWRFb0xLdDFEUGRlaDZvcGg4WUtzdVpj?= =?utf-8?B?TFNBTmx4SFV1MWJrWUNTMmM3WkdyV1RJczhURW91ZmRROXk2TFVmRlNKa1Mw?= =?utf-8?B?ZW5OVVNmci9iNDlPZ3NQTmRUVldMVnBuazgxbTJnb3VQVDI4SkJRbzZsU2dC?= =?utf-8?B?ZUE4VVZldmlqTVBxVFJYTDZ6QlVUUGw4cGlRbStoLzdQbEhveHFha0hGeCtZ?= =?utf-8?B?MW8zMlJyVFFhY3R3MXA1eDhVZkFQNUQ4czc3QzdEaW1DaDJqWjRDL2hKcVRR?= =?utf-8?B?QWM1RFBDY1ZOZjNlV3BZT1VaZ2JGOUVFdmJtSUZSSGlnUlR0Uy8xVndZb0I0?= =?utf-8?B?NlI5MmM0dFArOU9LOHYwTnRnb2s0UmhXa0V5SkRLbU10T3BPVFc3LzltYTRi?= =?utf-8?B?TzBlT1ZtclRSTGJnSllnalJmdEd1NEZadngxUXBmT2ZQVmNhenZxcFQzSHY4?= =?utf-8?B?U2dIWk5nZFRvM0kwWjVIL3hwMmphZWoxdUE4U1o1TjVPeFlmbmY5Qlk4QmtK?= =?utf-8?B?bURrSFB1dENDckZiR3NqZytueDFjeWFtTTZEc1lvUkFoWGhjREprZ3FPcUxn?= =?utf-8?B?ZHZDcFBJWFlOZWpXaEc0M1RkTkVNL3o5d01PUVp1LzdnZXR1ckpidTRCZTFo?= =?utf-8?B?VmZrTEFHTitrcVJ0T005STVlbU0rQkJiUmZhclBGczlKMEJWeXlEQ29EVnFJ?= =?utf-8?B?Q0E4QkZ4ckRTSFdJZTZ1Rng4V0E5OVVhMFFmbUg1MStJZGViMVYyUmJzazlh?= =?utf-8?B?dEI5dFk2dUFLWG91VjJ3cXhHZVF4dzdRZXNseTNRZ3hLeWdsRWc3T1NYTGlq?= =?utf-8?B?MkR2aGRJdEVlamRVckFjeEV1eHZrUzVETzdrVUhPbHJoT0tYbVAxNW5RdHhP?= =?utf-8?B?Y1N6Y3luRGNHOTdqS1M0TmF5aFpkc05IZFlEK21lQ3UyY0c5elB0TGU4ZEpp?= =?utf-8?B?bHBwZ3ZTUkxWeG5EbzI1ZzhzbHM1RXRraEU5OEdvM2JTb1R1VnRNcTNycE0v?= =?utf-8?Q?Ro7x18e/rRrT2HegRfNp4lfLB?= X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 9f0913d3-c7ed-4919-6f28-08de27b372e8 X-MS-Exchange-CrossTenant-AuthSource: AS4PR04MB9621.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Nov 2025 21:34:41.6461 (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: KNhVPcLGir7/m4YWHYxrc3tQKL4Nar9+JSz/7ybtc4Y61RwkzY5bCC/BdqXWiEesE9fnJTQ0DJmcv6iABThAMg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR04MB8433 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:18:52 2025 Received: from AS8PR04CU009.outbound.protection.outlook.com (mail-westeuropeazon11011001.outbound.protection.outlook.com [52.101.70.1]) (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 BFD39303A19; Wed, 19 Nov 2025 21:34:49 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.70.1 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763588091; cv=fail; b=aJ11g7Vl2/zYOmE7+G4KNy5SJoRpQQKLyXlaHSFVdixkDk5U/OAtiu28la/rgNsWbnBEk9mkGnu+OyJY0X1uVtB2tb0m5WkBL1ZJdTmg8NOvimE8U+1agN0h/2hegZg+UM41587xfv7sOgQDjri/0/jeGbezImyo7PrWazM/5Nc= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763588091; c=relaxed/simple; bh=8ZRGC0HOcXdF4yY0Klkdzev0fb+EGZKR4sxFFWOvq/Y=; h=From:Date:Subject:Content-Type:Message-Id:References:In-Reply-To: To:Cc:MIME-Version; b=QVDWsaJGGnP9FDzReagVe0Kzgn0fcaAXN91v5ID9dvqG6NDRAhQKzZ46JnjEx5W2CfGCDY5SpUmYx+l/T2OlWJkDjUy7GdjhhgNKheEPBd+nSWDnQBayumwBYz7rwG6pW0lGrfllmcXotU3rv0AOnaLaN0Taij+8lK6LCvCMZ3Y= 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=iwriVULe; arc=fail smtp.client-ip=52.101.70.1 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="iwriVULe" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=iUJYssZVsFDBgbfxXknAuAumMwOeSLvPUbUxlVN0fqrLPXgy2w3LTCauAi5WRi9L/oQWYpq2cCV1noLq26m681qXOD8YDXTzBlX7bc8bpyQNI0iLsgDxdSvPviVrwX+g4eSS34Pstqv4p16+2R/snki98aAawt8rcU3eHutvRRNxCAC0gAzTf0xsyHkN2M7Rh7IBGlQFDpkHk7oITwoyEjGN2n9FxvvmX9RpeNLMaDIAGFC5iEFG+LstzAGAzi7DNsvuHfy14KBygP0H4i+3mAJ2UEziPSXMTnnwCkqnQbHQdAw3sfyF88YBO62adRwKCMC8Sy0N5DFVjGQFpoAG/w== 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=JxEbvQ05RgGkO2gM6e2sTvgyAMnaKSQ7rEWCyuj4JFR9KHgxMy7PdgFIN6MttfwQg85BE9P+s4olZsi8/3qVT+5LLFKqvsNd8m+3V0Lbgpp61d3X82LmW1zpaPBGv0V/m+QVBuNGDF7NkExXAoRUaGVaax+mzw2lqHC+OygM20kGdig/wkkqjqVKV2Ocq06ybluKqmKb9CB3PpBAN/Td4bMpSU3+Uo8kU79TBX7sTP10MCTgX3HbWsoKKusQdNy2qI76YWLEYcD9celYCfZstiOapsyEy2ga5FZONUR8J4hasWHVgxnyB23eEfEvKQl2zpkaaBji2AJqQeT5eVd5Lg== 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=iwriVULeU2YipyC4iGAvCGwcbqwBzO3jIJgKSH8rchoE9tX/ElBs84YvoNp3dt7dYg7esr/T/6gSdsrBZgpwzaT0nSZFikYk7YznF7A6AQ71X2Pw7ZIUXD5i4kUkYVN5L2ayryvpmpUmTytPZK+0dT9TNRhQp+ajLbnA6xvNUDJOXTheM9Zbyvfa5bk6UwYVSL7gKIA4hYqCKSvitAr9SBm5Z0wwvh/FCn6MX2vP19M3R6P/4XSss9jfUEaoj6OPf72NbWr4PYAhLAOG2rvCe2Hsk0XTVQlOT/gO5OJnVnwDsyhI/p6mBLxbDyvHucBqmhzddkLwqXDjED3zrym+6w== 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 VI1PR04MB7071.eurprd04.prod.outlook.com (2603:10a6:800:128::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9343.10; Wed, 19 Nov 2025 21:34: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.9343.009; Wed, 19 Nov 2025 21:34:45 +0000 From: Frank Li Date: Wed, 19 Nov 2025 16:34:25 -0500 Subject: [PATCH v2 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: <20251119-cam_cleanup-v2-2-df732cc83ff1@nxp.com> References: <20251119-cam_cleanup-v2-0-df732cc83ff1@nxp.com> In-Reply-To: <20251119-cam_cleanup-v2-0-df732cc83ff1@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=1763588074; l=5112; i=Frank.Li@nxp.com; s=20240130; h=from:subject:message-id; bh=8ZRGC0HOcXdF4yY0Klkdzev0fb+EGZKR4sxFFWOvq/Y=; b=AMk4Sfq7iHsT3kuG7VtGfnIOsVwYlIzZRKT3VwYamsJS3760EN+AaZ7mV9PjPEK5juQSZSMcv 86YTF0COBkKC9kgqORVH97f9VqXcYouv+MmpPm7Xnm0dGe6yYAt46FJ X-Developer-Key: i=Frank.Li@nxp.com; a=ed25519; pk=I0L1sDUfPxpAkRvPKy7MdauTuSENRq+DnA+G4qcS94Q= X-ClientProxiedBy: PH7P220CA0043.NAMP220.PROD.OUTLOOK.COM (2603:10b6:510:32b::12) 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_|VI1PR04MB7071:EE_ X-MS-Office365-Filtering-Correlation-Id: bfb7bba7-bdf8-432c-6239-08de27b37506 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|19092799006|366016|1800799024|7416014|376014|52116014|38350700014|921020; X-Microsoft-Antispam-Message-Info: =?utf-8?B?cmJoeFNSZU5Qc1RURG1FNFlPL3lka25iWjd3aTZTZzBseW1zblVmQ082VWpB?= =?utf-8?B?ODIyeldEOHRUdTFSMEJvbkNmZW1CY2YwT1lVQXQrZEg1cXhNckhHeXdYWDRx?= =?utf-8?B?bUlrYVVFMGRoRklkcUxyK2tFTTFXMWcxbU9hZzJpVDBCVk1DZERmUWMwSEZh?= =?utf-8?B?L0FKTWhyNnU3ZEVqK21pNUptemdCUG9MdGt2d2Y0eWtSVkt0ZWpkN2ZoMHlO?= =?utf-8?B?ekZic0FvOC9ZV0NHdnNXQXJyTytINmoydjZDc254RHRSVWl6eXlVTHFzdHNh?= =?utf-8?B?dWRDbHA4eWxzNUtGa25SbzlneTJWNmt3OWh0N1N1U21oL0hTb2VxTCs5QjJa?= =?utf-8?B?UEJpWExYUHoyMlVlNHFGaHJSL1drWWYyRHlFOUJGSlBqZHhpN29QODlYMmdH?= =?utf-8?B?LzlKTERScjVuOCtvbHFRVHRRYmEyZ3B3ZGFidUUyVWtjdnJpNkhlaitNWWVC?= =?utf-8?B?UDRLVUlBVC95NlcxNjRVRWdLT0ozajd5emk0STNLNjd2OWV0QjVoaHlQZzRV?= =?utf-8?B?NXJ6TUQ0WEczZzIzK2I0U2hNbUpIbUNiOVBBU3lCYTZnVE9QS2NUZnNwZVdr?= =?utf-8?B?eUFXR3Z1WmMycFpYbUpQUVNCaW51Ri9ucXJueElldW91U2RPeitrTnFGUkFO?= =?utf-8?B?MzNVMHdhTUlrMCtDNFMrK2FDWHdtN3NmMTRadEJ4WGNwSll6NXdaQzJlbnRP?= =?utf-8?B?T0ttUkFLSDJ1NDAxMTVtVzMrSllGZVVpNHdDV0lnZ3NjMnpYR2xwQ1VMc29Z?= =?utf-8?B?L2VxSHRVQXoxaUQ1Y0ZKeXI5UktybGt1K0lnZDRmOFRQRjZSekcwdC9JcHF6?= =?utf-8?B?Zlh4Vm5vYjJ5OHg0Uk5oc1dSNmxLYkN3a2VsZkE5SnBNUFpWQjQ1ditLREdQ?= =?utf-8?B?L2ZIQTdIZ09qYU9SaEo1TEJqWkVib3NHdmI5SDk0STJuSndqWUFEVDArWklV?= =?utf-8?B?TXdLRnMzeXJGcUs5OE9WcElMWEVtVzhIVGZUbEcwdTZoWjlxVkdYcUJXdUdn?= =?utf-8?B?akNzUzhBU1JqNFRkZ09rUERLQ1FyTU1kQUhQZUp4N0NpdmJPNG1QdktQS1Jm?= =?utf-8?B?NEhKVEsyZzJOT3FJaTVGUGUrdmd3VGd3U1FCU2s3VnJaUFRyUkJVWnRoQ01D?= =?utf-8?B?cXJJR1VYek9lY29XeDRGY09aaHdocGRhOVF4UTlHTDYyOCtXUnZVbWN4eWk2?= =?utf-8?B?ckZZNm56amZTOUxjL2lnWnUwTzhsakNCbVN4OGdselQ3UU5vWWxmR2RxWXdH?= =?utf-8?B?RWVNTG1sQUxSSjJQZW9uMXVQaUJJNmpjcFFCVnRxS20wWkFDTE1uVGVURkxG?= =?utf-8?B?RnpxNnZRMVhscjVGTGdNTFRqTmluOFV4TEdCNEl5dmF3ZmZYbGF5T0JQRVhP?= =?utf-8?B?T3BSZHJ4dGJLaXZIQXFHMjJ0Um5zSis3SmpYK1RmSDd4OG52bS85ZWJPMzdC?= =?utf-8?B?c1hpeEs0SjFXQXIrT0NqZ2Z0N2VKMVlxSElRNStUcXY4UG9MZlRSNnhiZHFE?= =?utf-8?B?YU13NjR2MjhnWXh3aHNNT0VjWmMxQnV1TWlRSmtpWS9qQjRCU003QldWazZL?= =?utf-8?B?MHhSdXE0MUFQckJScHFtTjErYUFNRVNXdS81YmtKSGgvWTJrY3R3aGJXVDU3?= =?utf-8?B?MjR0ZG5lalEzSXNGeXBvMXQ3MUhUeDQ2bVJHamFoeG1HdU9oMEVidmdBL0N5?= =?utf-8?B?SHhQeEc0S1lrVWlOZ2hUQlBieC9zMzRmU0xXNUtIZ2VOR2t3S3JNbnp0Rjkz?= =?utf-8?B?dklmWmZOZTJHeGVpVGs5WllQbitRRHhUNnRweVAvZ1crQ1M0bmV0cjdBbU93?= =?utf-8?B?M3paL3RrYmxRR3R2TDhveHpNa0I1ZGhQT0NOdldWYjN5azJabmtBc2pxejRx?= =?utf-8?B?MlVTaXliUmM2OFcrN2VwS0FlWVNlandlRVV6bzlVYkpLYTYrZlBjTWV4elRS?= =?utf-8?B?eElibGZYa0NjNDQyTWVDZ1BLWnE2WDJoWmRVV1JsM2dERnEweURGanRUSk9X?= =?utf-8?B?b1VMYVVBVjZxdEE0emJTUTlwVTVpNVAvdUNaQ0VxSnBqQmRVT2NUcUpsamZj?= =?utf-8?B?Qk1SU3Jhdi9YVm9jY296QU8zOXNqbWxidWx2dz09?= 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)(19092799006)(366016)(1800799024)(7416014)(376014)(52116014)(38350700014)(921020);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?cEtaZjdOL1o4U1g2V0c3b0lYNjBQSHhMc0FvblJyUTlPNEx5YlpESER0aTBt?= =?utf-8?B?a2g5NVN0MzY2WTJ1MmUveE1DOFBYck1Gam16dG81QmxiK3k5UkxiKzZzWlho?= =?utf-8?B?cGtqbThMekFYTGpYdlk2YWtxZWVjenlYTnljUW1BWWszSXl3LzB0NmswS0dw?= =?utf-8?B?NElSUXFZeUtXVG43MjRQNktQS3hWdlE4WWx6TUVTdXZjQ1dFamlOR0JSOWUr?= =?utf-8?B?b2xxQlYwbDd4bjlEcjlkL0FiNmpTWFpTbmw5RWIvSUg4ZGdwNU1mdm1VK2cz?= =?utf-8?B?V3hBaUkva1VrdXFvMERoNDRUeEpuc2dEcDByQ0xranlQQlpLeUpWUDhxOHZB?= =?utf-8?B?S3JqNmRnQW16UGNNd2lyZGRwWmVQaXBNUnpEd08rMTRZWUEvYmJ1Q1VPcU1O?= =?utf-8?B?azFnb0ZWdjNROWZSMi9ReXIwdmIyYWVVdDIrODBwcjBoMTB6d3JDSmpnL0dx?= =?utf-8?B?M082ZjljREx3dVljajhUUFEzR080amRxMHVMN2NFMUEvNGZHcVNaQVFMcy9J?= =?utf-8?B?OXJ6L0J2UW1PZ2l0RW04U0VtK1krSmM5RDFOaVFiQmVhdWFycWFiaG9EMTYw?= =?utf-8?B?RkVQSHZJdjVzc0VYaSttYmgvZkwxcU9ERk9GSWQvcDcxeHZvMTJDRkFaRmlY?= =?utf-8?B?TWdNUXdwZC9qaWJvRzd2UjY3Nkc2cUVDdUdBQmJ2WlplUGo5Y3RBYlBlS3BT?= =?utf-8?B?MFpLQ2ROSGhTVmxEU2djTkR6QyszZDdueCtKbExhU3YvSWcvRVpiN0NqaHhn?= =?utf-8?B?UnFoZ0ptdVZzMU1yZURzeklMSzlhVlV0UkdFZW1sY0FMeTMzbWFnVTJWVDFR?= =?utf-8?B?MEN6MkdycWwyeEtQZ0dTTUJjL0ZJSHRyRXNHbHhSSkgvVHdNTWE0bTRzbVZv?= =?utf-8?B?R1ZJTldNVzRTdzdyNDBVKzF0Zk5DVVNqZHFhb1NrYlY0cTBZbnJmZFU5cGZY?= =?utf-8?B?VHQrTTF3MzVMUUthL1djQW95eW16bHRNcWNXaEs0UGpqYVdvdnNzR2FCUXFn?= =?utf-8?B?Nk92RzczTUtUdDFYRVo3ZXFGcm5lNnh0eHl3QndnZU5hbGsxbXoyaEU3TW0w?= =?utf-8?B?cThFdE1qRE5NS0w3Q290S1o1QTNJWHRPMDh0bjg3OG9SQVlOci9OSFBOSzFo?= =?utf-8?B?b0N6QmVHS1NnNmdnZ0gxODRHOGlKV05iNWMrK3NzdExVZTh0cnFzV3pSNzMw?= =?utf-8?B?VzBNdXZNVCtaUzNjYkNvSktWK2FTcXdiRXcrbTBmdDdHUGYwSUR5a0VCOFMz?= =?utf-8?B?WVQ3Ri9LVU5WcW12WlVwMU9LWHlHZTJwU1pGdEZMNW9JUE02bU9jUW5hZFhy?= =?utf-8?B?c0JSVmZHSklyd044VlczTVkzVGFTbjE0Tml2dVJHS3c1azRVaHczdjdBOFZ3?= =?utf-8?B?bWw0ZWhFN01sVnh2cDJJNDBxOXVJK0ZwdGJ1aXZndS9kdGdTdWVLdHlIUVpi?= =?utf-8?B?d3ZKbmdmWGpNeWlvN1VVSnNxdDVBU3IyZmhlbkZ3YW1ZN0Y0VjRZTkdOc3pJ?= =?utf-8?B?Q1BHaElsMVpxQnhYQlNvTlFsbkFkUDNUWUx2WTJBcG1xZnVKbitXUDJZWkxR?= =?utf-8?B?SHJtQ2NMYllXNDhPUGttZWZXN3JLelczOGgyT1hyZDJJWlRFVi9SZmFGNlhJ?= =?utf-8?B?amhFREc0Qk0yOGtvY3BreDUxRGhOR2RQTC92bzdQV0w0NG1CQktHTmwzaGds?= =?utf-8?B?NXFoZWhqRk42U0pyeWw5dmF5Vzc1SmxNaFNoOFV1YW50MktyMGZKMGtBVWdN?= =?utf-8?B?aW13RG50SGFmbjh2WFVTb2FPd2FRV3JmK0wvUGpBOXNaWHZZeDhueFlFTysy?= =?utf-8?B?OGk1UkhaWHZxTDh4ZmkyM1E3d3gxN3VFSVBtU29rOElaVlNob09OK0p6dTVu?= =?utf-8?B?YS9mUGVBR3hMSmVnNFpUN2VhNDVORlNFWEtiRk90L0xNdFNNblBoZmdqK0do?= =?utf-8?B?YzkrRG5YTzhNZnpYTThDNGdrQXE0bjNPOG9Hdk1oRFFhMHRRcjVxWTlJTWFp?= =?utf-8?B?NlJqSUU4azFXUTlSNkxDSzNWbUowYlhlQ1pVVmVSdGxFNFBLKzRQTmlpYlFw?= =?utf-8?B?eFJvMkwxUmtGbWh2ZUtRbTZJYnI3MEp5bXNkZTZvSUo4eUlOT2RCR21OUVli?= =?utf-8?Q?st0XfgMNt1m8ntUGeLSUs55CJ?= X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: bfb7bba7-bdf8-432c-6239-08de27b37506 X-MS-Exchange-CrossTenant-AuthSource: AS4PR04MB9621.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Nov 2025 21:34:45.0422 (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: zavDwjMoPAKTMKhCGMw97HnE6C+KbAmkrLv9WHzE9CgAyoPBTQ0wUYagFv6NJv1FIjv4BrRTIg18e/A/5g8ArQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR04MB7071 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 --- 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 Tue Dec 2 02:18:52 2025 Received: from AS8PR04CU009.outbound.protection.outlook.com (mail-westeuropeazon11011001.outbound.protection.outlook.com [52.101.70.1]) (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 3C392304BB8; Wed, 19 Nov 2025 21:34:52 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.70.1 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763588094; cv=fail; b=Wyx5krubjrDya/jDyoyuBzJ/s/Od8UnJ6RdaPrxXVSmMqyfzKrlJNkulGF04M+hQy4i1TetUwyfCMZD/LgoTr1aQZHh5hQbt5MHJ8Zvvk07LlbNP2XhpmtXCylS0S2tsMkOQLX12QfEykjZfKW0bFmYKGwo9/fn41B8zLisa+Qc= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763588094; 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=gZ3uTEr1BOkTOijZl2Jr1d4yrkVexzHHo7eNt+NyBAlPvY1DjioTvUUJ/1e6oG34usaC18qtidpFsQo6L75QPE3wFeW84SxKeS+nDk+8aWcoWgut1XFhpej/JbgzPu/Uecn76VnxI4BaOzoX99HwvZ+oqCL28nAN6Pa0XS6rkoo= 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=kC0nCsu1; arc=fail smtp.client-ip=52.101.70.1 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="kC0nCsu1" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=P6Mm7mJRInlVh4jjNqSnYdnpxamCkxuBAZegKW435azl/9RrFK0AMnGDDCrGoMywn9ssJxBBoxaOPsFfeZUrgDpyQdzws/9BO/OEsbiSaR6/xKE4WBNtXfin5dKccyTHaSZsxeumICj9zs7LHwA76H+uaV19IdezLE+EimvGHtfzg0INnCh2LUH4FHQAmdl8TZAO1TRBta4qScCJOsCbFJL085VuSfyuDXkA/VgT8iMtbcWK/m3PkTZVLjwWQ+cjAJm6vj/wGRq8jvE/yknKZ7PRWLAZX2aPfEtnx+BDqoPXB/dclt+pdLRwvlfrasQhO4VXualiN8jXwXI+2bN0iQ== 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=HNVJQBbH2ztDel+bJUsVOrbl81ErnlaN21fIIOuTVhI2nNO+sZ37oS3cM8Y+kvPg/gPX1pXvI2B0gTDO1UlkiIPg7ECVN8UTs7/XJIuJYekb9J0DwMLmAYZJjd5ZQ/8RfDch4MHF6iRkcZI6Qzn6gj2kynVx1eoaE6ZkZ+gcnXODfhEaXkLO0mArTvLJTipKXT3WLUYHsbi2AMA6K3RN57vljVaaJ1ikwcvZv6pnDZAH2NBdq1o0t/KSqR5DtdAMXHP72etoYlhmCklHGs/TvTqBAoKwC1S8Xlkso1TjETFZ6IisePjw0c4CedLbFNETUl27LmtbGFhjg2EnBHg+iA== 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=kC0nCsu1QKQNa/vslziXtF9T8ZSuiF5YUMJ2OsTE7TsxMcAzFOUyeBZ3kmOIX1GBxzyEC2G9JX2lJjLSSSGVdBUIM7N2jHEfgChOrtmuiFw3MUje6OzTLpNl3HxftryfZdsHgib2P+Wm6yvKVcuVVJUCbBAUwSTMdU3DqlCZu47JBuopSoRv8Yc2z5gn91wqLqDqAr1Llkqd584Dm02UX+jP64O848u1Oy4dzKnVG74wM1S/55N8r88nZyhSUMeEjOdYzbKYjrPnepSOpAQmwF4B6a2xKWmFoHnxhepB6b7ZzcR0XUq+qwfFxTKECsN2fe95RQ2/ASvx17AXXe1YRQ== 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 VI1PR04MB7071.eurprd04.prod.outlook.com (2603:10a6:800:128::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9343.10; Wed, 19 Nov 2025 21:34: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.9343.009; Wed, 19 Nov 2025 21:34:48 +0000 From: Frank Li Date: Wed, 19 Nov 2025 16:34:26 -0500 Subject: [PATCH v2 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: <20251119-cam_cleanup-v2-3-df732cc83ff1@nxp.com> References: <20251119-cam_cleanup-v2-0-df732cc83ff1@nxp.com> In-Reply-To: <20251119-cam_cleanup-v2-0-df732cc83ff1@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=1763588074; l=1806; i=Frank.Li@nxp.com; s=20240130; h=from:subject:message-id; bh=yPwnUBOev/x/308wqg/c0rNtCFlwwv3fG4kMS/h4VvQ=; b=CNBMrqSZYKVDbwyhRCzTnshMjwqR1PYrZBm7b6/3pCjn9Wwi7K1+kkjvJ7/6acF2+H5NrZyLb /DNuAilzAxcANLXSkEYNh6nqOnlsejuERIHHE9GKcV1Hs+ZvdjFDYaE X-Developer-Key: i=Frank.Li@nxp.com; a=ed25519; pk=I0L1sDUfPxpAkRvPKy7MdauTuSENRq+DnA+G4qcS94Q= X-ClientProxiedBy: PH7P220CA0043.NAMP220.PROD.OUTLOOK.COM (2603:10b6:510:32b::12) 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_|VI1PR04MB7071:EE_ X-MS-Office365-Filtering-Correlation-Id: fd841d85-b73b-47f0-58c4-08de27b3770a 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|19092799006|366016|1800799024|7416014|376014|52116014|38350700014|921020; X-Microsoft-Antispam-Message-Info: =?utf-8?B?UmpuU05zWkhzY3RBRVFsK2JxN3RCbW9QcXhkdXRBUlpYejRuOTRKSjF3MnJL?= =?utf-8?B?RHhvS2d1amltSEV5bDdiOGRhcjBGWXRRUlhxUG1WeEY0V2lodTlsYmdqc3p2?= =?utf-8?B?dHRwYk9yc0pSZmFlUW1FMmtzUklhUzU5Q0tqdStDemNySjRqemNYcUFpN0tJ?= =?utf-8?B?c2xneWErbUY1V2tHSVZNd0VPWnFQeVNVMFh1SjZuL0syYXFmU2FjTDUza09w?= =?utf-8?B?TzlBU3VyMUFlaklDT3JDUTJkYzZqRFdBc0sva2ltbmZIZy92VUs0aDVvODgy?= =?utf-8?B?aUNSbU9OUEtrUko1NlcvRWliekw0T0Fpem9qM1VTVEljL0RaVjIzdTBrZW9C?= =?utf-8?B?U3VneFhYckRLdkZJOEg2Mjc0WkV1RHlYQVlMRmJPQ3pIUUp1enovdEFFUnBP?= =?utf-8?B?YTZaN3hGcVJ6bDJwa1pEVFpDMUJnWDhOdVpBTFlNMlpwZ2hMTWhRQnVIL0dH?= =?utf-8?B?Zmt1d3RNMlByd3kyVTFEUnJaKzVocWxPZ041d214WjBndUVNVXMzTy9HMUFD?= =?utf-8?B?alVxdFRObjE1bnV6SURudHI4akxja2RQK1NsNDk5enpWU2QvVFdsSWdYeU5G?= =?utf-8?B?aXA0N0I0Z3h2Z1RMN09JT3pSWEdESmVvVjJjU3JtUkdnbGNXS1V3WVN5RVY1?= =?utf-8?B?Nkp0bG1EZ2RXYWxrS3duVnBHbFIrSkNNZDhVaUVhNmxjVElKL0pKOUU3Uy9t?= =?utf-8?B?bUJzR2FFRUFaY3JwTVdUbjNxQ2tHdUt6aFoxa0loSk9mUThUN29kTEJEYWtx?= =?utf-8?B?MXZzTk5PZElXVXZ2elpLazg2M25YMy8vbjg3RXlrbi9mSlczYmVyS3FoSkJl?= =?utf-8?B?bklZNGJiaFBSblNwd3d6L0lEZmZRMFNxTlhXUlBreE50a0gvSFlnMEpVZFNR?= =?utf-8?B?UHpQUXZRVjRGbldQdER3Skl1M05lRE95VWpkczFOa0NWdHVIWGZVY1BwWWJJ?= =?utf-8?B?dkhkSTNhMndQWW1xYkRwNkR3VUZJMms3NXE0VnFkMjZGVURKT3FFZ1RleUEy?= =?utf-8?B?UnY2eWFRZVVRSCs2Um5iUDN0TkFKMGZYZDA5cW56N1dqOEdySzNHVXpZWGk2?= =?utf-8?B?NWRyOFdkL0lIMnZyY3doVVVQU3M0VTFGUk9LWHBhT1g2VkMyNGpCd0pWNHlx?= =?utf-8?B?eUtWSzBMOWlwR05KMjk3Rlcza3A1azhpSFRlakVMNzdNbmRBUm12Zm9UUEJ3?= =?utf-8?B?OXB3NFpSMmNycVIzQndDZTlUWXU4d0VybndMdXVhM1lSNDdVcE5nQ0lqWnE4?= =?utf-8?B?S0JwTUlBaVBBZ2pHU3NBd1ZFVlhrTXIreTh3K3dSQnhDMEdkb0tiUnp2TzdO?= =?utf-8?B?b3VIZjcrbWdnMUcwRnlhWUtSNDBtYWIxUmVuWFFQQkwyeGpXdlRmY3lzSm9w?= =?utf-8?B?anJBLyt0Q0NOMFZxQjQ1akdCQWUyNnhIeFBpK28zOGNRSkEvSStENUZMZTND?= =?utf-8?B?TXJnTDN6SlRjMGRING1lV0lBQXBzQ1pnQ1pMY3l5bkNMUFJsQkRxZ2hIVDVR?= =?utf-8?B?Yis1eXFNQ3FuVWxlMmFUTzZYbGw3ZkJLQ29JMEpzd1lZMHJrZzdBRGpxRHNZ?= =?utf-8?B?TzdNRjJMd3k3KytrOXo0d0tHSk9ocDRDRkZqSzVDemlDQXVkTzlMaUtGUUpO?= =?utf-8?B?Kzl3QUdHeGtKR0NCcHh6RDdOaUwvQlJMQ0JXc1Jza2hYaTF6V2ZCMmtReUhX?= =?utf-8?B?Q2JKaDUyTUtrU0FnYVVHa1BLUFlpeW5GY2ZYRWJJR2EvTHhGaGlHdncvQkdK?= =?utf-8?B?QUUzMHhKMDJmSm9UNlJKRjduVjJKaTc1bzREREpaR21BSlVmMVpyTHY0SlhG?= =?utf-8?B?RTVyUWhmTGEzMTQ4OXVJYjFhaGhxT2lrcGJPM25wNUsycnVOVW9Oa2l0Ymln?= =?utf-8?B?MlRhb0tTbG5wNi9RWE9MYXpsMDhacVRPNlIxQ2MzajBaTmpvTHREcDk1REtQ?= =?utf-8?B?SW5jeGE5Z3FnY0VaM2dyWXZUSUFwODhqcnRTSFBXN2QwQW16S0pvNHpmYUVn?= =?utf-8?B?cDJ2NkMxYkJDNjBGMDZ2QWRXU1RENzFuT1FTWVhnVlAxUWVxaXlvb3ZMbTFE?= =?utf-8?B?Q0lDTHBHS3RjV2NLYW9oeWxuQUY2QjF1VTEyQT09?= 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)(19092799006)(366016)(1800799024)(7416014)(376014)(52116014)(38350700014)(921020);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?bzNZSFgvRXRUOXlnWEt2dWNjNFRuMS9nSW1wTzRMRXVkcjdmeDNlOXh4UHFS?= =?utf-8?B?YU5YcE9Mc09pZ2c3Njh6MnJuS04yQnowNHBFbGpFK3VDRzNOSUVkRzJYOWFo?= =?utf-8?B?dEJWMGNKWlQrMGl2OVRham9uVWRvVC9uSVV4My9MV3ovazJ5SThtTStrQkdK?= =?utf-8?B?YUxJc1VLOUgvaktUZUdRbC9xc2Rjai9wUmZ4UUsyRlJ0S0djc2w1cHEzeDdP?= =?utf-8?B?ZUlMcFVpS0toSHhQblRHbS9LTnBLYW1VejZuaGNERDRKQytNY3JMOWZYMVo0?= =?utf-8?B?MHlmOW0zMnVqclJuZ0hHbHY2VkRFbWNDT015STU3cVkvYlJIZHFiUlV3dklp?= =?utf-8?B?UlBrU0w2SnFuZDBNR3pCbUZmOGlic3k1LzA5ZnBGWVlYMTErSmhtNW1WMVhW?= =?utf-8?B?b0IzdE94aG9QVENHQUI0d25waDFlRHZqNWhsVXErdDZYSnU3ZUkvVmljOEcr?= =?utf-8?B?N0RNOVk0cm9RUjFDUXdJZ29hS2Y1OVhQakFBN2VHOTloQlhsSHlTblp4SXBs?= =?utf-8?B?Wk90N3E4cHhrazZjVXAwZVpqYUtoYW91RnBrejZnSHRGRjNoV1FIWGhDWXNY?= =?utf-8?B?Z0tabTFtQm5zREZGVDFRNDErcktaWUxxVDVHZnZUeFJ3UGpHVWRQSnd1TWVt?= =?utf-8?B?MHRXQ3ZqbTZObXVzNlVDVGtyVjYxcGRlWnZpUnhrVlo5aU9FV2VOaHBTVGww?= =?utf-8?B?bkhJYlpYRy9pT25LbG94YTZnQ2N5bjFPTjd0aUZsaFB1UnlRMmllK2M0b0ZX?= =?utf-8?B?dUZ3T2wwaEpUWkhZSldIUGd1VEx1VHh1V0hpekZYQ0NKbFF2ZVVycm5Gcjdi?= =?utf-8?B?Sy85R3hHYm92OFRtUVNrSGR2d2pkRloxSEU5aTRuT29GUThvWlVNUlFvWHBx?= =?utf-8?B?bjRKZ0dZLzRBYWFHbjYyeDI0dzVQd3NhTlRsdzJtTjFOZ0I1cHVtazZtdmRI?= =?utf-8?B?Qjl3ek5tanJwNno5UENYTGkrRTNYK1BGV3Q2T09qQ0dteXRiUjZkclVZRlJr?= =?utf-8?B?akttZUZTdi81UlJpVWlzRDlxTlVhNnJwbEtTOGF1THJWakdhZHZQVmpjT2tD?= =?utf-8?B?NmFHa29uY1podDMwcXJEWmFNR3FCTms1dXZZbTdPT0JyR1RYb0JpclFVTWRR?= =?utf-8?B?aFRRdkFYT3ByTTZTTTU3eWpPbnFiNG9xSktpbk0yUU51bE9nSlR1UW9FakZy?= =?utf-8?B?VThBeXdJRDB0V3pERW5kS0FGTVRtN1lsZ2Y2L2gzNzU2eHlKeFl1eVFJRlU2?= =?utf-8?B?QUZ0R1BWM3g5Q3FveVE5cXZCb0pxRVl6cGlHQjhURGUxYzdiWXorQUNaNTVl?= =?utf-8?B?TGpLRk9lVHlITjQ0TFArRHRrVHhoY3VXbFdCL3lXOEM1VVhzQy9mQlpGQ3dD?= =?utf-8?B?QTVSNE1oWGRSbys5UHBhVm0zWHY3SHhzeGRIRHN4OFg1OUJaTk1sQStYayth?= =?utf-8?B?VGp2RXo4VUZaQkRZUWdnVFNSNnRjTHk0cktUNzRzTHVJNGJlejV6UWpGYU05?= =?utf-8?B?dWdnYTZGZkZ2WEU4YkVlTWNmcHhwK3NCNCtHWXRkM3duSGNKQTNEYlhrUHVa?= =?utf-8?B?NHlPdjd1VytQZTRLaHVXaGNjaWhXMnF3LzhLTG9QS2d3ZE1LRmp5dytnRUVj?= =?utf-8?B?OUMwaWdaUFNiRHA2Y1dtaDVpRitSREJFMW1XSFRFMVRFQjNLQnBERWtVblF3?= =?utf-8?B?SVpyRlpJcS95WUx2M2d3K09jR0tyR2Z6YTRYYkhFcEZxN1djdUt4c0VEbVRq?= =?utf-8?B?VG1ZbUlYczBxbnlUTkNpVHVoaWJ1ZVYrTlQ2a2NWMjlPQk1iZndIUWNscE4z?= =?utf-8?B?SnZ5b3hDRy9rN0ZkdktiLzFoV25uTDJtZzArYmE2K3VtTEgxRVl6UmltL0Ro?= =?utf-8?B?ektQeCtPTitMOWMrVUVTTXdZVXRJempBenFGL2VzK3Jmb1VuVlBvVTJxNklK?= =?utf-8?B?MDNVM21wbzdWYkNNTVRyb21HdXh3d0JxUUd3bkYrUkRtN2c4cnI5RzZlaGJt?= =?utf-8?B?Q0Jmd2kvcVpDLzY4dW1zM1gxUkFhMGlEMkhRSXZnWFJQUnFxdTFaZkdrWW14?= =?utf-8?B?LytDRWlXeG1UU2ZUMzJ5VW5pYnBYSU1PMFM3bVo3MG14YUMwYlVSRFlDaWhs?= =?utf-8?Q?xoYKCMh49mIU4uzr5MrwyTrFu?= X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: fd841d85-b73b-47f0-58c4-08de27b3770a X-MS-Exchange-CrossTenant-AuthSource: AS4PR04MB9621.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Nov 2025 21:34:48.4024 (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: NX2m5avLPtXF4ZM6c3DL5dDKZdOfDsiGvf80luUVvGNqeRuLgHiOpAaIr7Ye1k3X4qT7BpMQVa9XYhHB6sk7MQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR04MB7071 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 Tue Dec 2 02:18:52 2025 Received: from AS8PR04CU009.outbound.protection.outlook.com (mail-westeuropeazon11011001.outbound.protection.outlook.com [52.101.70.1]) (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 6F51330C36C; Wed, 19 Nov 2025 21:34:54 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.70.1 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763588096; cv=fail; b=kyDQFwz7n1BWafORqTFuQZxKsw3ShyNLnA8exbl8XqzJPDr7gAY4yA8VWCv8U63KkvHfR1W+XkYlBvx8ZtUo1mzTKmGkEKYV67Eu7yaZSW0AHBeyXL9vKVx+KXbbbUhDVEkCH1f3VIWXyKpOVW54QaTduKeDUaZBYW+hlrAKJBU= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763588096; c=relaxed/simple; bh=wN6jB2JHhpCbpDnVIlVKtbaXrlfV9XQ8xG9FZRQF8Ws=; h=From:Date:Subject:Content-Type:Message-Id:References:In-Reply-To: To:Cc:MIME-Version; b=lbY0935iw1ZaGpF9iU+JfDURHVXCSKYUWS7Okauj9A58C8yKTM+vgFIrhD6ujRMxNxghXehmTs6A5ldK0aQjbIl69HHWvH74fv93ME9voEIe9SkdqHcI6WeKbo6tfN9oWIdBP++SVs17e8dn3c+Z+mtZFbkEBByPRhocHEizuGg= 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=ZGWdDv3m; arc=fail smtp.client-ip=52.101.70.1 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="ZGWdDv3m" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=vBxVzjT+lPH1esJhtAqHR2qR08Fmp3c+/Gy0q/+21OvhItfysex1eteEf2jaju2ksUYJaGfKpQL0tdR0q6wYuxj/xNFXFGD94ZA3U0LzQFaFQOY5L/y+9s4mzuvRIUKCdrLaVF9yzwD1T03IjGBhvB7ODtgck/twA1L+NoEbnXuHe4H5XZk3JN6F3Ro2tljbCw8NHArUqGjtPTlRaXv5TAW0ZYa1rucaMkigW/6qAJn1U6zH1Cz8rvFEmUV/19oKvx5mMxCh0F4B6tGrppArRyKrfP4AG1pBYrh5e8ym7fJHrV2d/Uc5j723viiW1mErjM6Zsb5l0eaFBHTX9HZcsg== 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=nFwlNzZC07hrHnRLEXHuvmPAxD5+lhkPkserCIbfd/c=; b=IVgtPPBapQjyMOUkupJg9WMMFWgHVIJQLPWRGjKBFte/XmqPoF2lrpH9Zgf0pCRQqay6M5DK+5+3uSsD7DfQzYpL2EQ5KA2j45SxYkX7/Zyn3361yCkH+pipJHCG42JssT2cEBxjIE6NERqZ9vOr9pT+jUn1YYT9LQn6t3umc+WABXCj069VTc3V8ZY+QUGnnE24n+nlssZUDBKSHjJ/3uX9QMDvicRiXtLmzT8fe4OOAucnX/0eBcp+fH1cQFaj6gIqb3zQNcXf/Npv7+OV0hj0+z6UmAXjvg5j4qWF955RQ4USSMRfi+Ywqk/PjDFY5xr3Tw6vWCC4wIMrWD6LFg== 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=nFwlNzZC07hrHnRLEXHuvmPAxD5+lhkPkserCIbfd/c=; b=ZGWdDv3mmdYeaO4L/ZSwsvYe27HyC+sb3lZSYPhw2OVxCJxs6LZ/jd6hexDkKxGRIp3AzksT7qFVdzm724WrQG0N8Zys2nBAAcs93aBn168gldvj++AeT4XsHmQN4WkqI52ZVPG4G4GGRccVQeZjVpKxm00CEvshw9YH/ktvcNsL8bkVvXde/pMU9zdfD95XnooguXvZyv8cN0TMDhjnFmIrSDJgrYEDAyWXhqCBiWJ+RC5iuLvZnnJ2yO2TIE/bMGijKPRANloDfQPzpd0hRN9W2oql1v5dho+opWOsABxJ3PhocdH9FBENvFOz3bf57iOGFEF3L+I8NlXzkhppSA== 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 VI1PR04MB7071.eurprd04.prod.outlook.com (2603:10a6:800:128::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9343.10; Wed, 19 Nov 2025 21:34:52 +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.9343.009; Wed, 19 Nov 2025 21:34:51 +0000 From: Frank Li Date: Wed, 19 Nov 2025 16:34:27 -0500 Subject: [PATCH v2 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: <20251119-cam_cleanup-v2-4-df732cc83ff1@nxp.com> References: <20251119-cam_cleanup-v2-0-df732cc83ff1@nxp.com> In-Reply-To: <20251119-cam_cleanup-v2-0-df732cc83ff1@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=1763588074; l=4299; i=Frank.Li@nxp.com; s=20240130; h=from:subject:message-id; bh=wN6jB2JHhpCbpDnVIlVKtbaXrlfV9XQ8xG9FZRQF8Ws=; b=b6c07eOyabx9Dmp+3pMgJJtOD+HgJqOJT6NbttPfegk1H/p620cqvCN9KkQVtzkYa8wYRCY0I 3CeMR98kCFZCiqRWjBRWr4AGpZNvQiaFsflY2WJCntRlrum+ZsN0UD8 X-Developer-Key: i=Frank.Li@nxp.com; a=ed25519; pk=I0L1sDUfPxpAkRvPKy7MdauTuSENRq+DnA+G4qcS94Q= X-ClientProxiedBy: PH7P220CA0043.NAMP220.PROD.OUTLOOK.COM (2603:10b6:510:32b::12) 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_|VI1PR04MB7071:EE_ X-MS-Office365-Filtering-Correlation-Id: 23627cff-a897-4b4f-3f93-08de27b37905 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|19092799006|366016|1800799024|7416014|376014|52116014|38350700014|921020; X-Microsoft-Antispam-Message-Info: =?utf-8?B?UWFUeHBwWk80UURHd0hMUGQvK1VoQXgyeWhVUVFHSG1id3RIWFo2bUI1VkdD?= =?utf-8?B?L2tlei9MU3VKcjQ2SVlPWmR6MDY3RVpzMGtybm5KQ204aDlYdkU2OGJuR2xy?= =?utf-8?B?QmZhVEM4a280dGkxR01JUDBvdFVGd2hSVHc3Z2czeXZEcE1pRldlblgvUXQ4?= =?utf-8?B?WVRKbFRhNU95OCtBVG8wWUxKMmdSQmFWT0lXcjRhK1VEclBxclVmMENDV1RG?= =?utf-8?B?TTE1TjdnVjNlVUx1N0Y0bHdFZmlVYlBMMGdoYUlITFZpZlZKVElaM040YnJ1?= =?utf-8?B?SmZTaVdQWWFqNk9QeVFOUDRmZFJ5dmdubXpsS3JqU1pGS09Ceityb2xjNFZQ?= =?utf-8?B?b29sRTczYVMxcFcvMnRrMEtkTFRkdFZJVHZaWis1cEdCRWZ3L3dkd0RzZzhm?= =?utf-8?B?bWFpa0g3Tk5tMGlYWWpGMDNQbk8vRzQ4b2JzcVdFL3BQY2N1NmpNekdmN1dY?= =?utf-8?B?Mmhkc0NhT2R5dnllVnN5TTc5OG9EMHlhSFFYUkw5SE0yNlJKclNhNmtCdDVr?= =?utf-8?B?MmxIU2wvdlVoMkxraUp0VDZTVU85MkwwSEJEd2JmdjBsbzg0YUJiTUdILzVK?= =?utf-8?B?enlzWDliM0d5aDVmSWY2TjdER1pEYUZleCtSM2FUeFdPOGMrQXNZWFA4T2RM?= =?utf-8?B?NjR5TEpvdkM1ZnNLT2ZDYVNGcEUrWnpiaFBqTDZrUVp1cndKY3dlQ0RiZVB6?= =?utf-8?B?SEdqOUQ0eStmcTNkNEZKbVdlakJvZ2RBY3JUdFJPeU1FVHFxVTcwaTUzSUl6?= =?utf-8?B?TDM5ZFdZUXRhaFhUWFVpKzRPZmNrYlAyRFJtMnoxb2ZnVWE1UnVYZTErN0gw?= =?utf-8?B?TFJiTUhKYWhvNlRWVStnRG1kVE04cEtiUmlBRnNDQnZpNXZDRHoxd0ZYVTc1?= =?utf-8?B?cDUvS1Q0RWw0T3UwL3YvRTg1L3VhODRSOC9lUG9SRmJNb3Z0aEdlRnNDNUJY?= =?utf-8?B?bko0VDdITk8zU05ZRGFEa3dqMFEyV0NrcnBGdmVJZTlneVlLOTNSRTZkSDRt?= =?utf-8?B?ejBqRUxoU2RXUWVGWGJOZU8wZkJLNUhqWVp3T0tKdUczK0pYUlgyNFRsT0ZY?= =?utf-8?B?SW90TklON0t3emVGNDJrNHJIVGt0WGlKa2NiSTZlbXVVUmVrOWVjem5xL1dH?= =?utf-8?B?eVJHT3dhdTRCTEJ6LzRwaGlLbS9FYk8xSFFwYm5TVEpiMHBZUnRaT3FMMG1L?= =?utf-8?B?SFFxUDdMcDZ4cDQwR3hvL0hjRjVpazNySXVua0JsdW5qUzVGMHRod3JWcEVj?= =?utf-8?B?Z3BEYkNva0tPVTJVMVVqZ0I3Q3ZEbDB5Nk1Pb0RZanF5VGlXWE8vQ3dhSWNa?= =?utf-8?B?Zkx1S0p6QkNvdllwMXVSc1lqcmZSbDdvZGNSdHNtVVJ3cXc5VUhDVmZ4M2Q0?= =?utf-8?B?NlNqN0lSNU9CVXVJdzFnUFZaYTgyTCtaaXoreEZrZkxZYTZFOVdnZDZwb3lU?= =?utf-8?B?VWxoN2wxL0RSeXJXZFZvajZoSVJ3Szl4dklaNklpUEJ4T2FRSHNBelZNdXcz?= =?utf-8?B?L2JoMm9IT09vQ1hsblB3ZG5JL3lxeElCSmlVOGpxSENVQUNLdm9QR0czRXgr?= =?utf-8?B?ZzhqTDl4a1VIZ0RIYXZBc2Jqci90Nk5rQTQ2LzRzUHhHcFNJd2MvQ1V4NzB3?= =?utf-8?B?RTVZRFhqNFB1RG5TU1RLb2pJODVTaDV6cHRXL3NUUk9IYXFJckFScndjbXky?= =?utf-8?B?VEZCaFNoSCttd05EODdmeW1pc1FBRzA5NVZDaWtmbll1cFRPYjlYZmxkVGs4?= =?utf-8?B?YXZRemdZV2QzQ2tmRktPWnlxR2YrTjFKeWp5ZStxZzE3ejN4Lzh5UUxNMG5B?= =?utf-8?B?THdHNDkvemxmRnFWVEd2RDhsS1liek1UYmxVbTlEVjVNbUY1eU9WaFU0L1hk?= =?utf-8?B?ckp4b2h6Z2p6cm0rNzRRWW1mUXJua1F2bzRCSjBqRXF5T1lUMDVmdnhnN3dl?= =?utf-8?B?TTEvdkU1S3FIYityUnFlTW54TXR0c090SVduMnFCMGU1K0x6bHFCQ2tHTXFI?= =?utf-8?B?d2ZQUDhPekxaU0NCeEptV25XTXNaVm94d2VmTDNqNjU5dkJEMkRETzJLUXlZ?= =?utf-8?B?REZmU21pK2ZTSGl3alMxVk1JVW9Hc24vdWtxZz09?= 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)(19092799006)(366016)(1800799024)(7416014)(376014)(52116014)(38350700014)(921020);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?UmY5YzBHekJUeGVSWlZOYkZWdnRkVFRwdGhucktycStEa3BuOHZubno4NC82?= =?utf-8?B?KzVkbk81TFhuZlVocURQSTgybUVQc1lyYjFkLzhORUlxUGhVUE5TTmduYmRk?= =?utf-8?B?UytLempmaitheFRFSzBMeUtMem1wMGJ3WEZMQ3YxOG81T2V2cDdlTUI1REVO?= =?utf-8?B?ZmZEUktnczlRRUhNYlFoeXZUT2lKckRLeGlENkxLNzhROGFFQUZNY28zMjZT?= =?utf-8?B?S1haaTkyVFBjZFlXYUtkTHZhMlp5eUtIamhMaHpOdXdEc09TajVkTzRQZlNK?= =?utf-8?B?MVRzZ2N3TTl4Sm5QYXRVM25CRnpzUG01Q1hMY1lIU3lrZmxQNFZOQnZzWnhX?= =?utf-8?B?cDlwZWpBc1BaSU8vMTYxcFFRODlPODJmK1lMc3VvcENWZnpMTXc4aFQzOVha?= =?utf-8?B?YjVFOEtIQUJWbEM1MENPeHp0NnI4UEI4MElqbnRXckV3ZDFIajhnbXdHdzIz?= =?utf-8?B?cC9WMjhjL2wrNTVEK2xCcWtXZVROZEVJYmpTczlkaFJydFZsMFNpZFk0aWJ0?= =?utf-8?B?aTBLRWdlYkdjZHJnWmFGb1VRanhkc2kyWlljSXhud3dweW9lSHFqVmRDUU1H?= =?utf-8?B?ZXh3dnhiWEJ4aGQ4UVA2TnNabThCYThLemJsQVowYWsyekdGZHlpTlRUc0sz?= =?utf-8?B?YkFPWGhBOEo0cDNwRTZDc0k5K0xvRWJNWVBRWnFRL1gxYlNJNE5abVMwNHhZ?= =?utf-8?B?TzkzYldIVDBOZ3NVcmN6MlhoMnRoNGphTlBHa2RMYjlqcWc4WkJLak5WS3Nk?= =?utf-8?B?bURWU0FZYXBOd0JaWEZIODVaR3ZFVGNOVGk3WWVIKzJFSS96cERhbDVUaUd2?= =?utf-8?B?TlRiMzY0TTF6NVBZQVpCY3U3U0Y3cHIwZGMybE83RWgwckszdUcwK2lUcS93?= =?utf-8?B?ZXd3OU9DK0tUZVJFSFpMWUlVM0Q0bXdKTlp4Tnpvd1V5UWFraDBJdzNCTlM5?= =?utf-8?B?QS83ZDN1eHQyRFVpMVF5NVFWMnp3ckRjUmU0TFphQWZnV2JmcGJPb3FsM0tF?= =?utf-8?B?US9wMkhJekhoRjJEYVN1SVZaRHBJaGdReXpLdjlRTmNGSDhIRHhLcW9TL0pT?= =?utf-8?B?Wllqc0U1eHhjQTBlYVBramRISjFJMjg2UVQ5WDhMR2wrK0w2MHZtYnBDNTdB?= =?utf-8?B?MnViNmFvMVFnbDlDaXc4QUZjeHJXcGt4TVc0SXVwemtjRXRjZm8xbVZxT0Jo?= =?utf-8?B?V3J2eUVINFNlN0RzOG9QcnhWSjFldzI3Kyt1blZnS1VPbGZFVnNGWVZoU3Bj?= =?utf-8?B?SUxNV3NtbEt2dGkrbklJUk05NWJDcWRHUUN0OURIMHJDNVFmcnNaWGgrc2Z3?= =?utf-8?B?UE8rb2ppVzErNndmLzhwT0dPZTVPenhMWEgwelNtT3R2bm8zYVJKSXo5ZURu?= =?utf-8?B?MllmZS96RWpQcGZSb3dFRE5aUXQzd3N3MVFHN24vSzlzSGRIZ3l4N2thY1hN?= =?utf-8?B?MERSMENZcGtERHFyM04vUndaRzQwekoxbWxIdzlZcXBxdlJSbUtrWGNxZE1a?= =?utf-8?B?bUNicU9sS2RmMnVGY09PLzdZajRpRzd5bENxcWJKQmx3WVM4dkVPaHNUM3RR?= =?utf-8?B?K09vYm4vUlpFNFVYY2QwNXc5UWt0Ykh0WGk2bjJ2eStna2M5RFI1cDROWGJQ?= =?utf-8?B?Tis2aldUVjQrUFluT1ZjOG1YMThUUytqOExxaW5uYjdMbGF5aHBtdjlXeW1M?= =?utf-8?B?a1BNbXpNcnR4dGFGUWRKdGl2WjhUTUhFSGlMVW1OSE4zd3NtenFSVEY4emxa?= =?utf-8?B?ekVMYTFvcVo2MVprcUxETi8xbkRjNjg4VVg3eXUvRzcwL1U1OWxBWStaODVw?= =?utf-8?B?Q1pqbnhQYStLMFlZWVA2T2VQdEF5K1dVLzhXQ2JTLzVUanhWYjcwc2Zpci9K?= =?utf-8?B?dEoyNDR1TFo3MkN3ckVmV0lzcWZHd2ZHU3ZGZ1l3bVJUaXRzdzBCeE1QN0U3?= =?utf-8?B?ODFHckl0bkdVMjJaMjNFNUZ6OWs5cW05TFgvb3plaEFQQzhjZlVTOS9TdUcw?= =?utf-8?B?TE5QSmI5Y1ltdkJ3ZkExclEwYUl3eUtSaXBiS2xtZVZIcDNNVitBV0taR3BK?= =?utf-8?B?VUJmUnFaSmNoWTFqZTl2UlZISjJxK0x3RVR5T0NkQ0NvaCs1TE1ET2kwWC8y?= =?utf-8?Q?nmqeMaz6OsFDkNG2HteA/QwjL?= X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 23627cff-a897-4b4f-3f93-08de27b37905 X-MS-Exchange-CrossTenant-AuthSource: AS4PR04MB9621.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Nov 2025 21:34:51.8763 (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: p+RuXaPaj17o2jbNtyiqHWpu4N27YlfnzAWTFDu/2F0fYgrsVUQt4WI0dIrKM1D5Mq4RfBsXbkRM61hsWpSemA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR04MB7071 Use cleanup __free(fwnode_handle) simplify code. No functional change. Signed-off-by: Frank Li --- change in v2. - move variable define to top. - remove dev_err_probe() change --- drivers/media/platform/nxp/imx-mipi-csis.c | 21 ++++++--------------- drivers/media/platform/nxp/imx8mq-mipi-csi2.c | 21 ++++++--------------- 2 files changed, 12 insertions(+), 30 deletions(-) diff --git a/drivers/media/platform/nxp/imx-mipi-csis.c b/drivers/media/pla= tform/nxp/imx-mipi-csis.c index ce93d868746f002c22e2f86b1e0aa84ec1a76061..f345aba63936f5ee86ec4c621f3= cb434002d7c8d 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,7 +1350,7 @@ static int mipi_csis_async_register(struct mipi_csis_= device *csis) .bus_type =3D V4L2_MBUS_CSI2_DPHY, }; struct v4l2_async_connection *asd; - struct fwnode_handle *ep; + struct fwnode_handle *ep __free(fwnode_handle) =3D NULL; unsigned int i; int ret; =20 @@ -1362,14 +1363,13 @@ static int mipi_csis_async_register(struct mipi_csi= s_device *csis) =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..bb9dace0cfac08dc43858b69590= f3d73457b3c4c 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 @@ -716,8 +717,8 @@ static int imx8mq_mipi_csi_async_register(struct csi_st= ate *state) struct v4l2_fwnode_endpoint vep =3D { .bus_type =3D V4L2_MBUS_CSI2_DPHY, }; + struct fwnode_handle *ep __free(fwnode_handle) =3D NULL; struct v4l2_async_connection *asd; - struct fwnode_handle *ep; unsigned int i; int ret; =20 @@ -730,14 +731,13 @@ static int imx8mq_mipi_csi_async_register(struct csi_= state *state) =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 Tue Dec 2 02:18:52 2025 Received: from AS8PR04CU009.outbound.protection.outlook.com (mail-westeuropeazon11011043.outbound.protection.outlook.com [52.101.70.43]) (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 2FEBC31A046; Wed, 19 Nov 2025 21:34:57 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.70.43 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763588100; cv=fail; b=ejIT00lw2arDCVJVWwxxJeExp5w5K3UqZoPZM6goaNpMev+EHudzDFjnTlcUBcJ7s9ae2cZO98uEGwKd3tVXlm953eekJMr+zKXFus3S8FdgnmIrbExa44NEKexd3O/YRcE77a+Zmaj+gKZ6de1WhZFpXhhF/rvIu6TRto8AsWo= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763588100; c=relaxed/simple; bh=hOSFMCym/hb6glt2EBJMskpJPVTVCs8BXm2UMYWYrG8=; h=From:Date:Subject:Content-Type:Message-Id:References:In-Reply-To: To:Cc:MIME-Version; b=ipl74EBJSIGNWRIpZgYr4yiJMbrTt/dlCBbY2FFVs4WWNX68jS8d6/vOqjrAcKkW4jMWWlJydaSi2EhBbS1wpATQGEDqLcx0bTzQW8VJtivDBdYK8klvbkx/NOCpHMaqgbWakVgxH785g3xWHnhnDEFC5B0DqNyOdxj4FpMisio= 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=DtxbK8pT; arc=fail smtp.client-ip=52.101.70.43 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="DtxbK8pT" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=AZcDtxMeW2qwhLrlwROwGzyf6pJJhNqNSS0oHEHCL+yPAEX4EFzxPPoeLYfqNOx0PXzJ8Jxv8b/QRUuDWBZOFgBfMw/tZr4HJUXsg/xP34ZrXiyjp9WUTMZnqXxBx15/nsc2WiZbG9iF/RIldduA6TYE8LjB8EaNgSFhPVAB8ixu24o49yP4pavKl87+EGlTHSh4leLKQ/erx8x4Vv9LwLH1T/JkiVIlth9CYVzqT6jxWz6kMj4dBqOqSMDOzYq++aUk6VIGjBQuY4ZDF2+ge/S4pA7ECkdqSuEYM32W8QTGAgU586TyHjzbR/q8UKYYpf1aAaQCHau1IJZuULBVKg== 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=/VkQKXGP34QywJh4JwW4foCeHf47CEbE7fOOMjXDL7s=; b=ntlSkrzHJiynls8bynmTxsBxUoCT/B//diwm06H7CpT9euzf11+3+VtKMXPg42I4IQVb1GI2Ro+m/794F/xMBjk5Klr+F6zOZw2kj9Ke6c1DAo1tb0kOqsA7W53avKG3YrIG0gi18h9ju0SFF7hkokb5ZS12lDr7NfmqJ50hBqzius0iA0cmJgw3FPnM07nArU0q7OF/FzvPy/ngISwMlPdfYwQrsynMrAwnPprZLBL4Xlc/ZKlulqvG9QRLqBJx65HLzj7BrcYo7G90YDha89KOajGIJ+P5qZkOENtyjHvwxfz1/bePuO3/TUZY14PsmZqbVpD6m2ZMPU6xF8C0Tw== 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=/VkQKXGP34QywJh4JwW4foCeHf47CEbE7fOOMjXDL7s=; b=DtxbK8pTrwTLdaBwuKcwsdca6zd2ujwsCHjcaB+k4m3ZChS80U4v+N0UrSWeTbz82p9NkEazA7PuewG/ez3ZXontoQXDwigp5ceghFFpk7un7UORwsAtWu37IVTlQbtCG6VM0C/wQ58chSNHZf5MinKnSf3J1MHZX8ZUt8qsfUxjsiETpboWV7spBtOz328uY/tjNIdrxZJWJQCV9Fx8WXMa8Qcr1v0eVi0L4K5hzRc6SkHGU6r1X079dmOIBqCVSeFTnyqoMjL2+QsiJf2DeOv7Frru7cJYi+EsgCnzIXRx4U2IpSGcyODd99lbdLQ+WsLHZUZwIeFWl03IdnAc0A== 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 VI1PR04MB7071.eurprd04.prod.outlook.com (2603:10a6:800:128::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9343.10; Wed, 19 Nov 2025 21:34:55 +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.9343.009; Wed, 19 Nov 2025 21:34:55 +0000 From: Frank Li Date: Wed, 19 Nov 2025 16:34:28 -0500 Subject: [PATCH v2 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: <20251119-cam_cleanup-v2-5-df732cc83ff1@nxp.com> References: <20251119-cam_cleanup-v2-0-df732cc83ff1@nxp.com> In-Reply-To: <20251119-cam_cleanup-v2-0-df732cc83ff1@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=1763588074; l=5132; i=Frank.Li@nxp.com; s=20240130; h=from:subject:message-id; bh=hOSFMCym/hb6glt2EBJMskpJPVTVCs8BXm2UMYWYrG8=; b=jfafW0LvIfsoTu4uEO/M6nWXC9+L2VODVjXCBsnsgY+xEhJsqyonlSSzZ7atUKJg1FZ7cK5Sj ok/HvQzB8ZHCPkiQFBb+2n+MNWi6HeLTAh0doHY2OiHCokbB7bxHNaG X-Developer-Key: i=Frank.Li@nxp.com; a=ed25519; pk=I0L1sDUfPxpAkRvPKy7MdauTuSENRq+DnA+G4qcS94Q= X-ClientProxiedBy: PH7P220CA0043.NAMP220.PROD.OUTLOOK.COM (2603:10b6:510:32b::12) 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_|VI1PR04MB7071:EE_ X-MS-Office365-Filtering-Correlation-Id: c8a0e955-fbcc-4388-4ccb-08de27b37b26 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|19092799006|366016|1800799024|7416014|376014|52116014|38350700014|921020; X-Microsoft-Antispam-Message-Info: =?utf-8?B?T1RpNkk3U3lWWWd4OEs2a2cvYUttU1JNT21wTWdHa2RhMnpDeFlJY1M3QjMr?= =?utf-8?B?VTlmYXVaYldYVERzdGgweit4WmhvOHFaOFI1bG1OWUVvVnZxdStPS1hEVHpD?= =?utf-8?B?aVpxdkJWV3ZTKzVWaitURDBCanpaUHdCYmZuRmdQM0hheXI1dGt4YmVMcTV1?= =?utf-8?B?amdubWd1ZGRqYk1KUC80cWM2cDlPOUluTXJlWU5sMG1SZnZaZDFrMDh0Nmcw?= =?utf-8?B?QVZtNDQ0NmNVeGI4RVp4UUZmaG1CaGJJcnpZelpmR004bU4vSXRtekhaUlFs?= =?utf-8?B?OWVreUVjQnZ4RWtNZXo5TnFMbE9najhHSE1haDEvVUF6aGx0QmZRWGIrQzQy?= =?utf-8?B?RDdtdEk4T0pKOVFxWFhyaU5Qa2NnQ1l4NlVicFNoWWJlUnptVFh2dFV5NHdV?= =?utf-8?B?MENnNEFjVnk4NG51WVJ0RHN4S3Z5bFZQYWZ4OThPV0RUV2ZpZ0xjWXNOT0lH?= =?utf-8?B?RjhMWDU1T2hya3VFV3d5NmxaQU0wM1RxeVRreDRxQkFmb2h5RHVIK2lhM3A1?= =?utf-8?B?aGtMc3JjY25UODZFOEZUandheGxQS0pneTI5MmhGdlFQTERacWoxZkNsNEM1?= =?utf-8?B?Y1o5Q2hEaVB3SDdoQndNUjBmY3NreDJYaGZKS044QTlqSkJqeW10QklPY3Zq?= =?utf-8?B?eTYzdFpGWHFQemwyMjMxWkNwbHo3QjJyWmJMTk1DU3ZLMGRTUGs1NGhMakFw?= =?utf-8?B?OHdvZUVYbTN3YklLM2VmeDRTWGplU2J4dnJJbkREQVIzRm52KzA0SUdxTmtr?= =?utf-8?B?ZWQyN0I5MXpVczZkNFEvY1U2bnhzMnQ4WC9XN1RNUk1GRm1WZnJSblQ2VWRz?= =?utf-8?B?Y1FOaTlMM29ST0wyMVh0czVpdDk0Y0grVUMzTVNRVmw2UkFLOUlPQTA3T2xR?= =?utf-8?B?dHFjazNCKzlSSkJYV3doQUtDY0hKM0JjY2hCcTlDai9laC83WDJFajh1UnJX?= =?utf-8?B?cXBVdjZjbjBBRVhkVDArQytFd3UvUTJHNTA4K2Y4dHhzaE1TTTI1L25QMHlo?= =?utf-8?B?eEZHemV5TWdaZjNlY2VxYjhOZStaSUxyVkRuOTFMVUN5RWRtcG9WY3pCL1hZ?= =?utf-8?B?WUlNUnMxT0lXYjh0SjNCd1R2MUNseFlGOFpydW9zdVl0UUc3VFdLbzhMM0V0?= =?utf-8?B?SGJwRjVsRE1YdjVPckJwbTBPZmhwQzF0V0dPS3VDcUg3WW5DV0Fmd3FkV29P?= =?utf-8?B?M25aRGJ6SUYxNzJUcTZYNUdLSGgrUDZDLzJXcUlBNUFsNnFpdjh4STUxbFRE?= =?utf-8?B?S2N4Tlk1S2kyaEdOalJyU0owekcrajQyRHBFa0Y3ZCsvclVxcHZyT3YxcGtV?= =?utf-8?B?YkpxYTEvaUpBd1ppWG45VmpNR292OEhvMm9BTWEvZmxzSTRhL0JvZUhOZHZM?= =?utf-8?B?R2ZmVmdTempMT1ZhcG1Ua3N5aUE5Q1BTaXBtaGdVU0ZjbFFxZVMzdW5CSXhk?= =?utf-8?B?UFh4Z2p0MlpRQ0g4UURqSkRVVUp1dVM5U2k4dHV2UUdGcDc4dXVrbFRFalNv?= =?utf-8?B?ckpmcFAwTElMOHIvU1NkTThkUjIrOG4wVXVEam9wL3pod3FlRGtRZDF6Tnlq?= =?utf-8?B?czRWWm0xL2JBVHFWRzJUc1pISUg5QXNUTkp5TjJMamhubW16aitPeWkwRGhh?= =?utf-8?B?UGpxS3k4MFVzZzdJaDFwY0txOWExZzczWHFlRkVnOEV5eVZVMER4b0JVSXpi?= =?utf-8?B?V1AxM1FUMVRyeTF1Mk0wTk1FTkR2angvRmhMK1V0SFNvRkY0eFhxTXRvWWp5?= =?utf-8?B?enAxRFNibDdwbVZPRFk1NW90TWtRZ0dHZm9PV1hvcDNzdG41K0dNLzdSRzNX?= =?utf-8?B?TnlnMHBkU0J1dW5oYmh4L0N2bWg3eG41S2t0NndnbEVVakwwOEJheURWcHVn?= =?utf-8?B?RTJDQTRwQlJBWGZEcFFJMUdMSkdjNnVVd3FBWmNsdXl2M1hnVU9CMC93b1BC?= =?utf-8?B?Nk52KzZnaE9jRnViTVdmbGVWL1NQbEdyT2hlSkJJd3dVbWxjbHAyRXJDKys5?= =?utf-8?B?YTBEYy9aSW1tc0FReUlNbEtQcjNBeUI2UW1vbjVTRnh1M0ZmTUg0M25CSzZG?= =?utf-8?B?TWVsRktVM2FMUk00bUx6Rk4rcmtPVzZwYjYyZz09?= 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)(19092799006)(366016)(1800799024)(7416014)(376014)(52116014)(38350700014)(921020);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?cEhUNkVUZFl6azBodzV5ZXZma3ZqcjVNVW1Vc0FWV1dVVFp5RFAzMlBpS3ZX?= =?utf-8?B?Sml0MldxMjVyOTY4UUM1YkZCQWZZU3JNTm4xL2h6ZzRHaE1mZ0Vkd2Y5NFdl?= =?utf-8?B?eWcwNW00cXRCSGllSTBTK2dqREFsR3NkR1V1TFNjamdSckc2eWFaQnhiMkpJ?= =?utf-8?B?dlVTL0lVVVE5d2lab3ZSZXRQak1MZk5IYTVaNE9CNEgzQ01ibk5tMjBjZG1X?= =?utf-8?B?dWJGRXdNUENpZTZ3aGdmRnpYdEorREVlZmZka2Z3bXNSVm02R1VKRjI4eWpM?= =?utf-8?B?VW9CcFI5Yk42L3BING5JUE4rUXZUdmNBWW5WSkJycUlrd3hubndnM2xDTktR?= =?utf-8?B?dDB0U293ZUJJQW1rcndMK0dQdVJxK3hSYy9xWG8xK29ublY4aVp5VE5qd1lv?= =?utf-8?B?NU83L0lNTXlUakNzRDNZRG4yU2hoNElpQnZDRTEwUitVcWdrZnEwWjY5ZnZZ?= =?utf-8?B?cHB4QlNqcng2QlE4Mi9XS0VpUXYzYTZFYk9zSTJ4eTJQdVJNYmNUMVo2SFhI?= =?utf-8?B?elVXR2F0d00rU2FCSFNkSktuTXZseVBPUWVuRU84d0FHcm44ZktGQWs5VzBZ?= =?utf-8?B?V01mVk1WOUl3b2tNaTFPQTMvWElOK3pYNG5LSm8yQmRPcGdRUTF2WER5U0J5?= =?utf-8?B?OTdyeldRZU1zeTF2QmxvbGw3eVIzSUtseGdTZWI2dWYwS2J5aUQzRzZaKzA0?= =?utf-8?B?dG40bmwxOURFa1F3bTR4ajJySW5sN2IzaUYwcUppczFtVEtObWo3UitqK1lX?= =?utf-8?B?UU9BdFFwOGNhWWNDdmt6QmFYWGdhYVlSVXdtWFFlNzlJb1NaQWZSNXViRHEx?= =?utf-8?B?V3Y0YmFvUG1sWS9tdmVMWVJDUkpPbGFHUzNEWEF5Wmc3QlRiOUhZTlBQWWs1?= =?utf-8?B?VnhjcSt4cGRxWjlFTWd2Uy8rbEMrcUVxdldmVHFQRzFKN2tMOUUvcXJXZUdX?= =?utf-8?B?MUF6ZWRyT0FRdWQ2UGhUbVhXSXVjQ1ZOenZXeHFRNTRLeXpFYUszMEp6VkVJ?= =?utf-8?B?aGxzMzBzWlluWXQxRUNaWGRxUHRlVFdaalVBQk80RmlHc0d1MTRVZ1IvVG1U?= =?utf-8?B?d1BJNHFISjllSlgxaEFKWFBlYVo1cDZCSTQzbWhYL3B6OC9YNTBHUzAxaDBD?= =?utf-8?B?RVk1VlI4UlFmUGRSVVNjME9XZzkyNGRKbEg5UU9RbW1YZ2M3c0xmR2dYZGdY?= =?utf-8?B?SjJtS0pyTzVmemhYZWx1bVJoWXdHSS95dUhTNkZvU1Q5NmlYd1N2NjRHcWJW?= =?utf-8?B?UU9qa2dDeUNua0tMc2pvcWEzTTdialo4RUhZa3lDRXBPY244VjZaSDZ4WnhT?= =?utf-8?B?dkF2VTBwWUlhalFWRXVEVjV3U2dqS2k5VzNDVU1qUTdEWWZaWVZqV0Y5Z0hr?= =?utf-8?B?eVA1cTFIOURlOVc4Qk1PRC9tL0FiL3dRb2FGenU2cHZDc1ltalE5d2tsSlk2?= =?utf-8?B?WHZ3bXlyTmI3WHNndGVhTGNOWHc1ZEpQSy93R2hxeHNDNVBJZzlyLzNVSmdY?= =?utf-8?B?aXB4eVd3ZE9mR3FWcXFadWFOb2VYTmtKKzNEaHV6ZjdxazdmNlU3aWlLb0ZC?= =?utf-8?B?NEJ1NHF4OUg1SjhmN3hxU2tnYmgyWXNCZ3FZdVFOZHZiNFdKNGZiVlpwakxF?= =?utf-8?B?NlNRZS9LSFFvQ3gvSk9GbklJM1NxUGNaT2JXMm4zTkJYRWpua3J6NXdmZndB?= =?utf-8?B?Q0ZFSXU2MGFhUE02RE9FcldwMWhkdEJjRmZWeTEvMUZJLzNQeUZ6a21DSklZ?= =?utf-8?B?YVA1a1ZQUVdXblVvN0N4aFdKUjJYdmFLdW44cXJyZ0RMLzdvdFU2OVREbVcy?= =?utf-8?B?ZkF5Wks0NnlrN2E2a1RpN3A5N250TUdjc2dmVmpaYTM5L2lvQ1gydDM2cXhB?= =?utf-8?B?UjkzVE9GYWFGQWxrVVQ4VWxTbi9hL0NBZWtDZWhSSmoyMUhrU3ByNzF1QzVm?= =?utf-8?B?OThoSWxNbm0rREZTS0NwR2JRQUs5YlNWa2lxR0ZQTXlIRnMvcjNZY3ZpSC93?= =?utf-8?B?R2FyaGcvN2hRbUF5SS9lVFBibUFQTk1vUUMvbkFIekR0NExhcWxtNFN4RE5J?= =?utf-8?B?dnppZWVQcFFiYWdwSmFjbi90OEVKbVFya0RPai9sSm9VT2M2LzMwZUJrQXJp?= =?utf-8?Q?8GDly/EU++Myo5AqkTrEUqHPV?= X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: c8a0e955-fbcc-4388-4ccb-08de27b37b26 X-MS-Exchange-CrossTenant-AuthSource: AS4PR04MB9621.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Nov 2025 21:34:55.4177 (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: f6gbNCmyrUZrRfmGbOR49iqA+2m1acw2p+8G1McPrhilDBk1P7/rAcKq1phI5aJEv1pA2b1UA/ytynZbbQ4SMQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR04MB7071 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 f345aba63936f5ee86ec4c621f3cb434002d7c8d..75d1a40530b51d4cdcc69371b92= 63cf6df6a1a52 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) ep =3D 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 bb9dace0cfac08dc43858b69590f3d73457b3c4c..34500c358d9d3551492e102a596= 40647e153c763 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) ep =3D 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