From nobody Sun Feb 8 18:08:46 2026 Received: from DB3PR0202CU003.outbound.protection.outlook.com (mail-northeuropeazon11010054.outbound.protection.outlook.com [52.101.84.54]) (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 A991C30F7F2; Fri, 7 Nov 2025 20:44:53 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.84.54 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1762548296; cv=fail; b=pYYOzht1rqA7/F8ZJ3MBo/dQstBVQ3t6o7eHyNA2zNE5/ZxDXOPVb3gjwomn2QOSEoXUBQFrSvvbPML4vCNA5N/dZ6h1C/KOwVbTbRHafWhRkqMmmwnuWWkN1/H2OmnNFdf3GiuNx5cuQ00dCULXDwQnqo5r7BkRQETTQopEztY= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1762548296; c=relaxed/simple; bh=LJheYFsFE3gTgbB/4exm7kW6px7qSqmIClCgzXMKKxs=; h=From:Date:Subject:Content-Type:Message-Id:References:In-Reply-To: To:Cc:MIME-Version; b=sxMRsxTrt6VHBTljZZZeOxnv//ZuJp57FmFQ4/XIkEClSoqdlXf9grcMJFjZPGtgFMFHoL2ktOWwzQ20YQ0Vyna/eS03jsH5smzfk4/X948IAx0tJhTASv32PwpqBa3juzafozI6MNDIvtASCfqcsdpwo49MSffgCD4swTdND6w= 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=jSEwFyrz; arc=fail smtp.client-ip=52.101.84.54 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="jSEwFyrz" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=sxpzALqy9glufjPjbv2r1sS0Ydxbq43udEuwOeRT7hA6TuWfr+a0905eEgDwMezYgABLcgJRMFYj8/ywE43DLR/vnrmq1QsvEhL3YGRrmFYq3jTTt7KFfV6/GC84leGTPOkJ6MQmfmBck5/Wc5c+fxn3x5trGfkM9k5cnHqZR2ksTe9epuLgt9BL9CmlHXg0U8hMsg1iC//EOg97m5XpFJEmREI/sxL1lrMG22B6usvEEXvHHXmpnL3fBAZNdE1gEIaURMxC42xgpVmZdBQoVuvd7Dk0/nq3udHULxP884DZyerIiTER79SYD6+kj17Ygw9hO+XmMCPqM7154ogmaw== 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=GWDSKYGOK866sldsSpKS6S3hnBKaYQtP/Dg7w21A5r4=; b=yuleaUYsCgkHgua+Uu2FL8CMd9NZ4sYPFFRturK2RzbMpo426B/993Gvz8mhBLoM0H//BDAV80lR+rpXkSjDQSkDNQza9EBrKkbmEpO6Dojr0kYzxq75M/cus+5P1dD+VGzMp4P1SZloFqbwORxWI71Umy1N37gyEFEzEP0EL51ILAeY5OeXBcmZ7EFpmA6VhK7UYQfaZHqBfqbmr/TyX6I4uI53m4A11XSxOVgU2jnl7q0bP7KFRBvqqGw98nBq3DSrCQesw7/xVdhWB6dkR3X+V0iVA9SjKHKJ/Y5rww2YyewxZV4A3rDfbsKMxymDSqCoIWTyGqDCFl66UGuJow== 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=GWDSKYGOK866sldsSpKS6S3hnBKaYQtP/Dg7w21A5r4=; b=jSEwFyrzLQFMhS+eYdZVqSSXAidaxdszi0tblMDIvDMarLXbI2yGWStadwsGj0ojzmyLxw4Lq8FU+Y5Zf8uRFQO/wCekE2YY5wLRV+4z0zdOOgllsBqM6qH7NP8555UxiCLjICCbDBrLp2mznlKCj0SDORupfXVqeVBi8JXbbtgax3ke+ODHtZx78wrYY77MJDShaqdgEqU4IivMqGQc3GNjcLsLknYsJtbBPtyTjeFhkxd684SWm3KRrRIvd5Zyc4oAElaEbqK8ES3o5lvx4lOJJ8U1A4AI0khuWW6tnSISKgyDMfkJ1Iooqxh7DsQKU5VAOqrAt1OgWxGsbcD6Wg== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nxp.com; Received: from DB9PR04MB9626.eurprd04.prod.outlook.com (2603:10a6:10:309::18) by GV2PR04MB12021.eurprd04.prod.outlook.com (2603:10a6:150:301::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9298.12; Fri, 7 Nov 2025 20:44:51 +0000 Received: from DB9PR04MB9626.eurprd04.prod.outlook.com ([fe80::55ef:fa41:b021:b5dd]) by DB9PR04MB9626.eurprd04.prod.outlook.com ([fe80::55ef:fa41:b021:b5dd%4]) with mapi id 15.20.9298.012; Fri, 7 Nov 2025 20:44:51 +0000 From: Frank Li Date: Fri, 07 Nov 2025 15:44:32 -0500 Subject: [PATCH 1/6] media: staging: media: imx6-mipi-csi2: replace space with tab for alignment Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20251107-stage-csi2-cleanup-v1-1-5d42535243ac@nxp.com> References: <20251107-stage-csi2-cleanup-v1-0-5d42535243ac@nxp.com> In-Reply-To: <20251107-stage-csi2-cleanup-v1-0-5d42535243ac@nxp.com> To: Steve Longerbeam , Philipp Zabel , Mauro Carvalho Chehab , Greg Kroah-Hartman , Shawn Guo , Sascha Hauer , Pengutronix Kernel Team , Fabio Estevam Cc: imx@lists.linux.dev, linux-media@vger.kernel.org, linux-staging@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=1762548279; l=4945; i=Frank.Li@nxp.com; s=20240130; h=from:subject:message-id; bh=LJheYFsFE3gTgbB/4exm7kW6px7qSqmIClCgzXMKKxs=; b=151hCgavd5sCio2HKF4MWd4pFEX1ViaKDQ51oSewSRCYJ4qE3wm8tlTnZFGwVIJIhgi3nC+8j Zw4P87fghD7A4uuQW6tOnJ7rmAa6ApLU8RiCj4GkoZ/Mk7bSbjwFX9A X-Developer-Key: i=Frank.Li@nxp.com; a=ed25519; pk=I0L1sDUfPxpAkRvPKy7MdauTuSENRq+DnA+G4qcS94Q= X-ClientProxiedBy: SJ0PR03CA0332.namprd03.prod.outlook.com (2603:10b6:a03:39c::7) To PAXSPRMB0053.eurprd04.prod.outlook.com (2603:10a6:102:23f::21) 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: DB9PR04MB9626:EE_|GV2PR04MB12021:EE_ X-MS-Office365-Filtering-Correlation-Id: c4d54fdf-9cf3-4c37-ca11-08de1e3e7f26 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|366016|19092799006|52116014|7416014|376014|38350700014; X-Microsoft-Antispam-Message-Info: =?utf-8?B?bWdoR1ZNN0pwRVZDQWpMVW9QOGxHOGRQaGVwRjFjUS8xWFd0TjNWMldLWjRE?= =?utf-8?B?VVBWb3J4dUJKMUFwZ3c3WGxneklROHYvQmdPckQ0OG9BSmlXeVpWNG5nUjBM?= =?utf-8?B?di95SE9DYWQ4Y3hkcUJyZytac1FSK1NuZ0RKSzQreGRZb3d3eldJb21hWStx?= =?utf-8?B?WU1qSy9IWGU4VzYxUk41ejhLS2N5cFdlOFd4ZzJPSDhMa2x3Y1Z6WHJRajlj?= =?utf-8?B?WHd3KzdKQlRBK0pjSVhhWm0xa2wwQ3VrTWdtYm9xRExhLytqcHliSlkwV3Vj?= =?utf-8?B?cTNUVWQ5WUVqYWRTeUk2WEFONVQzMWtkY2J0RXZJQmdMRGYvWHlYVW9WeXFl?= =?utf-8?B?OEEyc2R2eGc5d0VGenVhMy8xVkVWV2FiTUx0YU5LREkxSFdrODk0TWd3dy85?= =?utf-8?B?TnVpTVRwdGdsK1VCSW1uRCtEK3B4bWhWS0pUR2RWOC9Nb01KTDR4L216N2NM?= =?utf-8?B?OUt0SFlpeHRjTjEzeGZiTngzc2NLVFJ3VjVpMHFJMjVHbjVqdkZqaU9XSDdl?= =?utf-8?B?dDlrVWJDeE92RkFwSzhSZkt0bHp1OUhNRW9wMElDcVhXTVpucWU5aGFHeDJt?= =?utf-8?B?cktTbStOUUk1NW5FTVNnSUprUE1lVTVmNVd4R3lRWWNFVG9FMHhXTFN0ZEJY?= =?utf-8?B?b0JKOXM5bDQwY2FMTTZKRk12S3FxNFNXd2FwenhlMWs3Z2JnYU5iOUpWTFRD?= =?utf-8?B?eVVNYkdSSms0ekNNcFkzQjVjZXdJQXh4TTlZZmpTOHZ2NkZKKzkxamc1MURy?= =?utf-8?B?NGFCMTI5TEFndTVyeFROWGxwR0F1WkVrMnh3dXM5R0dNMVVtdThBWGM5K1dW?= =?utf-8?B?N0dVdEdpZnQ2Q2hLUEJJUWtoNnFxQVRzeWtuUFdoNEhFeU1SamhOb2NDMjc4?= =?utf-8?B?UHFjQ3ZqbVhOMERLakhqL0I0VXpMZGJ5RXc4UkU4Rjhpb3pwWGczcTd0d2du?= =?utf-8?B?eVdhS1hpQzdHQzEwRDBya281dEpmQ3VWWmJ6OGFTMmZocHBMV2h2aE9wSWoz?= =?utf-8?B?R0tPMXVrNDg2QUZqN2NhVWFRRFBFOXZ6SkhYbHZMNnJQbTRGTm9zcnozRkJk?= =?utf-8?B?UkNLaUFrSEJSbXNqVG9HRERDRmZia1NYbVFQWCsyQ3AyUVliNnQ2UXppUEF2?= =?utf-8?B?b0xFTzBvRUlLblZDdFJTS09zSEpKbmxidFVkRUlzaUhWZkVyS0cvSXk2MTR3?= =?utf-8?B?Wk8xZE4rcTE1ZXRhcjNwNWZ1VlA0anpleElCZkkwNytCdWoxVkQ4NmY3cWRk?= =?utf-8?B?YjlXSmpEUGhxaWJRR0JBUEY1N2JPOGptaVhsdkM1Z1gwVTRwZ0JIOU9ydjZy?= =?utf-8?B?R0doODBVR05ISkNRbFJyNlc1My8xVmYyZEp0aGZJWnhBbzAxWWlHWjVVanIw?= =?utf-8?B?TnNHWWpGMlJucWUwYytBVk5vc09mSWR3SFVtS2dLNUpmcXptUUhzeWxqQkVF?= =?utf-8?B?Vzh5aTJJRGRINUZ4NkNub0Z6N2NZbjN0ZGZEYWRMUGhJck0xUmZicmw5NUdx?= =?utf-8?B?aU0vWlIrT3NJVnZWTThPZ2N5ODljSTc2emNnY0hFajV4UStOcDUyVHFieldk?= =?utf-8?B?QmZNQ3diOFZIV3hvdHk5UEtEWktUbVVyRzFVRTRvcTJsZ1RhWVlOOGZydStm?= =?utf-8?B?MlBJeFRvVXNZcVhJeWdWbmcvRklOTGwvWWIwaFJlVzhoTEc5c3VadXIzci80?= =?utf-8?B?ZXZMYlpBL1VGTmgwMGhjdUtCMGxuYW9TWEdXNnE3Rk1vNkVqaUJSWThDV0VQ?= =?utf-8?B?bEFuWkNMRkhiMVRWRUZ3Q0xSRGQvZVZ1M0pmei9PQ1Y5T2pDL2plM2dYMGIz?= =?utf-8?B?THA2Zlk0MEwxYmpRY3Jpa1MweHVGVy9GNDgwdEVvZlhQZ0F1cGVQVWVIUVNa?= =?utf-8?B?aWJKY3ZRMkpDTmdrekxvbjdpRVIyMXc5ektCelJzVEt1cCt2ME5qT0RvV1Bz?= =?utf-8?B?RGRSL1llNy9jMU9WZmFWazlKU21YLzFZRk0rUGw5eS9MTEhqTThiWU15L1Y3?= =?utf-8?B?bVJXa3E5UnFLYThDK3NuTVZTbG5kanpyOThCbFVxeHkxZGhHNXZBYzZMd1hY?= =?utf-8?Q?+lm+/0?= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DB9PR04MB9626.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(1800799024)(366016)(19092799006)(52116014)(7416014)(376014)(38350700014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?bTEzMXRxMTFuU0Vqc2JoS084L2hPdFRHVTBOSkxBZTlWcnIzSEJ4cDVTUG5h?= =?utf-8?B?ZGdCbEZpZGJFRU9wR2JXR0JCWCtja0g2NFpKdGNkbzh6ZHRZOXRPNWJ6UCtx?= =?utf-8?B?Q01ITmw4MTFNTkNJQmw0aFJCWFFHRzhpU3RqSEVPc0VLelZnN2NEaER1bnl6?= =?utf-8?B?RzNDTzlVOExFcThPeVVwSXVGUnVnTnJ0aVhIZkl1cGEvZjlaaEg2RDFxaTNW?= =?utf-8?B?UVJZZmViMGduSkN1ZFZCajM2bFB0WEdKSk5ZalBNbmNzdGh4R29GUmREdWp5?= =?utf-8?B?QkI4alNQWmJ6WjVCbERKT3gvbVprbWZSTzhCdjRGdXVGeSsvZXZTT0ZWRnp3?= =?utf-8?B?c05tQWtRbDdHNUxSYWZ4Sy90OUhPVTcyUGx4c2k2NlhUMFBhcUJ3ZFR2bDFY?= =?utf-8?B?T1RrVXdFLyt4dEhsWDRRazQ5aUJkOFI2M1JsWFcyK3ZRK0lYMFplalZRYVMx?= =?utf-8?B?STlXTTUzdjlCMy9mZklvamdWbDNEeGQ0bzJ5TXp1VFc0R3BvdXNid00vQk5x?= =?utf-8?B?ZVpyZ0FHWElsMXJNeXJBRUtENFVtSlpNOTkwNCs4YUhzTkNXcHFOMGhUYnU3?= =?utf-8?B?enYyZHZmTXBkcDZxR3ljaEdMZFYxOEdhK0dGTlluMWF5WGZsUFJnd1hPbVBk?= =?utf-8?B?ODkxdG1pVHl4YkNHQ3RnV2ZXWjVnQWloUThpU3o5ZjVlaytPWklKVjJMSWtN?= =?utf-8?B?ekxZYXNaQXJIN3NwMFlhWW9XblBRcVpzLzhPcWZuM0lPVnJPZi9rR0Zhb1hj?= =?utf-8?B?d29KYWRSSEdsWDRzZlFGNjM4OUFkOXV2MU1WTFBFek5Jcyt5dlI3d1BHMmda?= =?utf-8?B?UFJreURZbzBEWjNoMDRKV3RXdm1VWmRzMUFkWTJHTVVWd2VPV1VoOVI0TDRw?= =?utf-8?B?QTFTT0lhai9IeStDeWZjeGhHUGJ1eFRhWDdiZS9zL2crVkZTRGxZRWRvNU1B?= =?utf-8?B?MlBnQjdlZWFPZUlDYjlYTzhpRlA1dnY0eFpYNytoekh6MWFRQVg1cmI2bkN1?= =?utf-8?B?akZUMDlZMW41S2RJbjNhOGlLaDZSL3pHNUNKbjd6Ym0wZTBNTjJUcVFSQWc1?= =?utf-8?B?UU1idkM4Nm0zSWloNDJ3bHBJd2lKOGRENWV0ZDNzWlNHdzQyNmZ5aDFPaS9a?= =?utf-8?B?aEFUOUdpSE83eEp4NThGUEpPL3JoVVJuZ2c1RGkzZFBqWjNtNVd6QTJiellV?= =?utf-8?B?QTE3ZGREZXFqdGw5c2lydWJuNzZSaUdRNWxldCtPSWhpK1QrSW5TSnpTUG5h?= =?utf-8?B?UjNOVnA2NzFidHcydnUxM2FuUTNtVThvUnRaeXVqemdZVHRYV2Y5S2FoOXZ4?= =?utf-8?B?Ti9qbVVuQk1vc1ZDRnNIRjgvZkl5cXRqSHhjZFY3WmZpWXhFZXV6U2lpMkoz?= =?utf-8?B?NDJiZWhGZTA0N0pKUEFIbStwTVpaQm9KMGFRMHU4MEF0a2c0bzRoYUJnd3V4?= =?utf-8?B?RkhPUWJYNDNuTWdvZzZKeEFUK0I1KzVhUXIya1BadzgxcloyQm5PclI2eHAy?= =?utf-8?B?a3djbWY0OHdmM0h1ZkoyclFYK1Z0ZE5jM3VndngxVDYzbEU5RWJSN211aXZQ?= =?utf-8?B?T2I0TkNrYk5tV2VOcUxHeE4rMXArYktTd3JPL1VGQTJJMFI0SkZDVUJOazhM?= =?utf-8?B?aHVzeGxrajh5TmcxdHVwbmJRNVlORkpkRGt5ajhVMzBLeWUwQnZIYVlsVC85?= =?utf-8?B?MlF0STZmVW5uSWhQREM0QmRQRjFhL2FPNlo0ZENtRWlvQ1Rab1RUWkk1TUtE?= =?utf-8?B?VGIvM0JVMlFqaFpTSWZFUnNBY1FxNnhVcWQ4amdMN0hqcCtTc20wekxESERO?= =?utf-8?B?d1Vtek1rNjh1aTZQcHRBd1BoNXpPb2E0anZQc3FTeVIyZ0RtWks5emFQOVZD?= =?utf-8?B?SGxwdG83YWlVN0xta3pkRmhMMm5iZEx6emVjVEoyVWVLbWVieGhpdEN5b0Ev?= =?utf-8?B?N3FxWWVLeTRIV3VzMk1xTVJTVGJUbXExQWgxcExyc293ZTRVR1JQeGZkVkov?= =?utf-8?B?Mkh2K0pqckVmWUJSbWNzYnBVT2lIR3VsV28zR21scjl5WS9yRmhkOW5xdzFk?= =?utf-8?B?Z1NaSVFtWVp5TTJqdHh6WkRpUFdSUXc2TnEzMVBMdEhodUh2aUdBSEtqTlZm?= =?utf-8?Q?57ek=3D?= X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: c4d54fdf-9cf3-4c37-ca11-08de1e3e7f26 X-MS-Exchange-CrossTenant-AuthSource: PAXSPRMB0053.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Nov 2025 20:44:50.9141 (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: SyMuohtutVI+bJ7etkhn+eRulxBgxKBSCaBeDQ3DSTnRUy4FvVJShH1WtrNLWrTDj3a/B67wmxQyULSPJmsAeA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: GV2PR04MB12021 Replace space with tab to follow coding convention. No functional change. Signed-off-by: Frank Li --- drivers/staging/media/imx/imx6-mipi-csi2.c | 92 +++++++++++++++-----------= ---- 1 file changed, 46 insertions(+), 46 deletions(-) diff --git a/drivers/staging/media/imx/imx6-mipi-csi2.c b/drivers/staging/m= edia/imx/imx6-mipi-csi2.c index dd8c7b3233bccfc34b59e0f0ff813b36752e1526..42256441b881d9f132ad7ff899d= 6f1e35643b4ac 100644 --- a/drivers/staging/media/imx/imx6-mipi-csi2.c +++ b/drivers/staging/media/imx/imx6-mipi-csi2.c @@ -23,65 +23,65 @@ * there must be 5 pads: 1 input pad from sensor, and * the 4 virtual channel output pads */ -#define CSI2_SINK_PAD 0 -#define CSI2_NUM_SINK_PADS 1 -#define CSI2_NUM_SRC_PADS 4 -#define CSI2_NUM_PADS 5 +#define CSI2_SINK_PAD 0 +#define CSI2_NUM_SINK_PADS 1 +#define CSI2_NUM_SRC_PADS 4 +#define CSI2_NUM_PADS 5 =20 /* * The default maximum bit-rate per lane in Mbps, if the * source subdev does not provide V4L2_CID_LINK_FREQ. */ -#define CSI2_DEFAULT_MAX_MBPS 849 +#define CSI2_DEFAULT_MAX_MBPS 849 =20 struct csi2_dev { - struct device *dev; - struct v4l2_subdev sd; - struct v4l2_async_notifier notifier; - struct media_pad pad[CSI2_NUM_PADS]; - struct clk *dphy_clk; - struct clk *pllref_clk; - struct clk *pix_clk; /* what is this? */ - void __iomem *base; - - struct v4l2_subdev *remote; - unsigned int remote_pad; - unsigned short data_lanes; + struct device *dev; + struct v4l2_subdev sd; + struct v4l2_async_notifier notifier; + struct media_pad pad[CSI2_NUM_PADS]; + struct clk *dphy_clk; + struct clk *pllref_clk; + struct clk *pix_clk; /* what is this? */ + void __iomem *base; + + struct v4l2_subdev *remote; + unsigned int remote_pad; + unsigned short data_lanes; =20 /* lock to protect all members below */ - struct mutex lock; + struct mutex lock; =20 - struct v4l2_mbus_framefmt format_mbus; + struct v4l2_mbus_framefmt format_mbus; =20 - int stream_count; - struct v4l2_subdev *src_sd; - bool sink_linked[CSI2_NUM_SRC_PADS]; + int stream_count; + struct v4l2_subdev *src_sd; + bool sink_linked[CSI2_NUM_SRC_PADS]; }; =20 #define DEVICE_NAME "imx6-mipi-csi2" =20 /* Register offsets */ -#define CSI2_VERSION 0x000 -#define CSI2_N_LANES 0x004 -#define CSI2_PHY_SHUTDOWNZ 0x008 -#define CSI2_DPHY_RSTZ 0x00c -#define CSI2_RESETN 0x010 -#define CSI2_PHY_STATE 0x014 -#define PHY_STOPSTATEDATA_BIT 4 -#define PHY_STOPSTATEDATA(n) BIT(PHY_STOPSTATEDATA_BIT + (n)) -#define PHY_RXCLKACTIVEHS BIT(8) -#define PHY_RXULPSCLKNOT BIT(9) -#define PHY_STOPSTATECLK BIT(10) -#define CSI2_DATA_IDS_1 0x018 -#define CSI2_DATA_IDS_2 0x01c -#define CSI2_ERR1 0x020 -#define CSI2_ERR2 0x024 -#define CSI2_MSK1 0x028 -#define CSI2_MSK2 0x02c -#define CSI2_PHY_TST_CTRL0 0x030 +#define CSI2_VERSION 0x000 +#define CSI2_N_LANES 0x004 +#define CSI2_PHY_SHUTDOWNZ 0x008 +#define CSI2_DPHY_RSTZ 0x00c +#define CSI2_RESETN 0x010 +#define CSI2_PHY_STATE 0x014 +#define PHY_STOPSTATEDATA_BIT 4 +#define PHY_STOPSTATEDATA(n) BIT(PHY_STOPSTATEDATA_BIT + (n)) +#define PHY_RXCLKACTIVEHS BIT(8) +#define PHY_RXULPSCLKNOT BIT(9) +#define PHY_STOPSTATECLK BIT(10) +#define CSI2_DATA_IDS_1 0x018 +#define CSI2_DATA_IDS_2 0x01c +#define CSI2_ERR1 0x020 +#define CSI2_ERR2 0x024 +#define CSI2_MSK1 0x028 +#define CSI2_MSK2 0x02c +#define CSI2_PHY_TST_CTRL0 0x030 #define PHY_TESTCLR BIT(0) #define PHY_TESTCLK BIT(1) -#define CSI2_PHY_TST_CTRL1 0x034 +#define CSI2_PHY_TST_CTRL1 0x034 #define PHY_TESTEN BIT(16) /* * i.MX CSI2IPU Gasket registers follow. The CSI2IPU gasket is @@ -106,13 +106,13 @@ static inline struct csi2_dev *notifier_to_dev(struct= v4l2_async_notifier *n) * reference manual is as follows: * * 1. Deassert presetn signal (global reset). - * It's not clear what this "global reset" signal is (maybe APB - * global reset), but in any case this step would be probably - * be carried out during driver load in csi2_probe(). + * It's not clear what this "global reset" signal is (maybe APB + * global reset), but in any case this step would be probably + * be carried out during driver load in csi2_probe(). * * 2. Configure MIPI Camera Sensor to put all Tx lanes in LP-11 state. - * This must be carried out by the MIPI sensor's s_power(ON) subdev - * op. + * This must be carried out by the MIPI sensor's s_power(ON) subdev + * op. * * 3. D-PHY initialization. * 4. CSI2 Controller programming (Set N_LANES, deassert PHY_SHUTDOWNZ, --=20 2.34.1 From nobody Sun Feb 8 18:08:46 2026 Received: from MRWPR03CU001.outbound.protection.outlook.com (mail-francesouthazon11011009.outbound.protection.outlook.com [40.107.130.9]) (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 A5D4931A07F; Fri, 7 Nov 2025 20:44:58 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.130.9 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1762548300; cv=fail; b=Ik+P+E9iXphj3pX3cbxO4baKOIQkSBVSq2oJulz9g8QHLtaUpWBorAL3uYF4VHFxh5mBDoZ4SxsrhMjcHrMaMvHKabMD+dSpt5NQezy+2IZbTN35tMrtYDIhkClVainQoqGeF+5unuEOlJzqt+8TBE6owPkkkm4c+AihO92yZ6c= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1762548300; c=relaxed/simple; bh=JykNP3Wr8V27V/V5mRXR63Vo77tMC6HLDGjlTMTwCO0=; h=From:Date:Subject:Content-Type:Message-Id:References:In-Reply-To: To:Cc:MIME-Version; b=GdGAarw/JUSJUQIGppQHpPqRkrHkPiqJpqwhGVvL6d0TrYZS6B4VQQ3DLWnDTpKiU9bV6gqt+hLhmij+yTwEfNI38W4lOHWxCjkD4x0X+IolTHywPO/aWMqAnWphLH1ug+sQRiE/RoNTr+q8iekFF7VnZPuPkVC3/O0bwbXwoI0= 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=dir7cBtj; arc=fail smtp.client-ip=40.107.130.9 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="dir7cBtj" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=w58uSFWElDmA65eMEUtzy4kLA7/iiR58BsuLQkjEVKNkX6VKBmNG3zzIpqhcsGo1/tlLT2qEw7wmTkSfrBuHJFy0P/1hQhYsVnPmEaht+o79VAxrfGuhUt2zMrB2Sco1lrDbJYfAwS8gj+8h5DiMe8OXvftIlXDngXCSnVpOI9uyaspPJSLsd3Gxk/I29NS38R5qIyIoZmYgGmh1p8BpEcTgR9T6FAej+m3KRBJkqpMUOr798lRlhSM1/h9oPjgJ7HF6p3sdCOr43IF3iJErlj2s/jX6EfweKl0smfXK3X+QYWD+i9FO0ueQS2Bk/u6VC8jDPGb/tQG+cW2c5k8vEg== 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=16r7ZGQxZ/iSnep82FApZjOgA5LJ98oPP+SxebBXSDM=; b=f5XgqEYDO3hM698dZf26AsH3+mjIcCQbXPo/7w4OpE8xEbXXcJ6KK29oGiEMfMoffto1iRYiQFMH5usIPcVAMdz5ohur9MdyKYwup2+VXtk43HGtrRLwK+zRdby9dhGSLiF7gT5bsITzop2UXNU3GTi5eMLJY2UCYeGHXabk4Aw572S2eU1K53f2aunevEvmHzoh8brHGjIoyaR9/kez7n9D+Y1EVFHBwL20Ucsdf53JyjgzGCMtmnxAcrSyq7Gtmv4joFMgJAuQsjmrIVwCT/y+WiHoH8aTbw+I94j/Nz34oBdbvyW4KIBR6Nyv4aTEFMqGO62mivVTIV8/J6Ct+A== 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=16r7ZGQxZ/iSnep82FApZjOgA5LJ98oPP+SxebBXSDM=; b=dir7cBtjACvJw5l3Mk36DeqDkwilND6nJeIzZt/Jm+YEePSzsA5U3DCo6MWJ2N0RtO36v5u4ICbv19T8x5BDEaq1ZbVuKNjCq/cgOLz+tfbY8NYZ1tFPKpa+9IUHa13nTDh6mYUrezZPUnOWCrfVpmSrRLQecoSrehOlO1rKiaAeB+1OhkM5p1ek1XmsRp4/T3MH7fs4bVcrBWpmRggXGJ2WxAy8v2GYCZzlwsNCjGQPhruG9RYJwGAE01bjOb4hjTuPrrOyhFhpjC5OIn22H18GRox43lZlP5Bd/rAag0d4JjoQfI6yigAoJT/r40EkgTJwoPd496DCW0+xZA9uAw== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nxp.com; Received: from DB9PR04MB9626.eurprd04.prod.outlook.com (2603:10a6:10:309::18) by GV2PR04MB12021.eurprd04.prod.outlook.com (2603:10a6:150:301::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9298.12; Fri, 7 Nov 2025 20:44:56 +0000 Received: from DB9PR04MB9626.eurprd04.prod.outlook.com ([fe80::55ef:fa41:b021:b5dd]) by DB9PR04MB9626.eurprd04.prod.outlook.com ([fe80::55ef:fa41:b021:b5dd%4]) with mapi id 15.20.9298.012; Fri, 7 Nov 2025 20:44:56 +0000 From: Frank Li Date: Fri, 07 Nov 2025 15:44:33 -0500 Subject: [PATCH 2/6] media: staging: media: imx6-mipi-csi2: use devm_add_action_or_reset() to simplify code Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20251107-stage-csi2-cleanup-v1-2-5d42535243ac@nxp.com> References: <20251107-stage-csi2-cleanup-v1-0-5d42535243ac@nxp.com> In-Reply-To: <20251107-stage-csi2-cleanup-v1-0-5d42535243ac@nxp.com> To: Steve Longerbeam , Philipp Zabel , Mauro Carvalho Chehab , Greg Kroah-Hartman , Shawn Guo , Sascha Hauer , Pengutronix Kernel Team , Fabio Estevam Cc: imx@lists.linux.dev, linux-media@vger.kernel.org, linux-staging@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=1762548279; l=1965; i=Frank.Li@nxp.com; s=20240130; h=from:subject:message-id; bh=JykNP3Wr8V27V/V5mRXR63Vo77tMC6HLDGjlTMTwCO0=; b=oNLlP0Y+VAg8r81OdXpXfX3//eabnPnnkEJwul/uYcCW8VZrnVzDyp7MblrDG4GL3NQi0rTWl 7T0npOTMTcaAJjbSYEYN7zrztwAALwd21AEraQVeg0QfMHmQw5Wmbcw X-Developer-Key: i=Frank.Li@nxp.com; a=ed25519; pk=I0L1sDUfPxpAkRvPKy7MdauTuSENRq+DnA+G4qcS94Q= X-ClientProxiedBy: SJ0PR03CA0332.namprd03.prod.outlook.com (2603:10b6:a03:39c::7) To PAXSPRMB0053.eurprd04.prod.outlook.com (2603:10a6:102:23f::21) 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: DB9PR04MB9626:EE_|GV2PR04MB12021:EE_ X-MS-Office365-Filtering-Correlation-Id: 87890862-c151-481a-ade9-08de1e3e8228 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|366016|19092799006|52116014|7416014|376014|38350700014; X-Microsoft-Antispam-Message-Info: =?utf-8?B?M29WaCtZcERjNXhoelNHUVBEZlRXZmI0dGJaYlJkSFVianlPek9aVHFqZHVn?= =?utf-8?B?dFAyeHlOaENmMlIwTFA2cnNuQkRrUHBjdVcwM1lMSVU1Ym5sNHRaNExobHg4?= =?utf-8?B?YlVPeTBETFpHeVBObDhDd3ZaaHpSbTE5WlJSVnlZYTdLeFowcnNHNlBlU21U?= =?utf-8?B?dU12TXB6b1FwQ2l0T3laS0hiRllLZzVHU2ZiZEtmZXczRk1VM1RwOGdNQ3Ns?= =?utf-8?B?WmxXNjVMU0RlMzVNRzhrU0I0UmtRZE9YTjUxRUZ4WEJvd25FU0RBMGJ2TlBR?= =?utf-8?B?dDZXWUdCakZEcnhmeWkyZDh2RUNDMERBRllNYWFHdkJLWWI2QkZJTDhkd1Fl?= =?utf-8?B?Z09Ed3lXVlY4SmVFZklPTUt2ekg5bm9mbnpSZy91N1VwcGNWd2dPSDlMUHFu?= =?utf-8?B?SDZ0RmpuZnFiUkxBbWNIM2FQNVNSWTR2NTJFSnpBSlBna0p1b2dna25CU3V2?= =?utf-8?B?VjVlcCtKZlhIT1cyK2l0c01Ya1dqT2JPT1NkMEUvNStUZ3I0b2VOUlp2c0pa?= =?utf-8?B?QXZjelQvdkFjTVYrbXRXOVNrZnQ2ckhFMHRlMXNTWHRLcmFINnhpSnZNbzN5?= =?utf-8?B?QjU2V3RKanpqVGlKSGVwU0RhZWpZOVNydDBpdjZuUFpQVmM2VEFvVU5aQUpO?= =?utf-8?B?aFFDT08rcTd4d0wyVFg4ZmtHb2dISlJWUzRHQnVVbGs3bEtmM2xYRWx3d0wz?= =?utf-8?B?YWgyZlNiMGlTUW1KamJZZUpVb2hLY2hPMTBwa1pXMHJnbXFramNobEswQUtS?= =?utf-8?B?TkNJQ3A3Si9oVGZkVTVTWm9aeGhyOFBnaFZmR1FCR2VjUDdwWm9GTGJhejhV?= =?utf-8?B?Mjd5QzJoSWdYVmlLWXhySG5pQzk5NEpPYjRrZENETTRhT04yTWt4dVJFU0ta?= =?utf-8?B?Q3JOY1dkVHR3bm12U1ZST2tpSXlmMnUrUW55RXQ0YnIrY2RxWGNSQ2h3ZDMx?= =?utf-8?B?VDlTQWp6aDZvOXNKeEpzc25SaGxMM2ZkN091a1N6SG5tYmdRYlhDMVJ4V2Zp?= =?utf-8?B?Y2FiRDN4WEFjTkdiSlgzelJienNDN2ZqTW53ZjVuUk1DNVhwMG5SVUxSZTJa?= =?utf-8?B?T0JpYUVFUkJINHZNRm03SUlIdjJOZFBnZnJ0eGlJcGFoMjJuNGlSdEMrbDB5?= =?utf-8?B?eFdNUUpEZ3QyNkg1Tmk1d2dRekRsV2x3Tk14VFBMQlZqRVlVWWFDRnI2ZlFT?= =?utf-8?B?Z004Rk5xS1ZnV2Ixekxrc3pPY3d0MlpyZzFZa3MrRnVEUHJzcDZ5ejVjNU1i?= =?utf-8?B?aTRSNHFkMkUxenJSS2tlTXc3cFdpUVpCYUZWL3pYNk5UOGlJc1E2N1c2SWQx?= =?utf-8?B?ZXdXRzlPMjFaRFJzN0NMMUQyUWR4dTQyNUUyejU2TFVveU9yRjIyNnpQUW51?= =?utf-8?B?bmJqRkxHY3NjSFRBOVk3REE1T1J4dWZudWtWdE4zeGNPZXpRWnQ5bE8wSFk1?= =?utf-8?B?dkJudGhBUVpDVzBoNlFJRHFYN2l0QUFibTI4QW1paDkxZ0I0akhOKzM3RFV3?= =?utf-8?B?eGUraHp6SndNam9VR3Vsc0hwemRDSTdTdjdJTUxCeTZidVFNTk8va0ZtdC9M?= =?utf-8?B?WGM3N1YxNWFiMGV4ZWN3S1MrK1VaV3IxVVVTd0dzeTVDMVBqN1BPLzdmMUlH?= =?utf-8?B?M2pQaFlUVnZBc0ZaVDJjY0xwZ1FmTnlHNzMxRFRRWjlnMlhuU2FvM3NUeU1l?= =?utf-8?B?UTM2SG9mdW5ZdVVTM0N0VlhPcFo3Sk5vdnFLamJYR0NHZS9rZzhzT2UwSkVU?= =?utf-8?B?NHNyWVB1MkhlSlREeENORzViTzAwaVQwY3VSYTFJL2Nra1hKOTAxakVmUDBI?= =?utf-8?B?dGxURVdoK0dUTEI1YzV1L1N6MVVSa2UzVkpzUytxckJzcHFoSVlMY2ZjdzdT?= =?utf-8?B?VWxCaE0xZU5rYmlPZjZ1bkxGYzlTa21SOHhUNHlqZTBRbjBSY1A0S2hjYUtE?= =?utf-8?B?aHU4YWxjYWdlaDBXaG96N05qUlZ0S3kwa3U3RHJkc3Iwa2FPM2FYd0VvSkIx?= =?utf-8?B?ZkVHT1dvVTcyTW5zZ2dpMzdmS0Rjc21WcG03SGRETWVWaytNVk9jZi95dWNU?= =?utf-8?Q?wkAnhZ?= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DB9PR04MB9626.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(1800799024)(366016)(19092799006)(52116014)(7416014)(376014)(38350700014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?UGlhNGxLVit5Q3U3cGRSc3BVWmpWZ044K1Ywek1FeFV5SVc0eUU5MUpOUkdV?= =?utf-8?B?WGhYd1Y5ZnJlRWlLajRPVU1zU0tIb0JjZm9oTlZydVdwY0pTdDAxeldWbkRJ?= =?utf-8?B?OEVoODk5czFCUjNxayt5U3A2QytBNXFTa1BrZzM5dnYyMnpaRzVybkNiWUFn?= =?utf-8?B?cVFqQUdnWW1qdjhod0hjckxhbkpEOUl0OTRGeHBzUno0OU1CR0ZUY0o2R3g3?= =?utf-8?B?Z1dIOGsyYjBNTzYvWFhBQVEyYWRGQTF4RTFVN1J2Y1BMY1BhdUY0VjI4Y1Az?= =?utf-8?B?L2xsTlhKWkFVbWUxczdIQjdYaHZrOVJoSmNkU0hWL1NtWmFqaWxUcGMyZUpK?= =?utf-8?B?c2dFZTRLdStUSzRjVThlUXpWL3FKaHJIWE5hRzlFcUJKd1RUcDZYbTdZT3Bj?= =?utf-8?B?Zk5Fa01LMEsydGF4WUR3dVM5d01McEQ2NHhjUzBGYlhxYS82TjRRVDRIWDcr?= =?utf-8?B?RDJOSllKREY0b3ZOM1RHRWsvVkVmUzI4SlNDZy85M08vUUxrMkVmUUlaem1M?= =?utf-8?B?N2pZR1AvdHYxMEJlSnRhMmxiR2Z6M2F5N0liU01ranZGYll5bk9JOHMvT1lS?= =?utf-8?B?Wll1ZlkwNmVUeGRnOEkzUzRzVXR0SlpBZnRNU3lEUGZSRjNiS1BPRVlLbUlm?= =?utf-8?B?MkRYc0JHV3RrMEtQS0l2UFV0L3BmaERac2RKMnU2L0hoMk1QZEFGWE8rbjZ6?= =?utf-8?B?Nk1Mc09kYk1WSlNDU3hMQmdlekl6c3FjNDBidndnZll2cmUvaDFFUGhkbk9t?= =?utf-8?B?elpzL3FxS1dwcGVtamhjbmpHMGo0TTJBd2FaRUI5TS83ZUIrcVN2Z0pnU1li?= =?utf-8?B?NmNlMW5aVlZYM1F6ZmFmV3BYZmpzQmoweEdUR2lUL3J2VTNkSDNSR1dZUHZ4?= =?utf-8?B?UlVBWVVpVXN5UDZpd0dzWXh1MWdUSmI4N0ljTFRxTEZvU29aaWMxNWlrdm9S?= =?utf-8?B?bUdySldnRUdkNS9VcmpkL1FKZ0VsVWpISitwZGNBYkJUWUl4dStWK2EvOE95?= =?utf-8?B?bUNmOWl5eXdmVUtrbVF0MVdwc0E5NHBXMnd6OU12NWYvQ3VvR2JENmRHbnlw?= =?utf-8?B?bDJvZnYwZkxqQm5vdWZMTDZKemUvRVk3aFI3NCs0R3F2WEJOVUNuSzYzcXVu?= =?utf-8?B?R1ErTEIrVjM3NVdHWlF4QjdpazAveC9hYW85Y1pNc01HSzFZUTY5UXJNL0VR?= =?utf-8?B?bHBXSTR5ZlFKUU5taG00NE94ME1Hc1hwTnRRWWdmWU9MQ2l4bm1zMW8xcTZx?= =?utf-8?B?ZVd1U2hLWWFVRUpCU3puVWViL1RoSmZaRTV5ZHRELzhFTmVHbW1MZE9vWDBy?= =?utf-8?B?amVPeGxWZGpQYkV4RXNGanNmT3JvUkZ0QktzL0hYN1lNQzZXWFhCVFJzb3RE?= =?utf-8?B?Wis0YjFnOWVQY1o4bEM3WkpSajV2YjRvUC9KYURUb1R2cXdURkw5N3pQR1kw?= =?utf-8?B?SnVMNXZkNlh5QlpQN1JNc0lGOUtIMUxDbXdwUTFsN1gwZkxsVVN2UWtjMGdS?= =?utf-8?B?MTRKSUFmM0hZRWdQa3Q2bW41Q05Yek4yUnFFc25DbjlmR1V1MXpjN012VWta?= =?utf-8?B?TXpoNXU5eSt0VDJURmd2UER6bmRXY1F1TTNBemNENU1zWmhoVGp4RzRWYWdN?= =?utf-8?B?aDQ2K1h1R1daNUU1dUxSdG1xaXNPRFpCWHJkcFdzd0hKaHIzelhzV0VMWlFE?= =?utf-8?B?NG5VY1NVODZNUVNTTVBWSUFJQzcyUFBlc3lGby9Ua3V4VHo4alIvWGh4TDA4?= =?utf-8?B?QUVxZTRjaW0zN2t2UzBIUXVIc1IxYXNxTmdnNUkvUTlVMUNGWjl3NmQ1SVhR?= =?utf-8?B?VURBSXNyNjhTam5YUmdkcFBydTZ2NDBXcS8xeWFmZ0ZzelEyOXVNbEFFNFVN?= =?utf-8?B?NTB0ejljeW5UcGtrTHZ0cjNNWERtd3hwOXlScjlycjNpUjd3SFVQLzNYRkE1?= =?utf-8?B?eS96V0F5ajJUMTFJeUgwL3hYZDBYR3VwWTczRDUzUW9JVTZ6eWYxdnpMVFI2?= =?utf-8?B?amYrY2FSSWhieVdjeVhGNmhvSHRNZWVJd1pOa2R6bytnTm5kQnJRQ3BwZE5S?= =?utf-8?B?aTNpNm1yYzRET1FnbysvWFd3a2tncDFWY1I5M2U3NCs1cDFWelBta1FWT2lh?= =?utf-8?Q?tFnA=3D?= X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 87890862-c151-481a-ade9-08de1e3e8228 X-MS-Exchange-CrossTenant-AuthSource: PAXSPRMB0053.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Nov 2025 20:44:56.1063 (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: V97qOTKLDcwI3QDwzRy0/59QuvpIZLlfGWUEcKp5NKLjolmZgBDajU0D+N+tc2ggbPTmVQHoIZW8wfUzNMmH1Q== X-MS-Exchange-Transport-CrossTenantHeadersStamped: GV2PR04MB12021 Use devm_add_action_or_reset() to simplify the code. No functional change. Signed-off-by: Frank Li --- drivers/staging/media/imx/imx6-mipi-csi2.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/drivers/staging/media/imx/imx6-mipi-csi2.c b/drivers/staging/m= edia/imx/imx6-mipi-csi2.c index 42256441b881d9f132ad7ff899d6f1e35643b4ac..eba9a650030f5e380aa900b9472= 8ad375171c6a5 100644 --- a/drivers/staging/media/imx/imx6-mipi-csi2.c +++ b/drivers/staging/media/imx/imx6-mipi-csi2.c @@ -716,6 +716,14 @@ static int csi2_async_register(struct csi2_dev *csi2) return ret; } =20 +static void csi2_nf_cleanup(void *data) +{ + struct csi2_dev *csi2 =3D data; + + v4l2_async_nf_unregister(&csi2->notifier); + v4l2_async_nf_cleanup(&csi2->notifier); +} + static int csi2_probe(struct platform_device *pdev) { struct csi2_dev *csi2; @@ -749,6 +757,10 @@ static int csi2_probe(struct platform_device *pdev) if (ret) return ret; =20 + ret =3D devm_add_action_or_reset(&pdev->dev, csi2_nf_cleanup, csi2); + if (ret) + return ret; + csi2->pllref_clk =3D devm_clk_get(&pdev->dev, "ref"); if (IS_ERR(csi2->pllref_clk)) { v4l2_err(&csi2->sd, "failed to get pll reference clock\n"); @@ -800,8 +812,6 @@ static int csi2_probe(struct platform_device *pdev) return 0; =20 clean_notifier: - v4l2_async_nf_unregister(&csi2->notifier); - v4l2_async_nf_cleanup(&csi2->notifier); clk_disable_unprepare(csi2->dphy_clk); pllref_off: clk_disable_unprepare(csi2->pllref_clk); @@ -815,8 +825,6 @@ static void csi2_remove(struct platform_device *pdev) struct v4l2_subdev *sd =3D platform_get_drvdata(pdev); struct csi2_dev *csi2 =3D sd_to_dev(sd); =20 - v4l2_async_nf_unregister(&csi2->notifier); - v4l2_async_nf_cleanup(&csi2->notifier); v4l2_async_unregister_subdev(sd); clk_disable_unprepare(csi2->dphy_clk); clk_disable_unprepare(csi2->pllref_clk); --=20 2.34.1 From nobody Sun Feb 8 18:08:46 2026 Received: from DB3PR0202CU003.outbound.protection.outlook.com (mail-northeuropeazon11010039.outbound.protection.outlook.com [52.101.84.39]) (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 062D031A7FA; Fri, 7 Nov 2025 20:45:02 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.84.39 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1762548305; cv=fail; b=Zd+fA15yKqe6TzQLSAuLZBE0ls7H1ch3aQmmPf/a4gpZ0CvaRrIqASVNNLpegvU7EmVw0ojI84Zb0SNKFK8SQZCKCOlbS6ArEb0CffCQ5WyBnDW0WwCSHIBcp1GaXMICyat5TbpuQvAyVwQdU6Qk0qJBICjurfil/yv4qh6ozl8= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1762548305; c=relaxed/simple; bh=R7ovjweknMT1smYhNfW+CkGH+ciRJsLBhqOQFmBU/7A=; h=From:Date:Subject:Content-Type:Message-Id:References:In-Reply-To: To:Cc:MIME-Version; b=c5drmqTEJliv4HtuR1qeatB5ult+jZCXfrRTwiyKGDUt6dRAGWAZi3nA2muI5LRMvY2LIRL1gQOS9FubsknCs5caxk7SpP1p4GlccvKtw8BBiW1iDSctQxmhW2+O+wZMQpjlmt6rMaDkUUFtGDhWDXSWazQunVBu17VFn/zIx3M= 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=ANxGoV1m; arc=fail smtp.client-ip=52.101.84.39 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="ANxGoV1m" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=LYOxeXaT5DAUQ6YO9jSSObgZMsNldnzqlfx5RuPo2XTcX1jmHVpeOYtNVyk6jmBmBhHNkSQbcRt6FdtXg+dh3r94ANzkcsgvwWCJOCOkGZJcY4SNv4uV0EzjprtrSvk96X89zoXlrgaN18sPICugLwwDTaDTPIVDxWpiB2W+lCy3poNxf9FeXN+7AIjV6NZgbOJmQumvj3JPgEhZ/wstazKNYwALyRF/DLTJtsPU/F3a9X9x1odQxR34O/6hbFx4hA9G4jtp2JRxXB2TQe86WVujrhAwL9/6JvZLSgYZ3Xm5JxZuLRud36wkIPMLaTw2GA7gN7OPUtWvNW8V9YW8/g== 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=P3YW1+agbB9Z7ADXl0RJ9xibS1sjbATtsscLVMQ5EmU=; b=ONx68/kAhhV2OJEGIlV0WiFc5JIX9v/8DPnJ0DE2+OD2WRcx/g/mqJ9PUKNnKUefxGS7hZKoEQ/VKYJ4Y75/S3qMiW/xlhsmlMjFoLWUOuMLHn2ud+1C4TGUkGxOFgRkGoleOckSLqEeOVSA7gyRrPsjh8Vlv/2nyz6pNU8q/d9JXgrCmd3E2EyorxTvTppie11lRExy908TC/lQc10K1GfXAe7yELB1s59jEe1QZriVUCIVvFN46mk+xeMpRRcL9LEJnXvsKz+7nKwqsYxpgVfLAPzyh+gZ2RporxouRRmcwZE4ped/bAS3rZxOongU3T2rhUkDGk/wk5v9jCzRQg== 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=P3YW1+agbB9Z7ADXl0RJ9xibS1sjbATtsscLVMQ5EmU=; b=ANxGoV1mosJo9LR2/6oXSMCGxRM6drNac2yO0fGHLxFozk0HHpe12cHzJBhnO3S0baW1IoWajhx42S9ooOlX3K6DnPqVbVoOi3hlHgyuQDJoR9fPcPKHuxHaRsTF7u0bLODwBd+gdgMWFD/tk8xJW7LKWeibOJMnUCkFMQfY0eHoEOZfXPd1/M7XqIaQ0YiEfWk4JUXNjvO4uL+HAtS+caN8OZDGgtXHAlVaOdxil4kE/4VYUvER/FAz02bl96kq87MmJVU28s9Bd5m13yRs7fa0d92rLJxSWp6dZkj1fgNj7TwcnC+Fcp61vqnSOx97STlUmyNyMbysPZlwWjLRIQ== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nxp.com; Received: from DB9PR04MB9626.eurprd04.prod.outlook.com (2603:10a6:10:309::18) by GV2PR04MB12021.eurprd04.prod.outlook.com (2603:10a6:150:301::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9298.12; Fri, 7 Nov 2025 20:45:00 +0000 Received: from DB9PR04MB9626.eurprd04.prod.outlook.com ([fe80::55ef:fa41:b021:b5dd]) by DB9PR04MB9626.eurprd04.prod.outlook.com ([fe80::55ef:fa41:b021:b5dd%4]) with mapi id 15.20.9298.012; Fri, 7 Nov 2025 20:45:00 +0000 From: Frank Li Date: Fri, 07 Nov 2025 15:44:34 -0500 Subject: [PATCH 3/6] media: staging: media: imx6-mipi-csi2: use devm_clk_bulk_get_all() to fetch clocks Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20251107-stage-csi2-cleanup-v1-3-5d42535243ac@nxp.com> References: <20251107-stage-csi2-cleanup-v1-0-5d42535243ac@nxp.com> In-Reply-To: <20251107-stage-csi2-cleanup-v1-0-5d42535243ac@nxp.com> To: Steve Longerbeam , Philipp Zabel , Mauro Carvalho Chehab , Greg Kroah-Hartman , Shawn Guo , Sascha Hauer , Pengutronix Kernel Team , Fabio Estevam Cc: imx@lists.linux.dev, linux-media@vger.kernel.org, linux-staging@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=1762548279; l=3997; i=Frank.Li@nxp.com; s=20240130; h=from:subject:message-id; bh=R7ovjweknMT1smYhNfW+CkGH+ciRJsLBhqOQFmBU/7A=; b=dlhqvFkSFRyho+L3huwEMNvdPuL7wWdlrpWjRFQUuPmhxWCcctAG61wv6Sr4IrnW7UY2h7vjX uhHMnKLwvnlAW+IHA7Lg9wIsbvFILRdYkQ7KtlZ43n6N/4TvjKIai6p X-Developer-Key: i=Frank.Li@nxp.com; a=ed25519; pk=I0L1sDUfPxpAkRvPKy7MdauTuSENRq+DnA+G4qcS94Q= X-ClientProxiedBy: SJ0PR03CA0332.namprd03.prod.outlook.com (2603:10b6:a03:39c::7) To PAXSPRMB0053.eurprd04.prod.outlook.com (2603:10a6:102:23f::21) 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: DB9PR04MB9626:EE_|GV2PR04MB12021:EE_ X-MS-Office365-Filtering-Correlation-Id: e9a1e571-bbe2-44a4-e19c-08de1e3e84e2 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|366016|19092799006|52116014|7416014|376014|38350700014; X-Microsoft-Antispam-Message-Info: =?utf-8?B?N0pod3hsSGdnQjJqOGdTbHNhMGk0ZUFmclpXUC9GSHpZWkZqQmtDRzNpa1JC?= =?utf-8?B?NGI1RzdrL2NoR0ZuU3R0UHFRSE9IZU9xaHBidkhOTWVQbjg5aEV4SUZaSmh3?= =?utf-8?B?dlUxR0dRcWVKcGo4b0hSbnpTSjBCWitRWWJ3cTgrWWIxRnVoeDNwcGQxbGp4?= =?utf-8?B?RWRhNHdyQ0VqOE9ON25vU2NZT0g4Uk1HNXRSNzc0VmpOV24vbWZGSU0vTlpv?= =?utf-8?B?Z2VBTm5rTEZRSHBjNjh3WVI4YjJacjZ5WUprZE9GZnhvamFBZys2VHlYNTBZ?= =?utf-8?B?N1RGYnFuZGJ3aEozcW5zcHlVeVErcXIwbUNCSmhWY3kvTytxaVEwWk05d1hT?= =?utf-8?B?ZVNQU2JNb2VvVGNMQy96T2NyZ25XODNnVVZQbXhTQjNXK2p4K21OWmlQTXZ5?= =?utf-8?B?U2pCVWJ0Qm04Z2JkM1F0dmFKRnB3OTg1VFduV3NuaDZjTHJtbDdlT0p2VXV1?= =?utf-8?B?UUFvZU1LZncxTGo3Lyt6emxaandEM0JXMndYVVYvcTB5RDdoUW9kWWt3YVJs?= =?utf-8?B?UU5jL0ZGNzV5Y29TR2ZmVGozZXlSNVZDZkZRT2h1Q2tYcHNDbHM0UEpFMXpk?= =?utf-8?B?TmlLc2NrVWxuYktEYWVHTlQzajc0N29mS0lYSjJiSkdJTFhJT1RrQURxemdr?= =?utf-8?B?R0xXYWFIc29peTBIWGJZWHJ6UFlWaytjajJtcHdKeTNmc0JXRlRMc3V2Risy?= =?utf-8?B?U1AybGMzb3ZnaC9EVTV5ejZqaXdaaThiOEN4L2xLdldUVlM0d3Bodm00V01Z?= =?utf-8?B?dDdlNi9XMlUvd25weTQ2R01zeWxjaExmK0FmUEg0dGVQMzYrV0FsWnRtLzVQ?= =?utf-8?B?SHd1MFMvV3dwLzQ4UDlTSmN1VnhWOENKeCtoL3Z0RlhpeTd4TFVqNmQ5VHlw?= =?utf-8?B?RkloOWlmdlYxTis5eFdWN2taWUR0WWJUUktTYkdya2JtUytrYnBBNTduaGpo?= =?utf-8?B?NkpaL0xOSWV6K3F1NlR5c2NWRkQ3aFRRTnZBZUFMZ20yMDZNTTdzaU9pd1I2?= =?utf-8?B?cTBBR3I3bTBVM1BTTUtvVkZreHZvM25LWldpMEh6b2I1aUwydGh5aEJiVkJm?= =?utf-8?B?anJxb1FlTkd2SGlnU2c4bW01OHJjM3hHdTZZaklrVjlhdGFaaTNabEUrdjBE?= =?utf-8?B?Zlc3bUZpeEExcHVHYjkvOCs5T1BtakRMOHNwLzQzblQ0VElkUG1GYlgxc2Nr?= =?utf-8?B?RDJqaHRVZHQ1OWEwTjNyU0F2QU52K0NTbWpwMXJ4N3dEcit6SUI5NTBkTXNU?= =?utf-8?B?U2MwQnh1YUkweDVhZjhQWGVkWG5qZnhacWQ3dGZ2YjRjSDBwWWdCMjFKV0o0?= =?utf-8?B?dytTUTR2RnNMdWIwS0MyOXU2RHFxcEtmS1dnSG5xbGp5ZTRXak5wRkUvaG9w?= =?utf-8?B?Uy9nb3ZmcjJlVVFYelRMUDBGbkpJMkJZY0hab2NGelltbHk4UWhXTzFNYmpT?= =?utf-8?B?SXcyNE50c1RpVGhOZWJwSUZHVHUzLzRrcUpxdzZ0VXd0OFJQZzU3MEhDaGtJ?= =?utf-8?B?VytaaWJMRStYWnE5VDVFQ2RKcHZkcFViWEJuWGl1TWxHRWh2OU1pbFJkTGtm?= =?utf-8?B?T2VmS05qdEt3T2YyK0p2VHNGWEhTdk4zbGM0ejdia21FS0h0YVE2TGgwaTM5?= =?utf-8?B?UDBGRVhkUHpZY2Rmd1poV3o4TGlWQ09IdDFsL2dsL2JCY0ZtNzhpc1dWOVBR?= =?utf-8?B?ZncxeStyUXRhZVUwSlNFT2JDa2I3QU82NWlxeXdYMFdYVkIvTTB6amhpd3Q3?= =?utf-8?B?bkRsTC85Wm1mYXM5aXVEWlBVODJWUXNMQWZWYnY5MHdId25sczNVTkNCR1Rs?= =?utf-8?B?VUVDd3VoUjl3b2dLdEgyQXZTTU5kSVpLSHhzKzNELzVNa3U1OXRlL3R6Tk96?= =?utf-8?B?TXpsRjh5VFhWdHZ0SGFrR2xpNzJhems2OGlKb3UvWi8rNGdqNmpweU1KdS9E?= =?utf-8?B?NUVKeURXTVVuOXlnZ29PQkZKcFN5ai9wN0FTYUpkSFkrRFluUjRCL2JiUVdF?= =?utf-8?B?bVpYc2JCd2ptY2RRN3UyQU1rRXJ5ZGE5SUdBMXk5Sms2cnd6NkcwSWd6ZWlR?= =?utf-8?Q?UpXErC?= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DB9PR04MB9626.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(1800799024)(366016)(19092799006)(52116014)(7416014)(376014)(38350700014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?M1lnR0NFRjdFWXgvQ295aVFQaXkrKytYNlJwZ2FDMnFyNG5oci9ncmdNdXRF?= =?utf-8?B?MzRSZVcwWlhOd1pJQi8reFZIeTUwL01iaDQzWHAwbmpGbXBMajNKY09XTlNq?= =?utf-8?B?b1k0dnorS20reE42dTBBeHZnMUEwSlVzZUg3dVRMVWpzc1ovSE1MSWYvYXRN?= =?utf-8?B?RVdKSGFaSExMdC8zNVFlMFB3ZEhEMlJTZnRSS0FsMTI5YlJiVVlzMnhndU02?= =?utf-8?B?VnVzTzRRMWExbElHNGNFbG4zeDFHb0F4K3ZadVdycm05K2N1ajh4cHVxcm85?= =?utf-8?B?dmRVMTRBYk80ai9ncVdwRUpqeXEyaTViTjNJcW9YamhEaFVXQzlOcXJGc0s0?= =?utf-8?B?amJMaS9uTVdscjBYQTFpUzRnN2h2Y1FJWU1WTGxvQzZIY2Q0Mm1zbnVnZXBT?= =?utf-8?B?QmpnNkNtaVFPS3dkNmFVMy9kRVpKUlo0RUcxbTRTOUtqTEoxSFMzU2ExeDBH?= =?utf-8?B?NmVpcXFseDhaVFFzS29nMTVnWjQ5Wk1JLzNzUkNseVdYdWNWN1NjU3lTdW1M?= =?utf-8?B?bU5UYmNJSlJrRk4xRVdjMnkwWHlnU2U1Sjhmdy92YU9BUGpNckpKdnFsbW9l?= =?utf-8?B?VFZScFJTc29zN0VOdGV3RVJUUURENnlQVExjR01qWk54TlNFQmlKWnRhV1pu?= =?utf-8?B?WS9zc1R6b2VIcGQrQWtsclBTSTRRb1V4dGx4UU1UM1Z2V2ZFY2RRMzk3blZN?= =?utf-8?B?aGZhL1FBd1htYUpyV0NORzhJS2QvOHRPaXFSV3NwNlRtYmJ2YWl0NXdPSmJH?= =?utf-8?B?MlJab1doT2U0NmZZc2RzV2RSa3NjUitUUklyTS83Rng0b3paVEdoYU5YRUFs?= =?utf-8?B?Z3RtSjMwNEZGSTl2d0RodW5VL2Zld2xWSHhtYk1EWWl2b0lyUy9QMnZIbVBt?= =?utf-8?B?TUQyZDhzNmRmODFPZTNhT1VOSXdDN2hQNTNNZVJ1dldWOU1TdlJ2OVV4V0Va?= =?utf-8?B?SFJFYkhaVnErc0NjdWlEaUhGakYrZ2ZrWW5ydkMrNHpCczNRVlk3VWlQTFlx?= =?utf-8?B?eHZ4aUU1ZisxaDJ2OVk0R2JHc05laVNuSHJycXlEN0NPaTJxaG5MNVFjQUtx?= =?utf-8?B?M1pPQytlR050TytmVFc1VlJuVFQ4emJvaUdzRlRKUDEvZkdHYUxGYjNPNVlx?= =?utf-8?B?eDV4MDRqanJCRVNIWlVCTmZOKzBRbHNtNHNmM25xQ05laGZFTWdqSDRFdlNS?= =?utf-8?B?bEk1d1l6bVNTZ3piV1JQMUkwbTlLWjRENnVXKzZKYnFDYXh3V3ZnNFh4bCtZ?= =?utf-8?B?RitNbzc0SDBKU3QwNTJxZCtZc1lybklEOXlGUUNjcG9tMWYvc3pjMnZiMlEx?= =?utf-8?B?VktSSlJZWDBYWGF4MkJYZjgxWnJOeVhkcktmTHhaeEh5MEs0djhjNTFxNlAr?= =?utf-8?B?Yk1HT0pYVDFQNm1hb2RUY0h3blA5UU9mMWg3UEdwa1NGWE5ZSGNDZ0hPeFlH?= =?utf-8?B?SUxycnZKVGRjV2NRN1hJK0prNjg4TnZ5dHBYR1NYS2JJWVdyZ2gvaUhRL3JK?= =?utf-8?B?N0FUZjhqSFllVUF1YUhvV3pab1VmOE5FelRCWWw2d1EwaFpJSExIUTlITEkw?= =?utf-8?B?Mi96SThLNHJyQVpmZ0lBUUV4NkNJMkhFWFVXOEVNUzRhaUZ2cWJCR0xJNTVK?= =?utf-8?B?bFhmbjBGZW5xMTdvenROL1M5Q0xUWlgrTUMvbjhJTGdwaTVlL3g1ZVVza3JC?= =?utf-8?B?QlhZYjFGaG1ndkxkZWxRTUl2S1BWV3F2UVIrUjBVaVBqT2NPbzJQSmlpZ1hI?= =?utf-8?B?NHlTTDUvQUdSME5lMkt3a1dhOVdFcUxTaDY0c3NwOGd2U0pRc2haa05hNEpD?= =?utf-8?B?d3JLYkNBbG9iNE00R0Z1cUQrMjJIWkdxeGlRVzJUTHFvcDRycDE3dExycUNV?= =?utf-8?B?dTV6eDFreTZxWlFWQ3JvVkZBZlV6RlZHMU0xdlZPUXp0K1R5L001UzVkMzNP?= =?utf-8?B?aUNPZE9kRys4VDhweEhGS2UrRzJyckwrYUNMdjZYRWNFdmQ5YWR6TXhFUjRr?= =?utf-8?B?MHoxTk9nS2hrWFY0V2ZTdXkrcy9UUUhidVh2L0pQYmpzcmhLNWVkZmx0cDBP?= =?utf-8?B?OXBjc0w5ZysvZmFDUmQxd200ek5KTTVMWDlpZEpvQXE0OVhRNWQyeVVHMUVz?= =?utf-8?Q?v6IU=3D?= X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: e9a1e571-bbe2-44a4-e19c-08de1e3e84e2 X-MS-Exchange-CrossTenant-AuthSource: PAXSPRMB0053.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Nov 2025 20:45:00.5667 (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: cYoF0gLUu26BEk6bYELGA/HnxshWgeRZAJXNtHELWyGY72OO8IeNwUQvCeEQOJshdOBYpMNOGMTqQjrRZ5nksA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: GV2PR04MB12021 Use devm_clk_bulk_get_all_enabled() helper to simplify clock handling. Defer all clock prepare and enable to csi2_start(), which previous only enable pix clock here. Do that safely because there are not register access before csi2_start(). Signed-off-by: Frank Li --- drivers/staging/media/imx/imx6-mipi-csi2.c | 52 ++++++--------------------= ---- 1 file changed, 9 insertions(+), 43 deletions(-) diff --git a/drivers/staging/media/imx/imx6-mipi-csi2.c b/drivers/staging/m= edia/imx/imx6-mipi-csi2.c index eba9a650030f5e380aa900b94728ad375171c6a5..32ddcef7ec8535a44e121754bb6= 21c0d2e226369 100644 --- a/drivers/staging/media/imx/imx6-mipi-csi2.c +++ b/drivers/staging/media/imx/imx6-mipi-csi2.c @@ -39,11 +39,11 @@ struct csi2_dev { struct v4l2_subdev sd; struct v4l2_async_notifier notifier; struct media_pad pad[CSI2_NUM_PADS]; - struct clk *dphy_clk; - struct clk *pllref_clk; - struct clk *pix_clk; /* what is this? */ void __iomem *base; =20 + struct clk_bulk_data *clks; + int num_clks; + struct v4l2_subdev *remote; unsigned int remote_pad; unsigned short data_lanes; @@ -343,7 +343,7 @@ static int csi2_start(struct csi2_dev *csi2) unsigned int lanes; int ret; =20 - ret =3D clk_prepare_enable(csi2->pix_clk); + ret =3D clk_bulk_prepare_enable(csi2->num_clks, csi2->clks); if (ret) return ret; =20 @@ -390,7 +390,7 @@ static int csi2_start(struct csi2_dev *csi2) err_assert_reset: csi2_enable(csi2, false); err_disable_clk: - clk_disable_unprepare(csi2->pix_clk); + clk_bulk_disable_unprepare(csi2->num_clks, csi2->clks); return ret; } =20 @@ -401,7 +401,7 @@ static void csi2_stop(struct csi2_dev *csi2) v4l2_subdev_call(csi2->src_sd, video, post_streamoff); =20 csi2_enable(csi2, false); - clk_disable_unprepare(csi2->pix_clk); + clk_bulk_disable_unprepare(csi2->num_clks, csi2->clks); } =20 /* @@ -761,24 +761,6 @@ static int csi2_probe(struct platform_device *pdev) if (ret) return ret; =20 - csi2->pllref_clk =3D devm_clk_get(&pdev->dev, "ref"); - if (IS_ERR(csi2->pllref_clk)) { - v4l2_err(&csi2->sd, "failed to get pll reference clock\n"); - return PTR_ERR(csi2->pllref_clk); - } - - csi2->dphy_clk =3D devm_clk_get(&pdev->dev, "dphy"); - if (IS_ERR(csi2->dphy_clk)) { - v4l2_err(&csi2->sd, "failed to get dphy clock\n"); - return PTR_ERR(csi2->dphy_clk); - } - - csi2->pix_clk =3D devm_clk_get(&pdev->dev, "pix"); - if (IS_ERR(csi2->pix_clk)) { - v4l2_err(&csi2->sd, "failed to get pixel clock\n"); - return PTR_ERR(csi2->pix_clk); - } - res =3D platform_get_resource(pdev, IORESOURCE_MEM, 0); if (!res) { v4l2_err(&csi2->sd, "failed to get platform resources\n"); @@ -791,19 +773,9 @@ static int csi2_probe(struct platform_device *pdev) =20 mutex_init(&csi2->lock); =20 - ret =3D clk_prepare_enable(csi2->pllref_clk); - if (ret) { - v4l2_err(&csi2->sd, "failed to enable pllref_clk\n"); - goto rmmutex; - } - - ret =3D clk_prepare_enable(csi2->dphy_clk); - if (ret) { - v4l2_err(&csi2->sd, "failed to enable dphy_clk\n"); - goto pllref_off; - } - - platform_set_drvdata(pdev, &csi2->sd); + csi2->num_clks =3D devm_clk_bulk_get_all(&pdev->dev, &csi2->clks); + if (csi2->num_clks < 0) + return dev_err_probe(&pdev->dev, csi2->num_clks, "Failed to get clocks\n= "); =20 ret =3D csi2_async_register(csi2); if (ret) @@ -812,10 +784,6 @@ static int csi2_probe(struct platform_device *pdev) return 0; =20 clean_notifier: - clk_disable_unprepare(csi2->dphy_clk); -pllref_off: - clk_disable_unprepare(csi2->pllref_clk); -rmmutex: mutex_destroy(&csi2->lock); return ret; } @@ -826,8 +794,6 @@ static void csi2_remove(struct platform_device *pdev) struct csi2_dev *csi2 =3D sd_to_dev(sd); =20 v4l2_async_unregister_subdev(sd); - clk_disable_unprepare(csi2->dphy_clk); - clk_disable_unprepare(csi2->pllref_clk); mutex_destroy(&csi2->lock); media_entity_cleanup(&sd->entity); } --=20 2.34.1 From nobody Sun Feb 8 18:08:46 2026 Received: from OSPPR02CU001.outbound.protection.outlook.com (mail-norwayeastazon11013035.outbound.protection.outlook.com [40.107.159.35]) (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 3EBF530F7FE; Fri, 7 Nov 2025 20:45:07 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.159.35 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1762548310; cv=fail; b=m5/9xpaWlBElojCBBClW97RSNjP7FndMiy1JijtLB6ewulrSoPdbiDYe/WQ/Wou7R6sBBdLk90q9xd4L57KeXpEYGeQiqzXlSn3dLf/7/IDTdBXBkV5bQCnRtkk+JUY2X4nQqpLnbg/orZ552TXTvE4Kv+cf5FZT6JK3sstpf48= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1762548310; c=relaxed/simple; bh=Nx6m2kTz9MnGvT0LPTpNQlk+9kR/GrBRxiKGW1eySIc=; h=From:Date:Subject:Content-Type:Message-Id:References:In-Reply-To: To:Cc:MIME-Version; b=pcMuZscw1Jxpc7NiBcNPaBod/w1FQxpJt4N5mLNGsetw5wlkMlewTvv02rQSIQ46uSU4+Ktz+mBS2DSib9vW+rvrpySt5p5Fw0YYf1wVGACoOnUbgITZSw+K5yTUU2IU37/1wDtLf+sO4RhwgWlv9MxY5GVE4s+fWEatB3fkUQU= 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=kHDyJkNx; arc=fail smtp.client-ip=40.107.159.35 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="kHDyJkNx" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=Nfe3yyQfv6MQpmMfZr3TPGfad+OoYJ/sKJtVQV65+0xDy6X1Gh1sh+8JY1F1ZSZq+DwYQw0VL0ncCJyekUozQv368QjgtcYEVZTgqJ7a0BUiRzQ9jAlFIc0Qr7SVTN5es9H/gBfW3NY49wC576UMTVSNdW31zxixHMxTNLeouxy8k+BcH0lDuxajaEdH/t12T4WCAyhXjcO/zRwN0V5cOx/voYbEWenTGE9WTjYZtkBFSAZDGL20WRNJEazFyAg864EiLTlyS465Dds/5eKPl7o4rFeYuiPKVAoP+Ro0Lel0S7EzY7/svzHm0a3TZ4sVoXEOGIu9VXSHuwiBwUvM3g== 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=C2IfrSM34hUvUtXMsyqdeTNctH21ohqKZkLvLNQvb1s=; b=fnfDNQOixtoBaCr/yGe1IDnrA++9KYPKefnAhfbVpxyFCa6jtizDKaB8ZYJaOMHqWrDnUhYGJcyIsK2jqACkGAQBPD6FeUS4onNJ9B7uUE2Vqi0l2C2lWdipTxwDNXiYzCU+BmyFEYTL5qIS3WBzgmfjCAYCbgEjQifOlehVtkeIsYdY1iNDphznNnQhfaD0ouSpQcaad62miihEt+xUQ34059Qw4BSClxDCoZU9cbeuljWfc9XuZTq0IG1f+eFO2k8z0SzrQuXP0E/iQ1m0+z7VstitCm5EZliB7DpeAk7dnQ4i4SfLFGo22HXYK9PyWZOU0lI+jmenF782ZkvPNw== 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=C2IfrSM34hUvUtXMsyqdeTNctH21ohqKZkLvLNQvb1s=; b=kHDyJkNx5Uxw5WXwMgRxshHDhznlJdbovaNPc17X0jq0WCr3EjZOIx7KNmkI8Bdu5hVous/8z/xoEa2oX1tpQvyDbgJc/GKZiEYtiBZPRfOFg/Z3pSbYuMxvR8R/Oc7s74Z/5nIxS53I6e58MgBCsi0VEco+CqnnJzGgyvDFf5TCj1Vgea0nZ27eUBgfkke3GiFT01jFo/8acyWQt1nsyTkZQYCe6kpgyjs/IxOEsWkP3ryBPw7STCOiYZJrr1qt0if6jtbX+VXDWJgKyune/VLwzNL6rJsJG+GfoI1q7pF9FrF/VbrF27XA//GhAukNpAI+fMkrH9SbZTz8G4ZJ9w== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nxp.com; Received: from DB9PR04MB9626.eurprd04.prod.outlook.com (2603:10a6:10:309::18) by GV2PR04MB12021.eurprd04.prod.outlook.com (2603:10a6:150:301::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9298.12; Fri, 7 Nov 2025 20:45:05 +0000 Received: from DB9PR04MB9626.eurprd04.prod.outlook.com ([fe80::55ef:fa41:b021:b5dd]) by DB9PR04MB9626.eurprd04.prod.outlook.com ([fe80::55ef:fa41:b021:b5dd%4]) with mapi id 15.20.9298.012; Fri, 7 Nov 2025 20:45:05 +0000 From: Frank Li Date: Fri, 07 Nov 2025 15:44:35 -0500 Subject: [PATCH 4/6] media: staging: media: imx6-mipi-csi2: use devm_mutex_init() to simplify code Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20251107-stage-csi2-cleanup-v1-4-5d42535243ac@nxp.com> References: <20251107-stage-csi2-cleanup-v1-0-5d42535243ac@nxp.com> In-Reply-To: <20251107-stage-csi2-cleanup-v1-0-5d42535243ac@nxp.com> To: Steve Longerbeam , Philipp Zabel , Mauro Carvalho Chehab , Greg Kroah-Hartman , Shawn Guo , Sascha Hauer , Pengutronix Kernel Team , Fabio Estevam Cc: imx@lists.linux.dev, linux-media@vger.kernel.org, linux-staging@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=1762548279; l=1431; i=Frank.Li@nxp.com; s=20240130; h=from:subject:message-id; bh=Nx6m2kTz9MnGvT0LPTpNQlk+9kR/GrBRxiKGW1eySIc=; b=Rl23NE12mg5TTOHuZQ3JR1bZT2YiEs6192UFj/5Xn5xGP2jx+eciPMizvulal7TLi3DkTDjqM I206Gr2EIjED+/xMj2dSEYl/tiWJpvMJVx6kfFF6QDWDJcfqy1EhtzW X-Developer-Key: i=Frank.Li@nxp.com; a=ed25519; pk=I0L1sDUfPxpAkRvPKy7MdauTuSENRq+DnA+G4qcS94Q= X-ClientProxiedBy: SJ0PR03CA0332.namprd03.prod.outlook.com (2603:10b6:a03:39c::7) To PAXSPRMB0053.eurprd04.prod.outlook.com (2603:10a6:102:23f::21) 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: DB9PR04MB9626:EE_|GV2PR04MB12021:EE_ X-MS-Office365-Filtering-Correlation-Id: 2b63f99c-e0e7-42e4-0b8d-08de1e3e8781 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|366016|19092799006|52116014|7416014|376014|38350700014; X-Microsoft-Antispam-Message-Info: =?utf-8?B?UlpEVm9nQSt1RVB1OUdveHI4YmNoUU1wU2p0UWZmaC8zNDFZby8yM1RpSU05?= =?utf-8?B?cnVOTGc3dDJzRWRhc2ZPdStLeFhkQStGZXJsRGl5NDVoT2hFRWdZY3RtWnRh?= =?utf-8?B?ZWFkZ1o5L2JvS1ZoVVArR2YrbmFFbFRiOUFQK2E3SHJQM1N3azNDczFaTkZk?= =?utf-8?B?T1ZDRk9YWncwU1FsSFdkVy9sTUlJa1NYcXlORXg1YXQwSnR4L1NVK3c4aDJO?= =?utf-8?B?bkErdzN2S1RFNmJqNXFjcG9aRkNuWnRpdWFtcEtiZjJnTEtvNXordFYzbDVp?= =?utf-8?B?NGlCMzUrYlBiaFEwQ2JaN1I0VU12ZlhwNi8reVdPeXhncThDbWQvRjZEZEtJ?= =?utf-8?B?dFBKOVBUMTZMaEM3M1dPdFhITzVkUWFFU3p5dTI3Q3BucCtDRjZ2dUZzdExw?= =?utf-8?B?RWhmTGJUUTZlTlJvMnMvdkl5TDFsVWRPakdRMmFYN1dRS1FzUlBOcG5yNkRV?= =?utf-8?B?ZVhaOUxIU1NRSFZscjNoSldDeHRITkNOaUVuMXdVS3JCR0tmK2l5YlJtZ1ZC?= =?utf-8?B?RlA3bk4vbnVMZ1E3NkRrQlJPMHBYcWIvWXJXZU0weWZUbUpoVzFKd3BwUmtC?= =?utf-8?B?a3ZFS3h1OWVPOXVta2lQOHhPU3lWdVFFa0xtcXhvYjJHZTNrRm5zVTB5OEsz?= =?utf-8?B?cSt1RWFUVjNod2RjaGRvSzBXWGR4ODdVUEE2eFFjeVpieWFLT2pqeWdwQmYz?= =?utf-8?B?UHZvdUFhcGc1Z2Y0YjNuQlFzcmN6YzNCbUw3TDFSbkIwUGxMT0syMkhQMUJk?= =?utf-8?B?YzVjamJ5RmlrWm01VDUxQ1gzZ0loKy9Rc2xzeFpkVFA5SHBOWG95L1F0Ykx6?= =?utf-8?B?RXBKR21hM2VwVTA3NE9hSG0vWmJlbUxlUlRnMFJRVEFNdklXWVJpOU1NQzBZ?= =?utf-8?B?elFvU0NsSmxobkd1eEllTjJFN2c3UU9nYzdNLzYyL2RMalZvNUNYMGQ0cUor?= =?utf-8?B?c3R4aWM1WVZDNnp5RmJXa2RBMjUwRnFpaUs3VUdhbk1xMFVIUVNjWSt3ckx1?= =?utf-8?B?SCs0eUxHcFY0TytFam45S0VvOFI5QU9LdStCdTA1YnIrL25wbVdRQUNaeDJL?= =?utf-8?B?dXNJZS9PalR4emhBc3oxZzJ3U1lRd1lGemc0UzVmcElEd3lubXQwZ0FxNU00?= =?utf-8?B?K0JWL1dLVzNmaEphcmE1ZWNNZENDYlVoc3lSTzdYTXdYTlAvRE1nTHR1YXM3?= =?utf-8?B?TW9YdWpqR1B2NXVYa3dDQnJFRzg1eFZlRENqRWVyaU1LWnRra3Z2MlVHdGFO?= =?utf-8?B?MVF3UjVLMjkrNnduVjVTK2o0cHkrNTdUYnNHdkFva3V3YU5xeG51UkY2dFVI?= =?utf-8?B?TUl2eG5LbGwzYklPRWh3YUlHZktPQU5qaWJudXg4RTNtZ1dQaUZsZzdTUFhy?= =?utf-8?B?djdPZFRCeXlJZDlIdGRVSjN3bGMzWGdkRFhMZDNUbmIvaENIdnRoMU4zVHIx?= =?utf-8?B?b2VDcVFtTWFlbHBSYTR2aHhwOTRzWkw3S2xmM0J5VFFtWExReUZ2bm9aSHQ2?= =?utf-8?B?dWF2YUQyNTI3YVhmek8yMndBR3d2eXRWcGt0RGhYNFl5Y0pBRVZTSThOdXdK?= =?utf-8?B?TkQybUc0aC9SN3o4MmlQOTVXT3lJOXIyY2FQdG9PVUt4NkMzK3dDSnpjQWU0?= =?utf-8?B?TStqK3g3YTNmdnMxZytISXpDRXFsMi8xbks2VUIwdWM5akNGN0lpc1Jad21B?= =?utf-8?B?R2NZemNaTmlSTXE5eG1XbGNOV09raGNkU2Y0S1pLL1JDZm9QN0JBdE9Sb2pC?= =?utf-8?B?dVgrVzROYWU5L2tsT0V0R0FNWUlaUVhCeDFERFJnSU51bFBXZ3J3bHM1TWRt?= =?utf-8?B?M25vNlpITiswSVFBR0d2WXN5ZnNUWEphZGZTcU9JVGNBMkg0NmUzSnQ0Zkd2?= =?utf-8?B?Y2czQjIwR21xUER4ek9XQjNOS2R4TzR2TUdqeGtUbzVBWnNlYlN1Y0t3ZXlI?= =?utf-8?B?NktnbzY4d0haVTBRQ2NmNURHbEtnRVIvUHdJbjNPb2pYUlovY1Q2NXpCWmEy?= =?utf-8?B?eGsxRUtPd3pyZzUvZWNic3hIVUdtUEZMWmhlb2l4d0lDK2p1OGJCNDRSUmRh?= =?utf-8?Q?2I7iWa?= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DB9PR04MB9626.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(1800799024)(366016)(19092799006)(52116014)(7416014)(376014)(38350700014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?Q0wxTlN6Z2xidXkzR0FUVng2Nzd6L2o2OEVodm5qS0t5dWFQeUJONi9QVERU?= =?utf-8?B?aDhEb2Z1VkFZYzNGb2hxV1F3K3pob2wyZDIwcCs2R21tMzlNSmpVTFVQanRq?= =?utf-8?B?SHdhdTlEVnFTeWhLTks4eTFnK0VJanV0MXBnNThGanhXR2hWUTZPQ0ZGNWJw?= =?utf-8?B?TVp3S1dFWUoyYzFDY2VSQnAvTVd2RmNTcUU5R1BYOEwwM0YwcE9IZVE3RytQ?= =?utf-8?B?a0FyVmw2VkVqZFVmTEduSXlZaW1XZFM5QlRqMUJlRC9PRzJNVUIvdi9aVW9t?= =?utf-8?B?eGxzTzJmVExXbnNKT05zVCs1SzlETFF6RDg1SFhoQ1h6dC84blhNNU4xS0VW?= =?utf-8?B?cjJ4SFU4UWEyWmlLVXZFL1pTT2xlZi9ZSXJWbWQ3b3IxNUJnazQ0eUxhck1W?= =?utf-8?B?Z3A1N1dyQ3JQcExrN0tvMmlXQ04yb2twbUx6eWNDTHJzUGFuZThWRlpKdG0z?= =?utf-8?B?c3lOOHlIbmlwVlZDRmFEK0FaL0I0ZE5iYzFCQ2xITlFWelA3aEo5Zm9EaTUx?= =?utf-8?B?VTc0MEJPdlh3VGp5L1JGZnlLMEJtQm5SbStzR0RHZlpma3BZQmRSU3ZEem1n?= =?utf-8?B?bGlkRzRZWG84dFV3cDRlRlk1R01ybWdJRkhicEc2dEVJVFFrcGlnWG1HL2JF?= =?utf-8?B?Rm5aV2pCM1kwcFUzblVzbnRnMmlpTHExUWFHSmprOVRvNzdqNHpWTmR2eDQ2?= =?utf-8?B?SGVUUWpSbWZEdHF3d2k1ckVwTVNrNTF0UFNpWDQ3REZaNm9HTGp0VWdoOHV2?= =?utf-8?B?MmF6RGRYR0hOYWFyVHg3bklUQXVrdjFpaHZ6TlpOL3Fab0FrcGZEaUx6emJE?= =?utf-8?B?emROaEFodkNKU0dsRkI3a1owem4xZFRiVlh0c0tHYUI4TkZDVHV3VTVGTXEw?= =?utf-8?B?MC9qMDhVTVluc21zOFZmNDFlekVaVm1yd1gvN0V1VjJPa1BmYVl2SVdwcm45?= =?utf-8?B?QUR2bng2Mm0vQ1dabWMxWGtveTFXdEFhamZzbU9hRHhLQ0ZyQlNGTlNEeW5Y?= =?utf-8?B?bnRSMG9DTVI0N2lndURpUXYwb0lOTGpLSGRpR1NLLzZXRm84VjViWXlTOE8x?= =?utf-8?B?dnlTZ2xQdVg1a3M2bkRrZVI2emw5VEpuT3hWSW9xMlVONlhPTy9jU0ZtWDJp?= =?utf-8?B?L1BmWEZtUm5MSEVDRFFpcUtKTk5TT1RhZXJQbGtWa3lRNE5ROVBuZ3g1V3BC?= =?utf-8?B?dzJ5M1gyc2tzc3lrTXlmRVpycWdORWp5OURXVzlaQ2JYTGVGLzFSRVpNUVBy?= =?utf-8?B?R29LRXNnNUJXcE00TUUxbmc5WmhuR3ZJcUZTakhpZEV0dlg0Ny9SU3VET3Nm?= =?utf-8?B?QXpyMnVSK1NJeXA2cUFiaWorN3Q0SVY1d2Q1YXpyLzFVTEk5UDI5YWdKbXZK?= =?utf-8?B?UHZuRWRxRnc0dm5VQXp5bVJad3psMTc4R1dLcXA4ZXpOeEVyT2xpQXIrbWVS?= =?utf-8?B?RmhBQVdReWVWbTdsMzFhU2tUL01URU5yckNJWms5L0dFeGxMNC83MGhVc3hT?= =?utf-8?B?bFFOSzFyYWNDR3g2VkdUOWdGQkZhSGJWSmRDdkRYWlJQNi9GZ3dxN3pZQ2tC?= =?utf-8?B?MTM4dXNLRk9aR2Q3WnhZL08vQ0EzOTRDUjVXbk9nelFsWndBVUZkSDRGUnhB?= =?utf-8?B?N1RWWm5qM3g0TFpMTmdDMTlLdVJJeE9qczR1SlNNWWlRT1pLM1IzS2FjWjE0?= =?utf-8?B?dG1pWWZ3enVKQkRJa3dsemRCc3BMcFRqMnhVZFYwYTg5U1hFanNYYlBuek1S?= =?utf-8?B?QzRxcXM2MzVsK3p4RUg5WVIvK3h5K21CUjR4QmVTN29NaTc1YnN2Mzl1UXR1?= =?utf-8?B?b3RiNXJva2Y4OVM0YzBEY05DK09xRFM1NUNKb2l1Q1llNzcrdmt5aXdzVWQ5?= =?utf-8?B?ekNPWjF6bVY5eGphSFkyd0xrSVF0Y1hmbUtYQlFnVnRkZ1ZxVXV6SHU4TENu?= =?utf-8?B?UlIzbW4ycHdralFtbExxNDd3K1hDTGRvRzN2TSsxb3h0alNFemNUNzVvOWk2?= =?utf-8?B?cWQzWVFBdytUNXJyMVNSYU1TaVArcTNTZURQTFVBN0IrMEF2TXJrMDVrRzQw?= =?utf-8?B?bHN1b2NkU3FqUkk1eEpDQXg2RnZFYTFqc2p4QmhRblU5ejRYWW5jTXVkeGhT?= =?utf-8?Q?0CbM=3D?= X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 2b63f99c-e0e7-42e4-0b8d-08de1e3e8781 X-MS-Exchange-CrossTenant-AuthSource: PAXSPRMB0053.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Nov 2025 20:45:05.0933 (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: WbwcjHXuMZ8zx1MvIRXsOdUFWxb6hnP61N4keOTYdHZ0AYtB9YJjfcwVO+owj18PhIY+BOtXqG1W9f/McJ9/eQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: GV2PR04MB12021 Use devm_mutex_init() to simplify the code. No functional change. Signed-off-by: Frank Li Reviewed-by: Philipp Zabel --- drivers/staging/media/imx/imx6-mipi-csi2.c | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/drivers/staging/media/imx/imx6-mipi-csi2.c b/drivers/staging/m= edia/imx/imx6-mipi-csi2.c index 32ddcef7ec8535a44e121754bb621c0d2e226369..f8d0b3b8b250774af51f2aba731= e639131aceff9 100644 --- a/drivers/staging/media/imx/imx6-mipi-csi2.c +++ b/drivers/staging/media/imx/imx6-mipi-csi2.c @@ -771,30 +771,23 @@ static int csi2_probe(struct platform_device *pdev) if (!csi2->base) return -ENOMEM; =20 - mutex_init(&csi2->lock); + ret =3D devm_mutex_init(&pdev->dev, &csi2->lock); + if (ret) + return ret; =20 csi2->num_clks =3D devm_clk_bulk_get_all(&pdev->dev, &csi2->clks); if (csi2->num_clks < 0) return dev_err_probe(&pdev->dev, csi2->num_clks, "Failed to get clocks\n= "); =20 - ret =3D csi2_async_register(csi2); - if (ret) - goto clean_notifier; + return csi2_async_register(csi2); =20 - return 0; - -clean_notifier: - mutex_destroy(&csi2->lock); - return ret; } =20 static void csi2_remove(struct platform_device *pdev) { struct v4l2_subdev *sd =3D platform_get_drvdata(pdev); - struct csi2_dev *csi2 =3D sd_to_dev(sd); =20 v4l2_async_unregister_subdev(sd); - mutex_destroy(&csi2->lock); media_entity_cleanup(&sd->entity); } =20 --=20 2.34.1 From nobody Sun Feb 8 18:08:46 2026 Received: from MRWPR03CU001.outbound.protection.outlook.com (mail-francesouthazon11011066.outbound.protection.outlook.com [40.107.130.66]) (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 CF9D233B97A; Fri, 7 Nov 2025 20:45:12 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.130.66 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1762548315; cv=fail; b=fX6VJHjiI1Vgqp9E3eAyCoX39/+IJduDImbELd1H2dpS/tTyBmzQ44OUqMjnJAkken0jGdmDvip9BoFH+URxfw6yE3b4fjHYoooNEjYbu6UnfR4C435HSRj2WIYPBCLo+lY4PceBn4QkP1e2Oxpw5WCkwy3+z8aU8jrfsCnvHfs= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1762548315; c=relaxed/simple; bh=eGD2tk77cR8fVglEDQuFj1Sy+TcvFsZNM0lIOm4qL3I=; h=From:Date:Subject:Content-Type:Message-Id:References:In-Reply-To: To:Cc:MIME-Version; b=VUnqn84w9E90+o2wXMvBsb0NG+7nQatD4AgX3LkilD/BaKx9lxMKEhmZz9Zs8w8nd3MU8ci19ZhqMi6x76pXulF2IG/wkin4GFxVPDQfb4SSTMflDF3BNeGgEHH2enoF864WEwTTfJCedSTDRp7f2lSCeyyV3ApOs2a5chiudec= 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=DGuYnwiM; arc=fail smtp.client-ip=40.107.130.66 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="DGuYnwiM" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=tsGpASdjllDexzoZFdxqdXa+gbUD/Ppp0d85pg72RiDz4Y0xaajAiNq6QY0T65ZjfKy4h0QqLOWaxvh+0dp3i/3E58aXnqR8BTVxLR1Hsm5BURokWwkhvbtSHYGE96kWKFwaLiQ+fZTpE7SM0eXYAYo5DEU0ERQMj/EQGG57RWqPJWv4RgEanczK7ol2stwEwenUuz3o+g3cY8n6XV4hIdvs7Exkz32YdrEpkz3qcF5VMhQHiSw2jSt5ev7d5ceSLFC4pVH0teCjkjB7eL4Joj/ws3p9IKQh5qirQJ+OiXRlqDXeFx8swUq0RSwImQrhXfNXESq3/yvNx14XeF+0iw== 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=j61iBTfAvtUUioPVvhteYZChR7xRl7RJTbqqqSt/s/s=; b=B7bNf/7/7ZrewToJgaXfbCb6r9gsxEAASjM286Hc9ttU80h3T9yedExA22zhgQQ1F1CMWV6rIVwKMW4T1R9Q1mlJ+LuqludPqCTuPeurQyp8uVin24btqVTJ0FQjJjFa+kLnXX+y//wlekPT/SRElDQphxkBlw1XU9JnD5iqCBIr+T67VUPWLroZJffptE2kCPzD5hEqhFBk5pRQEI84TAVwWMMaoASOv1IErOSCEkOgARBnqIn0PCGk+Na2NK4YZjUUB9WyUu/7Zf0yZUz/w8dDWPRr+L3Ejya1W9Y5mFZjTG4CBRyj8tLQYx2kjCWyk/pqe06HpxXkMdRvdKHW3w== 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=j61iBTfAvtUUioPVvhteYZChR7xRl7RJTbqqqSt/s/s=; b=DGuYnwiMOUa2Ht7Hf5eC40FViOkP4oHg9tVYp/NzC8WH0zI8wVIWlycDKsLuTvPni+D3NoyhRL6VHl7tiQ01HvkDYdQ2OVcPhdr1fvhGCmejF8BSm/Id1KnoyoRfFfpByI6QsHnNbCCdLJ12Ue7ysh8iflHy+6CW0MhnjtmaEGUpSDGOmhQMCyJroXrFVmdHsVeP1Hg3XglIgKsHlMjupOi2moIL5e8YtCOIxZosBPJVOmvh6vbEKzFeQVZekA0ReWhPRQKR+db1Qv2NAHe9rWwtINZuT63gKErlaPp+0YPDwUUQta9m5i5lFsH2DNhavP0A49pxrE3o2uXLpkOm6A== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nxp.com; Received: from DB9PR04MB9626.eurprd04.prod.outlook.com (2603:10a6:10:309::18) by GV2PR04MB12021.eurprd04.prod.outlook.com (2603:10a6:150:301::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9298.12; Fri, 7 Nov 2025 20:45:10 +0000 Received: from DB9PR04MB9626.eurprd04.prod.outlook.com ([fe80::55ef:fa41:b021:b5dd]) by DB9PR04MB9626.eurprd04.prod.outlook.com ([fe80::55ef:fa41:b021:b5dd%4]) with mapi id 15.20.9298.012; Fri, 7 Nov 2025 20:45:10 +0000 From: Frank Li Date: Fri, 07 Nov 2025 15:44:36 -0500 Subject: [PATCH 5/6] media: staging: media: imx6-mipi-csi2: use guard() to simplify code Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20251107-stage-csi2-cleanup-v1-5-5d42535243ac@nxp.com> References: <20251107-stage-csi2-cleanup-v1-0-5d42535243ac@nxp.com> In-Reply-To: <20251107-stage-csi2-cleanup-v1-0-5d42535243ac@nxp.com> To: Steve Longerbeam , Philipp Zabel , Mauro Carvalho Chehab , Greg Kroah-Hartman , Shawn Guo , Sascha Hauer , Pengutronix Kernel Team , Fabio Estevam Cc: imx@lists.linux.dev, linux-media@vger.kernel.org, linux-staging@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=1762548279; l=3565; i=Frank.Li@nxp.com; s=20240130; h=from:subject:message-id; bh=eGD2tk77cR8fVglEDQuFj1Sy+TcvFsZNM0lIOm4qL3I=; b=hAOGnwvs76FdYBFh2AXS53jAWp4b8ysbrjMdr7l4/ldR27CEWF6KZ3m7rJ/2dcyAos/xFViEP C2I/f2JZlShD2zgq642eOVx255u3kvBL3jDs/zR8bz8DZBEJP7GYPoi X-Developer-Key: i=Frank.Li@nxp.com; a=ed25519; pk=I0L1sDUfPxpAkRvPKy7MdauTuSENRq+DnA+G4qcS94Q= X-ClientProxiedBy: SJ0PR03CA0332.namprd03.prod.outlook.com (2603:10b6:a03:39c::7) To PAXSPRMB0053.eurprd04.prod.outlook.com (2603:10a6:102:23f::21) 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: DB9PR04MB9626:EE_|GV2PR04MB12021:EE_ X-MS-Office365-Filtering-Correlation-Id: 8e76b178-3851-4eb4-adff-08de1e3e8a8d X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|366016|19092799006|52116014|7416014|376014|38350700014; X-Microsoft-Antispam-Message-Info: =?utf-8?B?UU53SjZERkxDRTZjTzFSZEI1Ymh6QUR3VDYxb2RkS2lXaW9YNXJVSWRwM1lu?= =?utf-8?B?eGlhRjV1NkdXOGZpbTNHYk05V09NZWJ4aS9HSEdjaC9UcjdkRkROL2J2S1pC?= =?utf-8?B?VlRBNjRYbVBQWUJnby9mUTNmeFRyVEF4SngzZ3UzWENqSVJUdkYvV2N6VWJF?= =?utf-8?B?MTBJSG9XaWx1U09TLzFEYVlDRnYwNmh3MlRGYlBWcDFhMlMwWk5wNzVuSTlE?= =?utf-8?B?UkJ3TW1rSVlCWlk2MnhLSllEUWF5UEMxWkRveS9Uc0ZlNnQ1T2RWYUh4VEpq?= =?utf-8?B?dGRTNWQrOEJMdzZDb1Q2djl4NEZqaXEzODg0TUU3dDR2blJQZFIwQTdaam9M?= =?utf-8?B?QWoyNXVTbXlhN3dhVlNLZ242RXpDem1JUG9kSHpHMnRpVE1aYjF3MWRUam1x?= =?utf-8?B?RkNTbi9rN1BWcE9kWjFPRWROY1FlbTd6Rk1qa1lTT3Z6M0ZNSGtaK29zMTNj?= =?utf-8?B?ZEVreGlKdTZwWUI5UFNmeC9KUEEzUFVlWkJPMjdNTS9uSVdMaDJHNEF0ZzEr?= =?utf-8?B?WnNoYnB3SVA0ckRCNVVsRnpabWoxbG5vQnR1RGw1WEY2NWd5cnNtenNkd21w?= =?utf-8?B?d1JkNGdhMXhERk9TUlQ1ajl3Y0k4OUtoeDVvemQzNlhYRkxKd1NmRVBFd2JR?= =?utf-8?B?L2lBN09yQW1pUFZPR1JNY3NrbHVGMDVRUUJ2Tk5UcWhlaTZVbXNYWG15dThs?= =?utf-8?B?ZTIyUnhBeDZCRTlwMHYvS3grMVphZ1lvNWdzdWhtRXVKOUZIZjRmTlpkdUtV?= =?utf-8?B?dURmUUcyaEwwV1g5QmRrczI3Q3M5OGpkR2JRSXZwcWlucWEyREtDYzB6TVFn?= =?utf-8?B?eW85M3RQTzBHVTJPK09VTU5UdFZiUncvWlRWcm1DRE1SQzdZQjhYeEE0di8x?= =?utf-8?B?aUZYRkN0SXAzeEhYb0tSamQyMURqMmVQMkd2eWhJckFOazZ5a0tLUmZmVDh1?= =?utf-8?B?VWI1TzBKbEhVdjNTMEFtQnB2a0piOW43MkZGYktDd2xPb2hyNzlIdzBhWW9t?= =?utf-8?B?b2FhZ3FPaTdSOXpETDg5Z0ZtMGJRcExTZ1I3eTdVZ3ExdWYyRS9KZ2ZxSzQ3?= =?utf-8?B?SVRFUDBYeXliUldLRE9iU3UvdmRrVThXeS9CN0Fsc0IvZlBWRldsQkw5Qlk0?= =?utf-8?B?STVGYTFIbWs0UjF0ZVA2dm9hVjlCbnFRd1hqQWFHZEVLT3JnNU1tUngrQ2c5?= =?utf-8?B?cXY2TXFLREVUQmFrdHZZTmcydTcwc0pONXQwYW5yQWxDbnZRNE9SOXk1c09B?= =?utf-8?B?dHBWV1JFdWtpRE5GYWUvUGNhMUprT0N3QU15Vy8xMXQ4WkxoTWQvVXJ1Umg3?= =?utf-8?B?MDFyQXJWUUF2Mnk4M2FUSERKU2c4aVdNclQxa1NJRzQxMDAyNitpai96L1dG?= =?utf-8?B?RVJvYTJQWU5LQTIyV0tjRnphc2J4Q3dveUdPU2VMY1NoRDhrdW1vR28wdTZu?= =?utf-8?B?Sk14TG5uZk1PaGsvbFN1UVJpVERhLytQbVhqanBGZGhYS2d4eWU0Z1V1RDlR?= =?utf-8?B?WnkxTUlnU1dSUlJRTDMzL3laQ1ZOeEhmN0hrTGZJUW1MNUVLWXhnOUg0Q3U2?= =?utf-8?B?Z0hya0tBSVhJc1ZIakdWZTVaR0tGQytHNEJDUnVJUnNTdnR6Vjl0M3FHL1Nw?= =?utf-8?B?cU9IbStvZEFXV2Vvck9RNnRlUkhlY2tSdVU4VDUxY1FNQVgrTDM3RzIwU1VM?= =?utf-8?B?QTBYb0I4K01Zblpab0pRMVZ2RTJXRlN0TjI0NVBjelUvZkRPR1pYbDMzaHFE?= =?utf-8?B?eVFubGpQZVZjam5jaFFqcW01bzNqckxYM0lTS1B2M0Zlb05aN2dEOXFxWEtU?= =?utf-8?B?dWRMNXR3RWl5TmJINlpYY01RZUJmZlhVdzc0Ykphc2ZzYkFMMjRuMWZGbE5O?= =?utf-8?B?WkordmZwNUswRVB3c1JyRy9nd0puS3AycUVBNE5TTnNrMzRzWEZya0l6OVhG?= =?utf-8?B?VXZJcUp6MjJVWXV3aVVDbkQ2VFZCRVZWTDlNbXVsQkRmRFJoVkV5MTJZMTBS?= =?utf-8?B?aUJwYWxKSEdBR3ZTbzJ4QjVtUmF2ZVdvMkVJUndITy9CZUdTQ01LU2ZvMTVq?= =?utf-8?Q?L7CpIL?= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DB9PR04MB9626.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(1800799024)(366016)(19092799006)(52116014)(7416014)(376014)(38350700014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?ckpBQU1EczBhVnJlRTQ4d1ZoUmhyNXVpY3Z4akk1OEJsOWhaczBWUWV3QzY1?= =?utf-8?B?UGdBK3VtbmJHVDhNS0pwbHk4bjF6ZklCdUtzdWlQbHduZ2E1aWpGMEVNS2My?= =?utf-8?B?TWtsOGZsMzNaeUNSZmpVTkxmYTA0dlgyenBQb1hOUHVPYnlwSExvSjQ2YXpK?= =?utf-8?B?bGlQaFRtZ0daRWl0UlhCVXhzM2JqTndJblNrUGxSM2cxZnQzaFM5bnQ4bk03?= =?utf-8?B?UmZrUk5ORlJoMHNjTlp2cWh0a2FGOFc5UENUS29KL1ZhSnZVdmM0QSszWlhB?= =?utf-8?B?OUlNekZFRUEvZ1hRc1Mwb1J4SWlRMEZaeEE1N3h3bGt1bHdmNnFyM2t6MVVH?= =?utf-8?B?bHI1NjMvUWVtL3lEMm1TOVpWcnBKeXliNGU4RGRwSHA0OTV0cEZRQ2tJKytW?= =?utf-8?B?RmJFcUpuU0MwdjFDcnhXK1JaQTNBMmNpUzZBQW0raEpIbE15YkRKSTdzdGto?= =?utf-8?B?RjB5QUFkRW9IdnBaSGpIalNlengzRVVSb2IrZzhuazE4Qzl6a3NVOFQxTkxr?= =?utf-8?B?MzZuVE5yNCs1bVYvWFkvS2MzcWhPRnRXeU5lQjVheTJOZ2lSaFlUOGNUYk5a?= =?utf-8?B?cUptd2RrR1dEOWl5OEM4Z2R5SGRwb25sVWZaZWxLVTNQMmRGemZzVW5PZXRt?= =?utf-8?B?QUJjZFhqREp2VlByOE9saGpOR045U0NCM2NrbVZNV2NVbnBWcis1dEFhZVly?= =?utf-8?B?Q1pCQ2x4SGp1NTFRTzd1VDRpZTZaVnZtQXo0S2dPek9pNUxXK0pLc1ZpcFRl?= =?utf-8?B?VTRraDJSNGxwd0ZLUzhwdVNkUVhtSEE2NUwreFNEaWtaSE9lNGRQbW5RYlNh?= =?utf-8?B?QXVpTTJBVlBONmFXUVZzZHRKZFMwb3dYQlNtY0dYbEVPbHpPSXFBVzNIUUVh?= =?utf-8?B?cnd3ZW9yaklQbWhEc1MzT3ZlS1hCVzd0ZmhKMXEzWWFQMHFMeDJ4aWlOdEJh?= =?utf-8?B?amVSMkNFejV2eSt5d3JlZU93cXBmOGtFWm9EOWE1Sng2NjN3dTFzK2ZmOG80?= =?utf-8?B?OUYwR2wvVGJMU3Fta0wwZUpRVlhydW5pZTBkWTJtQjZSOEpRcU4rNVpFWmZt?= =?utf-8?B?WW9kaVF0enAxZlpRMDRSWUtvRlVjb3FzLzYrQjdiZEJLV2RHbFQyL05TQ0dS?= =?utf-8?B?WFRqbW82cGpQQjVXLzhzdExSNXpnaytzeXoxZTBFVFczSHR0SWEva2kwL2xH?= =?utf-8?B?blJsSVYyeUpsN3JUemVXVDZORTRRMTZpOFFualkyNmw4WGR6Y0N2dUhhdTJY?= =?utf-8?B?d0ZTeFYwdmNwa3BKaDBOTVJKUCtBNVJmSGR6eXMzSkZKZGIwTGFFTW9YNlVF?= =?utf-8?B?OU44VFVnZEZReWJnQnRhSVdOUHAvSlZ5WlV6bVVwVVdZVlJiWUpHMDRIaGRt?= =?utf-8?B?VEdSVHZWYU9ic29XRlJpVG9PZWtxanFLWGNJaEQ4VElWcXdlNWRjc1M4WERP?= =?utf-8?B?d2R1WEtrQWIzNUpCZVpqUXJMalNwaU1ONTNBY0VQTFlwcXVVQXZyODNnOUZw?= =?utf-8?B?bUcyL1BvSzcyTVBIQTRRdERnZGxaZ3NIcW1WbUlRZDJ3eU9iWmI2VmM4c2Vu?= =?utf-8?B?NGpVRm84bnhkRDNCa0plSzVmWVdlUXdkSzhaclZobkh0RURidDB3Mi9icGFr?= =?utf-8?B?azBrTlZRRFdKcGhPWHNoRk9GSG4yUFlkZVFPVUpvcVVHNGpYRHFCYnNOR3hV?= =?utf-8?B?SkhyS3VDUW1taGgyMHdHdTh4KzBHc0pQcWJrRGtrN250RmJhU292ZGVyYVZB?= =?utf-8?B?VHJPOVVNUGw0a1pJYXRiVFlLUzdqNUhNdkloTjBMRDdWbHRNUlVJZDQzeDZp?= =?utf-8?B?K3A4THFnQ1JSUGJZYWJhajFYalk4M1FOcjBOTndqb0FiZXN2bm12Yzc5R2hG?= =?utf-8?B?YXBENGFaTllSSHp6T0ZmK0UyRXNqaENLQ2FUcTA3OTBVbnVIN3paOXZPSFd1?= =?utf-8?B?MEFuclRCWWFScTZGTjNESmFzNTRlSG5TTXRKVno4QWNpeTMrU0NQV2FDZkJq?= =?utf-8?B?cE5qZU1Cb3NVbXRieWs2UFQ0SG5qVjA0ZWRJYnVBVlVtdXBFS3A0NXN6QWY5?= =?utf-8?B?cWZ2YndCVVZlRElCWVhZNkIvcTJsMnpvWUFONjZvcURXT2RLZFBVN0tlaGk4?= =?utf-8?Q?S7Mo=3D?= X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 8e76b178-3851-4eb4-adff-08de1e3e8a8d X-MS-Exchange-CrossTenant-AuthSource: PAXSPRMB0053.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Nov 2025 20:45:10.2031 (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: Pj09ZDFs4g8hoZhhRfcbmzyxFvCoPqPWCcKdqRqpaGUfDijr21sQkA+QBpD91RgwWDmUCksExaC5PZaGkPd3OA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: GV2PR04MB12021 Use guard() to simplify mutex locking. No functional change. Signed-off-by: Frank Li --- drivers/staging/media/imx/imx6-mipi-csi2.c | 54 +++++++++++---------------= ---- 1 file changed, 19 insertions(+), 35 deletions(-) diff --git a/drivers/staging/media/imx/imx6-mipi-csi2.c b/drivers/staging/m= edia/imx/imx6-mipi-csi2.c index f8d0b3b8b250774af51f2aba731e639131aceff9..54e9491d3428686288a5bc9bb58= a5a0a25aca696 100644 --- a/drivers/staging/media/imx/imx6-mipi-csi2.c +++ b/drivers/staging/media/imx/imx6-mipi-csi2.c @@ -413,21 +413,17 @@ static int csi2_s_stream(struct v4l2_subdev *sd, int = enable) struct csi2_dev *csi2 =3D sd_to_dev(sd); int i, ret =3D 0; =20 - mutex_lock(&csi2->lock); + guard(mutex)(&csi2->lock); =20 - if (!csi2->src_sd) { - ret =3D -EPIPE; - goto out; - } + if (!csi2->src_sd) + return -EPIPE; =20 for (i =3D 0; i < CSI2_NUM_SRC_PADS; i++) { if (csi2->sink_linked[i]) break; } - if (i >=3D CSI2_NUM_SRC_PADS) { - ret =3D -EPIPE; - goto out; - } + if (i >=3D CSI2_NUM_SRC_PADS) + return -EPIPE; =20 /* * enable/disable streaming only if stream_count is @@ -442,14 +438,12 @@ static int csi2_s_stream(struct v4l2_subdev *sd, int = enable) else csi2_stop(csi2); if (ret) - goto out; + return ret; =20 update_count: csi2->stream_count +=3D enable ? 1 : -1; if (csi2->stream_count < 0) csi2->stream_count =3D 0; -out: - mutex_unlock(&csi2->lock); return ret; } =20 @@ -467,32 +461,28 @@ static int csi2_link_setup(struct media_entity *entit= y, =20 remote_sd =3D media_entity_to_v4l2_subdev(remote->entity); =20 - mutex_lock(&csi2->lock); + guard(mutex)(&csi2->lock); =20 if (local->flags & MEDIA_PAD_FL_SOURCE) { if (flags & MEDIA_LNK_FL_ENABLED) { - if (csi2->sink_linked[local->index - 1]) { - ret =3D -EBUSY; - goto out; - } + if (csi2->sink_linked[local->index - 1]) + return -EBUSY; + csi2->sink_linked[local->index - 1] =3D true; } else { csi2->sink_linked[local->index - 1] =3D false; } } else { if (flags & MEDIA_LNK_FL_ENABLED) { - if (csi2->src_sd) { - ret =3D -EBUSY; - goto out; - } + if (csi2->src_sd) + return -EBUSY; + csi2->src_sd =3D remote_sd; } else { csi2->src_sd =3D NULL; } } =20 -out: - mutex_unlock(&csi2->lock); return ret; } =20 @@ -513,14 +503,12 @@ static int csi2_get_fmt(struct v4l2_subdev *sd, struct csi2_dev *csi2 =3D sd_to_dev(sd); struct v4l2_mbus_framefmt *fmt; =20 - mutex_lock(&csi2->lock); + guard(mutex)(&csi2->lock); =20 fmt =3D __csi2_get_fmt(csi2, sd_state, sdformat->pad, sdformat->which); =20 sdformat->format =3D *fmt; =20 - mutex_unlock(&csi2->lock); - return 0; } =20 @@ -530,17 +518,14 @@ static int csi2_set_fmt(struct v4l2_subdev *sd, { struct csi2_dev *csi2 =3D sd_to_dev(sd); struct v4l2_mbus_framefmt *fmt; - int ret =3D 0; =20 if (sdformat->pad >=3D CSI2_NUM_PADS) return -EINVAL; =20 - mutex_lock(&csi2->lock); + guard(mutex)(&csi2->lock); =20 - if (csi2->stream_count > 0) { - ret =3D -EBUSY; - goto out; - } + if (csi2->stream_count > 0) + return -EBUSY; =20 /* Output pads mirror active input pad, no limits on input pads */ if (sdformat->pad !=3D CSI2_SINK_PAD) @@ -549,9 +534,8 @@ static int csi2_set_fmt(struct v4l2_subdev *sd, fmt =3D __csi2_get_fmt(csi2, sd_state, sdformat->pad, sdformat->which); =20 *fmt =3D sdformat->format; -out: - mutex_unlock(&csi2->lock); - return ret; + + return 0; } =20 static int csi2_registered(struct v4l2_subdev *sd) --=20 2.34.1 From nobody Sun Feb 8 18:08:46 2026 Received: from MRWPR03CU001.outbound.protection.outlook.com (mail-francesouthazon11011071.outbound.protection.outlook.com [40.107.130.71]) (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 9D170276058; Fri, 7 Nov 2025 20:45:21 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.130.71 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1762548324; cv=fail; b=CEEfSm7Q5tCfdehEF5De+JzfMzZiw/YQaAed6p1RBxcYOE/3Tce84AM+6DnmJMXcuSueQS8aL4ike9umm7A9r8GVUAeTkWkDpu6kWfZajRlBVT31h/MczOk/d74ZxB9AJwK8Q+tWimbL8kGHLuTs631sIQO/OGPORyWEDRgQ5Ig= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1762548324; c=relaxed/simple; bh=KYE583q4vmW1mcXOjTH0ZrT2IPx0TsZuwDVd9xXPz9I=; h=From:Date:Subject:Content-Type:Message-Id:References:In-Reply-To: To:Cc:MIME-Version; b=tEr+3b6VhUcIqYTauPUgYsg2NdQFOB1NM+77AZ/c7KqmvXpLPR8XcY4Q5dA61tbJg/HgHKQwnED/gk1U7gEmvCqBcp+hc+eWyIXkl6NY/BiV7oUFXoUM/dUHB8heNgNDbhLpBJBuYt7urjEsvLhQipj96YmEUnW5Tj0xbsq1R7E= 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=PIH5QHrC; arc=fail smtp.client-ip=40.107.130.71 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="PIH5QHrC" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=doJVsVGSOr0zEaKC0bH9DgQX+4D9TGCYVg76yK/IWohIECBsPkowA89CLLdM1W9qCIWATfcyxozm1iwBmpnM1Ho6wLu8onSpMUlUzvbBsbfmFGpdufBddAqFVl6fnCQsFaGFAoGb8NuYo+z2gJe3t26Ic9kepmUHwKXhnUrab2/MYSvGPZOOrvVv87Kb1SYV9FGiyCxjEXAcugkXATJlHVBDNKfbQSzAM4tMolDrITzz+GHd+8rkvp/0H5g6A8KY9gnwdtXsUQXfIhd/ae2CyXgjCZQmKj5NSgI++hr2000LemW208C82kjeIwrfXGo9YKXXRtrksk30FhrxXFIbmg== 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=1UYZKkcezqYuD3WQrO4Zo8+Ug2eUZTEFTtCV/8xZtvA=; b=JAzPxsA1yY6/S0SNgm+rKjuyNk0jjAdDm0ADRiZohhJ+tZTM1eGqiFl2mCiBMKQ4OOiVb+yUC7Ccg8A6NnqwbO317c7oNW349GVi3C/IQQ8m5vcEVTEtvQsEEpGy0QyhZPwPsA/S1etov0GO40t6fiOexcFjta1IrWpEBK09p6UU1HAwwqH3LuupUaYS8JqC/hTYxxtMLq+O3TtFvKwLOhMbc6wQsAu4WhJeCrkMn/pT5QdKkmGq7TVb15P1xfhHIbNJiYfwKsiA4V7K949GwfbN8WBRwetIgUQYuX323iRVWatEJ5Ny6BmpV9mFTmFhXHrlImIDfKswi+MMhR0XGA== 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=1UYZKkcezqYuD3WQrO4Zo8+Ug2eUZTEFTtCV/8xZtvA=; b=PIH5QHrCQ46ffTFEJw5nLdgNxvG8V+8BYqYWrbtnhifrJW1xY4Um5w81ivjTzyOiGFxjeITxuLvc/Dx1/lZNXl69pooTzBOF59SN8C+FqXDionTJdERumFRkb6Or4r00SKiXwqvY+VqwnumsPYo/w3kU88ymNU8qcLFUlblNq9iPzCaFxIGsXMPC9MZuHvjST7sMRkxYx/VVH6zrIoxHpq42NzT8e6HC/blSS5wRhAd5niSNXgmex16/WV7OyeMiTEWNa1/VUH4srVVjeR58pXE5iSOnXVwVXxwYm+dVv0ATYw3Vn+l/d1waNMgy/sfRbWhE1jWMLKIMSOcn7gzb2Q== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nxp.com; Received: from DB9PR04MB9626.eurprd04.prod.outlook.com (2603:10a6:10:309::18) by DU6PR04MB11181.eurprd04.prod.outlook.com (2603:10a6:10:5c0::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9298.12; Fri, 7 Nov 2025 20:45:17 +0000 Received: from DB9PR04MB9626.eurprd04.prod.outlook.com ([fe80::55ef:fa41:b021:b5dd]) by DB9PR04MB9626.eurprd04.prod.outlook.com ([fe80::55ef:fa41:b021:b5dd%4]) with mapi id 15.20.9298.012; Fri, 7 Nov 2025 20:45:15 +0000 From: Frank Li Date: Fri, 07 Nov 2025 15:44:37 -0500 Subject: [PATCH 6/6] media: staging: media: imx6-mipi-csi2: use devm_platform_ioremap_resource() simplify code Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20251107-stage-csi2-cleanup-v1-6-5d42535243ac@nxp.com> References: <20251107-stage-csi2-cleanup-v1-0-5d42535243ac@nxp.com> In-Reply-To: <20251107-stage-csi2-cleanup-v1-0-5d42535243ac@nxp.com> To: Steve Longerbeam , Philipp Zabel , Mauro Carvalho Chehab , Greg Kroah-Hartman , Shawn Guo , Sascha Hauer , Pengutronix Kernel Team , Fabio Estevam Cc: imx@lists.linux.dev, linux-media@vger.kernel.org, linux-staging@lists.linux.dev, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Frank Li , Laurent Pinchart X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1762548279; l=1527; i=Frank.Li@nxp.com; s=20240130; h=from:subject:message-id; bh=KYE583q4vmW1mcXOjTH0ZrT2IPx0TsZuwDVd9xXPz9I=; b=mx8SjWYV9fp6yu1jH2dyrCWYyDfRRQUwn+YYpCkwMACVGdPANgMh+JQHrA5tgX+qEFDbV9h5H Ika3wkKuGxvBYzzw9e/kj/Fp3qOCw3wGIqf7TWf1sCeNgkY18U27UnB X-Developer-Key: i=Frank.Li@nxp.com; a=ed25519; pk=I0L1sDUfPxpAkRvPKy7MdauTuSENRq+DnA+G4qcS94Q= X-ClientProxiedBy: SJ0PR03CA0332.namprd03.prod.outlook.com (2603:10b6:a03:39c::7) To PAXSPRMB0053.eurprd04.prod.outlook.com (2603:10a6:102:23f::21) 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: DB9PR04MB9626:EE_|DU6PR04MB11181:EE_ X-MS-Office365-Filtering-Correlation-Id: 639fea4f-9913-4f2c-1a66-08de1e3e8d65 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|366016|1800799024|19092799006|376014|7416014|52116014|38350700014; X-Microsoft-Antispam-Message-Info: =?utf-8?B?QWpiMGFsQU8xODMwajIzWWNROGhmMVBoOEJxdldPQnlqS0dRbE9qc2tCekJa?= =?utf-8?B?eEhsbVZLWEtCUktOVjZFQ3BwU3ZLZjM0VnhvNWRPcHBiaDRsL3lVaDJkcFdJ?= =?utf-8?B?dUNxclRseFBzbjNBbzVCSndybEs4dkRXaml3VWsvaldRR0hEdW8wbms2Q1lK?= =?utf-8?B?NzZCRDlDdTB2bEVkUWFtbWVoT2w4U3dyQUovOEVqaDhYUXpHYU9TMFBHZTZJ?= =?utf-8?B?K0FIWnpRbTZvbUEzUmJpWklwQkdsbVVYZVlzaXNJRFdKdC9YWGZxVG5xb2Yr?= =?utf-8?B?bUlaUXhHY25renp1UGJTVVpsRXhBQjhPam02T1VxMm0ybHJzWmN4RG5wQy9I?= =?utf-8?B?dzMycWkvMzZJSElXTGlYYU9tanFjdCtwQmwveGdtc3N6dUp0aFFUQjlkRFNJ?= =?utf-8?B?cG1PVGEvdmxBWkpuQnBiYUxRUG40WjVCY2UrNWlKV3dJK2J1d1Zydmgzd1gx?= =?utf-8?B?TmVxWWdubFNkRWdnNEZnUndKWTkrNjJrdHVsc0N0SUx5K0VSM01JMXpmS0tu?= =?utf-8?B?eUlaWWJmQ1hDUHlvUVoyR1NTNThHZVJhUTl4ci9HVnREVGxpem9ESWViaE4x?= =?utf-8?B?VVQvaHpPNW1OQlNBM1NuZXJ3SCtrT3RsdG53NFlTdXZEZkdVTU0wM21uNXgv?= =?utf-8?B?OE5YbVBuNml5NU9qN3N1NmN1ZnI4ZGs4Q0FWS25lemtCNkZ4TkpFYlpNNmxM?= =?utf-8?B?T09LUVlPSE9OV3k2ckVSbGNGajM5R24yQXAwM0ErK0tiaXZSVkd5aktOVzVP?= =?utf-8?B?SkdyaXNMSmRiek9CbzNmQnd5QzJmYlRtczVEU3Qxd2paYmlhUE1ha3hQbTJt?= =?utf-8?B?bitSbDh0Z005RU0rRVdLek10N3NKOXhtVXUxbnYrWjErbXJOWWhHemJoc3N4?= =?utf-8?B?N2MvRTNPLzBUV2s5SkdNZ3BIQVpRU1FzRTZOUlZjb0pEWlJHaGY1emR4Unda?= =?utf-8?B?bEhYWGRwRFZPVFFKdzVnUFIrTUJVV3B2Mlo0a3pxWlQ1eU1ucTh1b0x0Qk5v?= =?utf-8?B?ZW5WVHI0dGVCa0Q4SXY5MjJ4bzg2ak9NT0NQL1FVTkQ0QTdJZVVreVRHQXhv?= =?utf-8?B?aUtGV3N0QWUwaVFCRVEvdm50K0pKVk5zbUVjczJkaGgwL0RjY2dDb20vbmVX?= =?utf-8?B?K3hUbFdMMzlHWkgwMHhLZ2k1QkJDQ0dlSFNJcUhieFZSOW5kSVRZUXBMYklt?= =?utf-8?B?WjVhS3BsbW92QVhiUkZmemZEQXlOY2V2NUJ6MStFRnh3TU1CUTI5clZraUxs?= =?utf-8?B?L0hHWnRJQzBLdEFQckdFaW45Q0liMU1ha2FaQnY1QkN2MkVEY0lhS1V1VHEy?= =?utf-8?B?VDhXMjVRRXU3U0NzLzVHam9kU1lWZThIdmF1VTFDT0J6dUkrMDg4QTRGZ3Z2?= =?utf-8?B?bTNJbzBaMjZRdUx1V2Jxb1dxYzdsb2ZzOVFJSTRZeW5Ic0h2MTNKNFhacnA4?= =?utf-8?B?S3UrdUNubnlrVmFqMTdValhOenI3SVdqZ09ZQ3RuUkJPQVdERHd5UjlsMUFP?= =?utf-8?B?ME5ORVdMYzhkYVM4eXViODJHbVBMVGdWOEd5SE5KazFET3FuUlRUT29tdnJ4?= =?utf-8?B?ZkM1bi9NQjVMeGRpN2FrKzNud3lsbzIzSTVPU0JXT1g2K3p1ZUdFWHFNbkMw?= =?utf-8?B?dEZRcEhYYkVxemRpY0JTQUdPNCtZMHcwYnFsUlRDZ2dmdjdvcEtwRUNUYTZL?= =?utf-8?B?MWthMC8ycGJ4dVJPNE5ybDdyVzNLcktkN1BPdm1RRmJFNkRtdnRLNXB4R3A3?= =?utf-8?B?RStuWnRoTnVlMjZWR1pLKzRpckZza3pjRnhBZjhuWEt6cWczeEpSSDBNeDBo?= =?utf-8?B?ckhsWXBibjZieUcrUm51bSs1NnYra2VmaFI0RitrMEg3SmxPbVNmaUtrQjJS?= =?utf-8?B?OG1ZdVZXR20vdUpBb1dxcytWZ3RDUFFWaXpYUG1rMVhXb3pDQUsxNzE0VUt0?= =?utf-8?B?dnNJK2QzNVM5cStRNnoxTmNnSGkwS1VLRjhqdEI5Ti9ObWlTWldpUVFJdlNo?= =?utf-8?B?cU5EMForT0lWczI4aC9zTTBkYzErTU9PdlMzd0U0cGpZY0ZsZEEyYmZUcW1M?= =?utf-8?Q?C7wX7i?= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DB9PR04MB9626.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(366016)(1800799024)(19092799006)(376014)(7416014)(52116014)(38350700014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?ZmJhdDVhYk00UDJyTzNOS2xOVTNJZXlVL29hYzdVY2x4NDhUUTk4MDgvLy96?= =?utf-8?B?eEVIOFVTUmY3Qk1LWXlkM0VORDBOOXVTNW02dEFZNkF6MzR1Q2RhNUpTVzhq?= =?utf-8?B?QlVjNFQwVW1BZy9KdnBQb2tKUG1aY0x4NmxHS0E2L29QekhJRk5CQS9NL3o0?= =?utf-8?B?OENWMGFBc2g5b21VQ09tamVNK2lIbGRKTktjU3RWR1BNK2pBVFBGSWRuRnA1?= =?utf-8?B?eG5hQjRVeWY1NUFPTW9lZ2xiTURIcVNvUkIwRnRwalJZY1pXeDBzaDE3MHVE?= =?utf-8?B?T1JxeS9McThVWWJINkFPY0ErVHpaSlkvVWtVVlFsYTZSS1lHbnJNbDBBR1Uw?= =?utf-8?B?YkFkNXNwV2kxZDV5cHFqd2tRR05YZnlYM1lNZ0x2aDFZaHl0THcreVl1eS9O?= =?utf-8?B?NGp6bVd4TEFiVnZoaVFlbDdSQi95bEZaK2JORkQzMEdTM3hxTVMzTjI3bkpV?= =?utf-8?B?eldiZTZKaVZHMnFOUjVweWNIajJIV2d3UjFSM1VweDRUdm9vNnBvUlhCZm9h?= =?utf-8?B?VFVUZEJiME9va3NzN0hPS3NLeUlCQWZNYStOaFlIMTNvVUhnZEcwaFVFNEtZ?= =?utf-8?B?MTVGMnB6SU9wb0cyZlNQS2FSdVJ3NEhGUE9obTdVcHVoTEp6TENzT2lkckxG?= =?utf-8?B?elpKZmZEL2F1S2JXaTYybWhjSTNpWkR2d1MrTGQ5QUhwTWp2bWpyclRGemtL?= =?utf-8?B?VWtrK05LRGJzU3ZKWnhMRzlsL28zcVpKWVYwSDBnWFZ3dTFaOWlTSEk3dml0?= =?utf-8?B?dlpCRWJ0OTJrejlDSEJlM0k3RC9WMkt3WDhXNHVwVDR4Ykt1RnhuZEN4aS9E?= =?utf-8?B?cFRpL2dZcHc0dm1LNWZzU0tvaGdHTzkzUVRoeXZtSFRteXRxMzRObVV0N3Bi?= =?utf-8?B?TjN1aWVFejhBclVQMzJhQ1NUVVNEbkNOcGZwUDd3SGZuSG5FbDMzR2tWOU1u?= =?utf-8?B?MnZUR2ZMUTJUVGtRQzF2SmZ0OWJHcmUycWNjM2syYVdUTWZWOHhKazVjYXFz?= =?utf-8?B?cjRQTEMxbGZTVURYWk9qUlA0K0VJbjI0aHNJU0c1VHBtY2d6ZXkrdVVUWmVR?= =?utf-8?B?UU9EaWxvclJ5RFBtbGtzZDFsd1RqZlZKT0swS1hzc2NzSkNnWFhaaUdvWlB3?= =?utf-8?B?amxkM3FMSTMveE01aHR6MXlaWkZSdG5uZXZYaWtVLzMvU0FtaHlia0IweFlF?= =?utf-8?B?KzFlY2l6SzFVcVpYUXBTbFVTNGgwQXplQUdxY01vM0JPOFJHRzFSWU1BTFBN?= =?utf-8?B?UUI5elBtbENsZjIxeTNnTG9KSEpxK2FBYm16SnQ0MVNVUlhFVGlDSFVBdFhJ?= =?utf-8?B?UzZ5WFJGYjJNajFBdU1IRDVlbG8zZ3lOdE9jREJCVE5pRWVQWk8wK2ptWlVk?= =?utf-8?B?MVM2Q1JVL2QwbmpudnFRQkRZWXFFOVdjYlV4OFJ4NmZ1dkE4MG9HZlhXR3ox?= =?utf-8?B?WWsvZStyMHB1aHJhbWxicGxveHpQUlRIZkJ1SzRlSUZ5MncwbEJsSWxlSGN0?= =?utf-8?B?R2g0S0RYQ2Z2MkRwMW1wdk1ySndpUnF6eVBzTG51bXp5TDJCQ3hIQ3Nrc0NO?= =?utf-8?B?NGxaMlZjQkVsOTM1amtSemZkYStLS3AyQ3JqbVdXbytEcmwyZ0trK1VsMFpu?= =?utf-8?B?dEoySXQvUDlPWjB5R2xlK1F5T2VuOEZOaGVON3grRXZFWGlMNVUvbE5wYUVt?= =?utf-8?B?R2RlWFBkdjVVN0hIOHY1OHQ0M3VBWDZ1alJFWUZMVCtkaXBDTGRWcHRwYVl2?= =?utf-8?B?VWwrYWI3K2VhdWQ1cUhxcklUdXFCYkY4UUt0MEwxNFljdFY5Z0g3TlZDcXlD?= =?utf-8?B?TklROGdHTjNzcU5CUVRpZXZVZHZ5UjNOam1CMk9oUldBOHBRWUwzZ20rV1FQ?= =?utf-8?B?WFZVYlhPZzVweDNpU1M0ZWtmSWZkT3FlN3NIa2JiNlBnWEh3ZzhWRzl2YnNY?= =?utf-8?B?TmVqZVU1NjNNcFNzWTVuMExMWG5ibnEyY3UrdVpDRTIrYUxOOFhyN3Q3c1Vh?= =?utf-8?B?ZzFmaW1QeE9vdVdLNGJEWmhwcVVyck16NFY2UWR2czYzczZ1YVAxUHNzcTlG?= =?utf-8?B?MVI0bDNuQ2F0RGFKVmQyb3JXR1F1MlJ4akNoc0htalZhSGhzVUtSeXRqY2Zz?= =?utf-8?Q?2Z6I=3D?= X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 639fea4f-9913-4f2c-1a66-08de1e3e8d65 X-MS-Exchange-CrossTenant-AuthSource: PAXSPRMB0053.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Nov 2025 20:45:14.9291 (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: oT3so6bqHofInHqBUoDsMobL2y1cySIUrd4l+SxQVR7U7HkFeNgXFj0J07bVQk/FeVqsY57+gkPl994rNfVpIw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DU6PR04MB11181 Use devm_platform_ioremap_resource() simplify code. No functional change. Reviewed-by: Laurent Pinchart Signed-off-by: Frank Li Reviewed-by: Philipp Zabel --- change in v4 - add Laurent Pinchart's review tags - return PTR_ERR(csi2->base) directly. --- drivers/staging/media/imx/imx6-mipi-csi2.c | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/drivers/staging/media/imx/imx6-mipi-csi2.c b/drivers/staging/m= edia/imx/imx6-mipi-csi2.c index 54e9491d3428686288a5bc9bb58a5a0a25aca696..3d590968483e4f70d284f8abe2e= 789a7f32e6728 100644 --- a/drivers/staging/media/imx/imx6-mipi-csi2.c +++ b/drivers/staging/media/imx/imx6-mipi-csi2.c @@ -711,7 +711,6 @@ static void csi2_nf_cleanup(void *data) static int csi2_probe(struct platform_device *pdev) { struct csi2_dev *csi2; - struct resource *res; int i, ret; =20 csi2 =3D devm_kzalloc(&pdev->dev, sizeof(*csi2), GFP_KERNEL); @@ -745,15 +744,9 @@ static int csi2_probe(struct platform_device *pdev) if (ret) return ret; =20 - res =3D platform_get_resource(pdev, IORESOURCE_MEM, 0); - if (!res) { - v4l2_err(&csi2->sd, "failed to get platform resources\n"); - return -ENODEV; - } - - csi2->base =3D devm_ioremap(&pdev->dev, res->start, PAGE_SIZE); - if (!csi2->base) - return -ENOMEM; + csi2->base =3D devm_platform_ioremap_resource(pdev, 0); + if (IS_ERR(csi2->base)) + return PTR_ERR(csi2->base); =20 ret =3D devm_mutex_init(&pdev->dev, &csi2->lock); if (ret) --=20 2.34.1