From nobody Sun Feb 8 17:41:51 2026 Received: from GVXPR05CU001.outbound.protection.outlook.com (mail-swedencentralazon11013048.outbound.protection.outlook.com [52.101.83.48]) (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 B3A53326938; Tue, 11 Nov 2025 21:42:44 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.83.48 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1762897368; cv=fail; b=By1qQSeKG5xO+oZo0ZGWdItR8780QT+KRqqxMyC7s+n2K5QOJLd6I73xJUx6cVRSWJQeieKaykDZrjgH1vDMNKjVWf/FWC+qOmd69iYvmpYKerat1boLfGlI8jrkj5/2YGNbwQQd7XWTgUJTeZ3UcIqGKN63iCdtJWWJPu2Md1g= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1762897368; c=relaxed/simple; bh=rIIGj1pOcYLbPuEP8tSVf6f/1J3pRx8B92aOnfdq/vc=; h=From:Date:Subject:Content-Type:Message-Id:References:In-Reply-To: To:Cc:MIME-Version; b=K81dRSHqI5OVOh92goAtWbkMKYM3mYHepG4IjaHHMmgoc27OpAfxBQQWnrTH0yIzE+t70RatHbNaB0WcQbGJ+k9FC0oYaZH8/1G+8X7oZAnR35c5hqHMNj4B9ijpElvFkPNXb2EJchI+pEyGguiO5QzaIMtkhExBdSgHiXf2NEk= 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=YgIAYvHh; arc=fail smtp.client-ip=52.101.83.48 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="YgIAYvHh" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=VM2OaAiXFRwVCPpRCTxCfGSDEAw6a/bO9bGcZE5F4O9bddlSWjjoSGYeCExVdk2qkJIITpiqqBqdLlOuGNM0q1qoPaBLuE4WgCzj9SD9FxwuLScab71MbXCVXYdmma5bHGip1RjDov/Y6zWitySSvTWnjuG9NSEb5hIUFLN/vQA6XitR7lEuVKTZXLj+11FJwFHoHJIenklDNomsvNqjjr5J/E3NRuO02MLboNNNlrH1r++PyH5k54PeTgtGmPpei7zPzYhHSyu2ZwDQnjiLVdvRkz/9AFlFiKjSoIiAbkLd6fmrvWeVHvnlevovxpaYLhomefrijWNMwmK7Kokxjw== 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=MwJuK9xH9uZEaFmpscjMDx4HuCXH0qH/UiUYdvbnMig=; b=TcfcZOkm2RhdeluVEzD2IhgiTwuDiMIRMj8H2qv/dADiF+BnyQljHNZJSLK8cOIrILScN3EipQRawGd3RygyRRgNzYI/nNZx8qKUgiRTwZKcf+cold73/AJY9EY+EZxnh8bRTJVpUlW4IJCH8qqQaOu7XZoBm8TBPj2NvLKwC4gDSQnRdwT0t8ZSkmLLArCosABW3C32AP5CaHzRaxYOf3010zHmj4Xs8InKInH+w4EhpQ31NqBKgugrSyn2ZdcYeH7FGWurEWDvoGvoY/RHZ6uKLT/xJK5TDzowQNxcWEMqlnW0wk3CquOpg26G4v6Vs5QY/Z1P3EgYngkfCvxyxw== 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=MwJuK9xH9uZEaFmpscjMDx4HuCXH0qH/UiUYdvbnMig=; b=YgIAYvHhHr7/bqHd8BrVrOl2+dI4GhylccdE39govg7fUVO0xcWuCkYvNJzmAOB3qz3YN0DIOMW6f3pT23WwCkueF7R2iyXkSdskUz6J/nm43BAA111DQH1jK2Up+74niSt00HO7X17hkY8OW927C7/9JYmf7MoWreQJiWn0r5oFsZCCXzT74z++llSIKfBUtKgNRUt38wbyxdrYCGE4ENRmBEaOyrpq0pbVj5S8bwa6ueKyI+hJzwo3sP8cKnxCEYl7Y17dhFWwp1h5rNE4myI3oOCf6gnnMmTja+qQ0R8NAZ8SH+g95upndBSvpB8xHWWD04I6Yrmd/AkUw0XYOA== 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 AS8PR04MB8401.eurprd04.prod.outlook.com (2603:10a6:20b:3f3::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9298.16; Tue, 11 Nov 2025 21:42:38 +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.015; Tue, 11 Nov 2025 21:42:37 +0000 From: Frank Li Date: Tue, 11 Nov 2025 16:42:13 -0500 Subject: [PATCH v2 1/5] media: staging: media: imx6-mipi-csi2: replace spaces with tabs for alignment Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20251111-stage-csi2-cleanup-v2-1-371bb951776f@nxp.com> References: <20251111-stage-csi2-cleanup-v2-0-371bb951776f@nxp.com> In-Reply-To: <20251111-stage-csi2-cleanup-v2-0-371bb951776f@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=1762897350; l=5038; i=Frank.Li@nxp.com; s=20240130; h=from:subject:message-id; bh=rIIGj1pOcYLbPuEP8tSVf6f/1J3pRx8B92aOnfdq/vc=; b=Dynup/Pm1VdVShUu9VRbM+xjci/j3oejmiBWIu8QA/r6o/VvxQRK4rBzlqEVJnHZ6cf2If6b4 7m5aAnW+ddbD5hgi5D5u6EETPeqJzhhmGE9ZvIu3XmPy/4eyl+I2ns2 X-Developer-Key: i=Frank.Li@nxp.com; a=ed25519; pk=I0L1sDUfPxpAkRvPKy7MdauTuSENRq+DnA+G4qcS94Q= X-ClientProxiedBy: BY3PR05CA0044.namprd05.prod.outlook.com (2603:10b6:a03:39b::19) To DB9PR04MB9626.eurprd04.prod.outlook.com (2603:10a6:10:309::18) 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_|AS8PR04MB8401:EE_ X-MS-Office365-Filtering-Correlation-Id: 459b7698-269d-4f28-4288-08de216b3b6f X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|376014|52116014|7416014|366016|19092799006|38350700014; X-Microsoft-Antispam-Message-Info: =?utf-8?B?S2VhRHRuWGNQK2F2eWt0bnhCSFRVOWIxNGFYS05QaGdjOXRuQkd1MFV3aFpa?= =?utf-8?B?SHFzT0tmUHZLcU1xbFNDbWRjWlQwcTh4cTVJeEZRTlBUc3Ztd3V1eHlBYThW?= =?utf-8?B?dmF2SnhuV3Rab1gvM09YaWF3Y2ozVzVNRUFuZHVOTm5YVFh2M09KYlJQY21B?= =?utf-8?B?QnFhVlNCMEhnd0ZUYzJoMTBOc3VQTnRsRkRtWDVQblVXc3dZbjc4M2NLSW1m?= =?utf-8?B?VVBiaGFwclhsdXJieThNUnFZVjhDcnJwZWY0Z1I1eUd3am9ndnF1Z1Y4UEdL?= =?utf-8?B?d2JyLzhtZFBPQ1hkaTF0dWgwdWwyeStTU1lYTDI5bEJQd1BqcXlkeURyVnVt?= =?utf-8?B?bDVHUmJUQVpUbnlHTGd5WUQ3SzZUZkcybE95a1JzUFpJQlhkQkR0b3B0MXVM?= =?utf-8?B?NmZHWncySzB6M2IrbWttWGMxUmNiamdRODBtSDZZejUycHBJdXFiNzZZckFL?= =?utf-8?B?OXA1KzBlMXUwS0QwaTNVaGZBdUVzUTRtTG9vTTQvMS9kQVp5NnRqNW1qMWFP?= =?utf-8?B?a3dBbWFDdmZLc1c1dnljRTMrRTUzSFpvNVF2QTNsa2traW5RNGt6V3ZoR2tS?= =?utf-8?B?ek4wZCs2VkZ5N2RxeDlPWlFUSzR4V2crOERabUJYaHd2RnNvcjNOOTBjcUh0?= =?utf-8?B?RFlDUU1tOFh1ZlJvTG0vMDY5NzN4bGFLV0d5cTBjcUk3TnBTSWJKZTkwQWFj?= =?utf-8?B?K0lSYnRNRGwwZ0ZEU2tLYWtpQVBpdXB3UlZGcTd3S1FXamJsSFFsMkVWdnpq?= =?utf-8?B?Q21qcWxTZGkwZXplSUNrSzBvRFNVWE10SnduYWs5NlhXZitMZ1BzdHNhUEZo?= =?utf-8?B?UHp6QXBsblE1azNDdktPRHBRMGh4MDAyMkgxelduM0NnYWxFUFgvbjZYaWx5?= =?utf-8?B?d0kvcUNLaU4xTjZ4SlJlU2U4M1Q3eWltdENjVUc4RTFwT2E4SUFKSkJ0K1Ra?= =?utf-8?B?MDdBSzZJeDlpaUEvVU5wQ3lTZk93emJTRGtoT3lvejNqN3JURjQ4RnEydHI2?= =?utf-8?B?NEUyMDZBcS9CaXpacFA2NE4rQW5TUWhMdUIrQS94enR1ZWk5WHRpVVM2N3Bj?= =?utf-8?B?WTJnYWN2RFVFWnh4allFOHRSeXM2b0RaQ3JBN1pRa2hpWktRRHZDYXNxdERX?= =?utf-8?B?c2tEQ2lsN2plZGhKN3lJNHpLWTh5UHBUWGt2TCs2U2tFbzRKb2VxUEh4VmZ6?= =?utf-8?B?UDJ3VG42aWx1Y3RYWFNnSmJDSnFhbzB6NTFXaFVmL1U5THY0WTdibUl6SGto?= =?utf-8?B?YkI3SkdhK3RXZ3IzNzFBSXpkR29vNUwxa2ZGWWRKaEpIdG55Z2RHS0VZcG1C?= =?utf-8?B?YXNMeWxPcFE5czZLYVd2dUFBdHpncFo1ZkVGNzZsdlNOU2RLTE1uRldyZWR2?= =?utf-8?B?Yy9RMVFmQVI1ampIa3hzb3lieXA5a052c1BIRTBLNXdIVnRUTnU3ZzBudCs3?= =?utf-8?B?OEtDaElXR1o0cDhLZTlDNzFBN1Y2Q3JPVEI3SVpzWHJTOStCVFpTZmRNNVNT?= =?utf-8?B?Z05pb01RbFBLWHhRUzFuOTkwK3hFYlR3Y0ZtUmQrTStvOGQrUVdUK0pDSmVl?= =?utf-8?B?TjBFNDNHKzdiMTVlVFUyTXB2WHY1VjVUbnRTdC9KL3NpWVNsVjF6T0dKZ0J3?= =?utf-8?B?WFN5NkxzRFhqVWIrTjhYOU5uOXRtaG4zaGJ3eXFpQzJYN0dpWGdSdGVNajJM?= =?utf-8?B?cHhQQjJ3RkxuT1o1Z3BLOHljbVU0WTFQWVdZMWpDOVZhaGloSERqeVRPU0Zx?= =?utf-8?B?ZzlxUmVFYnlZSERhZHJjUVlZS1dSU1J1L2tpaUZIYjM3MFZZQnZlMHBZaHZz?= =?utf-8?B?MitIVm4rL1NjS2x3M2R4SUUyckRpUDBIclM4RFdZSXl3MTkyVGJ2VW9Bc3Nx?= =?utf-8?B?MzltWUJMUWpoVlNYUU01WVpIK3BYQ3pITjdGd2lGM3l0cVBad1VlK3IrWUhO?= =?utf-8?B?NTlydHRlZklCNVpJeW5nNWNhKy9yMjJZaER0N1ZrcDNyS3hYK0ZtSnp5YnRt?= =?utf-8?B?U3UzbmttVWxOWTU0blJVNHBUZnJUUWZyc0tOQnJ5WjkzTm1Tejl6Q0k2NldV?= =?utf-8?Q?OYhvXe?= 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)(376014)(52116014)(7416014)(366016)(19092799006)(38350700014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?KzVVSjg2VXZmV1hBeU9nbHpLdzcya2VXSlVpN0I0RzN6Z3FRY3BZTnBSckMy?= =?utf-8?B?SGZIYlZiRUhzWExyVGlzWTgreVk2NlNxc05HTVNqakNBSjNmTDN2MUtabEhr?= =?utf-8?B?VitYVjBQLzF5N2gvZDJqQ2ovcEFlNFJZdGtRbDM2eTM0UTkwYnlWd2RhSlZx?= =?utf-8?B?ZStTSlZOTXpiN1I3V3JMRE5xcXB4NndIYVVjczlTRlRBdWtrdDBHMk53TzI1?= =?utf-8?B?T1U4RVJsaWNicTRPb3c3T0dkc3RyRjRnYWtPTkdvWFcwNlhKRU5DNW1OYnVu?= =?utf-8?B?MS8yN2liUFZlQVN1OFdUczh0NjVNbm0rVTFrNTJiMnBzR1lZYjZweHlLcjBG?= =?utf-8?B?LzZYSjdyQmxzdnV2TXdDK1JKelJBSlBITVNMU1dXcnY5Um5tV0hjdWFONFRD?= =?utf-8?B?aUpHZVpiNmpPUDQ4U0N1cmRqTlZDRWxmVFpGcTNaNkxHNHJnWmdEeEdVeHJo?= =?utf-8?B?WFRaWGk1dWFLUG1PdUk1WTRSYXJzRmhhRWVxOGc0SDJOeWEvajNjczZjMTdM?= =?utf-8?B?bHU4WWdEdjNOQTZiUW04bWUxL1ZZNy9PRFZpY3FYZi9DZnNrQ3VwdTkxTXJU?= =?utf-8?B?R3YySEVFVEVJU2c3YlJDV1lTdmlBbDRuMHFvQitjaHhtOEZkSzA1c2RiZnZ2?= =?utf-8?B?bE40ZnY3a3ltMVB3K2tsY3VXelJmSzE4emJNTDRwRy80QnVSdnREZEd3Ykdo?= =?utf-8?B?U3pqNXhJekFGMDl2ejlqdVhFZjRZaThwUHZFWXp5WW5wK2loWnlQYXJxQi9J?= =?utf-8?B?U3AyTkcrelo3c29raVdsQTBTMFRqakRmS05wYXhnRVhyUlp5Qk9OU3oyNEw4?= =?utf-8?B?b3hUS0IvNDhLbmdEVks5d1VIQzVENmozVjduRVpPeW82ZGJQOWFIaVc1bFpa?= =?utf-8?B?QkRkZmZBS3ZaZFJrNkI0Yy9LeGJUWVlFUTN0MFN2YmtpVFBJS090dEhmakNv?= =?utf-8?B?MGdhNStUVk83R2wxaGpoc2h4bjJxdGtkQzdYQmZZUEFwcEtadVd5QUdyL1Ur?= =?utf-8?B?NzV1enprRGNHcXF0alJhUDBNTmxyczUzSE1vZnE1OUREb2JTLytwc3ZpWEww?= =?utf-8?B?OU1Ua3ZKWUpBSzlvNWpWWU95SUszTmE0R3RrQXllcDJMUHpESVFKSUorR1JS?= =?utf-8?B?SmpyeU0rS2F1OGdWVEFDamRhbE8vOHp4ZDVGbWU1R1IzVFlzZmZ6K0UwWTFn?= =?utf-8?B?TjRLaUNuNDlNbU9pM1Z6OWFGTGhLZVYrS0RIRW54dCtYYUhHTWRheWJQWkkz?= =?utf-8?B?ZGsvMmsvemdxSEExZVlDaFFaVTJHby9UVzByZitpaTlxRS9sdC90RVNOV3Rj?= =?utf-8?B?N0ZNeTA1U1VyY0lOSnIxNW54Mm52Q21CaFZYRkVnVjNMdGVYVFA5UGlJdEY0?= =?utf-8?B?V1dFdWlBcDVRMDVDaHJRbVk2RUlFNysrWlgrZzREUVRwcXJvSlVEcGNQaGth?= =?utf-8?B?MUkzRFlHYlBHejZucER3WjZxbjlYMmdScjVDUC9LSm5Fb2ozQ2RhRUwrZG9Y?= =?utf-8?B?RHVhdXpvdjliNkY0S1V1Nk1JWmtxa1haTVFsY3JpL3dVeUdhNjdlY21mb0ky?= =?utf-8?B?V1ZEV1k1MzJYbVU3aXlJQ21CeTNlWlNYbFVUQm1KMnRBQ3p3WlE1enRBYWJP?= =?utf-8?B?WFpqNU9GN2MyTDdIcTA1aW81VWZxNnV3bTQvSjZxUlI2NWdWc1J2VGtQdU5a?= =?utf-8?B?TXI5bEc0dzdWVXNpUE81TE93M1hEY0EyMVR4RGpIcjFETFBzbjlIMUN3TkdW?= =?utf-8?B?MENlUFJ3S0lzaVFDdU9lbjIyZHBVdHg4ZklqNG9pZHVqamtoRGhiVUVJb2RR?= =?utf-8?B?K3h0aithaVdYUWxsNVhuVnoyTEE2bWtqaXNmMUQ0NHByTmhoTzdhS0h6Q0xo?= =?utf-8?B?S2RrNExwVERwZ01waTVVY1RYSEhZOG40WkRTMVg4Z1BWaS9VOStQaGtmN2tj?= =?utf-8?B?ODRXYjA3dHdKQjRscmRFbnlwYVBtdU95eU5CY2NKQjFZOUlaWGZOM2hsWWdU?= =?utf-8?B?U0VOS3ArZ1hmV1BWanh0K1lVZVUrSTFYb2R6YTltZzNBL2xsbk44eTltcjRt?= =?utf-8?B?ZzVwWmsvL1hSS3RRTGRZdlE1TXlLL2U4K0hkMGhNS1JValE1ZW0rbHdTSWND?= =?utf-8?Q?duoCXLmw37V4I4mY88lgYbgS5?= X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 459b7698-269d-4f28-4288-08de216b3b6f X-MS-Exchange-CrossTenant-AuthSource: DB9PR04MB9626.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Nov 2025 21:42:37.8296 (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: ll8fumfT9VP/DCMTp0dSGS4ZMSulxjNGTkE2ENoHz3nj/TAxaKpdWVJeuenYU/MWGPnlzHXlglGJipDg7zGGbQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR04MB8401 Replace spaces with tabs to align register value definitions, making it easier to add new entries and maintain consistent formatting. Also use a space between the type and field in struct csi2_dev. No functional change. Signed-off-by: Frank Li Reviewed-by: Laurent Pinchart --- changes in v2 - struct use one space between type and field name. --- drivers/staging/media/imx/imx6-mipi-csi2.c | 84 +++++++++++++++-----------= ---- 1 file changed, 42 insertions(+), 42 deletions(-) diff --git a/drivers/staging/media/imx/imx6-mipi-csi2.c b/drivers/staging/m= edia/imx/imx6-mipi-csi2.c index dd8c7b3233bccfc34b59e0f0ff813b36752e1526..1113ea2a37f03753423164069b9= 5c049968cc0af 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 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 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 v4l2_subdev *remote; - unsigned int remote_pad; - unsigned short data_lanes; + struct v4l2_subdev *remote; + unsigned int remote_pad; + unsigned short data_lanes; =20 /* lock to protect all members below */ struct mutex lock; =20 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 17:41:51 2026 Received: from GVXPR05CU001.outbound.protection.outlook.com (mail-swedencentralazon11013048.outbound.protection.outlook.com [52.101.83.48]) (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 DAEC9326955; Tue, 11 Nov 2025 21:42:48 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.83.48 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1762897371; cv=fail; b=sDywh/8b8qAAlFZ+8gbKZucjL39Dkh1PEZ4BKNQBiMh3hq8V9euovZXDjYjdUjXqNtoXnCDbXc9AsieuGedOoImoNlE3symP+cMcfroBYh5BkLVanbCLHriTj9PRg5hPsi0V2I3zWlC2HPmQl8J1qH7qw4W6fR1ow9cKgX+Eq0I= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1762897371; c=relaxed/simple; bh=CGjDzRXz+eQXEoJENI8tLIYhP+g0jZuTr4Gv8ve0irI=; h=From:Date:Subject:Content-Type:Message-Id:References:In-Reply-To: To:Cc:MIME-Version; b=T2K3vMdmYnDfYCUXrOZJyRSoGqKu05ahrhRdNQyfRBOfrzQPDbHM/M4d8ztjJdAPGejm0Rh50L3w9b0D2atdIgfe8ZjoPFI2VL4+vgsIxvpB9Jeb9vtw3g3ZszkL4A66qXIiSPicorqdW6uaHMcS1FJdCHWQOLvPilepstvaLw4= 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=R0lVyfmV; arc=fail smtp.client-ip=52.101.83.48 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="R0lVyfmV" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=mrxKMcC3fWQ9UpHZt/Ga3qay28QCAep+pR2nmkdwNP7r+NitZ8ZESI8NMwyySmDZPnwmd8ZKUynzhD9aEirf5qAYcle2ydiur2Hx1Q331OXRr7nWhSn36pJW2AE7F+LEaqIWexe4C1QBVQ/I/Vc7OHKFdwURAVdzzXohQ/b7LVmfRbZAn7rwFIS9cnHl3Z7UQuiVeV87a8fhx02OLwrn4uYAZTp2yiSuDNYihHEIVac5075QUg8E2TPkccATNxUJ1DoXXdD4iYbfbT/SMeYpO1kUoetmrdNbHxZPlH0sW2mL5QbnpgMyBgD2ptbgHK0bmC/Bcseids4/+1sGRq+Xcw== 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=4KIAOBMOSnd4359GMBHbIy2cPl2H25yHCjXiRW3frPk=; b=No7VBOWSM0YFc7MJ34plNOrTCuMpXHC48eBP8DBFZw96pE5F8aTolt3ZoIKtqdKczvx5NZdWbkHp8wxLKhKLizAiq91dDLUNwrekZCiTnDmy57Ywi1eob2UfrQ0hkpmw+XYbcOrFX/QCYk/Lns5KHJhjmy1VrZ7SA7c+2F7ZEIHEFySLd2RUXa9XNHFpC1JVt/SRZ+N3B1ALd3sWRLCtP2Vb/IvR8n8uyFFRlJUfhyJk4dF2vBwfrzhbh5zbc7MtHyj+Fy0ipkNjD7K+M1U132f3uDIWzllbMbGSCnZgBr8KY2O8g20l62+s+OdUriMIDFuPdL4SZB1ZRXuA7ay0jw== 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=4KIAOBMOSnd4359GMBHbIy2cPl2H25yHCjXiRW3frPk=; b=R0lVyfmV72adVA+qj/c/BWBPqB+qBm57VttDOPET2BlOGFSYZbk+XSV+snwDMdmCtX4YnJx/2q3n346PsCb7hfV0qZthCK/FOZtcIwX6AznGViW0op36SQQhDDEWhqNpaZV9cKONVNzJLzzSY9PcLo6pN0Nurvi+TpIRZiBkAQ4quoWRzcc70Bh3y2hrHh55kyc4nCuDV2jB8eKhI69o2Pmz2y945E96ulQeSP+B+kEkR6FGE/ura8CdsGX6S5/vxSOJOk+Is7B33gY41tremctdyzBBqq6TEwuoNgWvo4CJpdDT6Zkdn35g6mXNUV0vBclC0QFwt2DhVKM3ume7SQ== 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 AS8PR04MB8401.eurprd04.prod.outlook.com (2603:10a6:20b:3f3::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9298.16; Tue, 11 Nov 2025 21:42:42 +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.015; Tue, 11 Nov 2025 21:42:41 +0000 From: Frank Li Date: Tue, 11 Nov 2025 16:42:14 -0500 Subject: [PATCH v2 2/5] 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: <20251111-stage-csi2-cleanup-v2-2-371bb951776f@nxp.com> References: <20251111-stage-csi2-cleanup-v2-0-371bb951776f@nxp.com> In-Reply-To: <20251111-stage-csi2-cleanup-v2-0-371bb951776f@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=1762897350; l=1541; i=Frank.Li@nxp.com; s=20240130; h=from:subject:message-id; bh=CGjDzRXz+eQXEoJENI8tLIYhP+g0jZuTr4Gv8ve0irI=; b=g8ew52iRmWoAYwm3FK+Qh1xlpOoBADjsnTzV57ylK2yat7OukOzXbQ3l+yP4+EdRkIT+Ns2Nn dWlBhRMny0fC1uTGXr75ImmivjAm11yhL6+gWC6DD6Qp0wrq/O7GBfX X-Developer-Key: i=Frank.Li@nxp.com; a=ed25519; pk=I0L1sDUfPxpAkRvPKy7MdauTuSENRq+DnA+G4qcS94Q= X-ClientProxiedBy: BY3PR05CA0044.namprd05.prod.outlook.com (2603:10b6:a03:39b::19) To DB9PR04MB9626.eurprd04.prod.outlook.com (2603:10a6:10:309::18) 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_|AS8PR04MB8401:EE_ X-MS-Office365-Filtering-Correlation-Id: 1a45673e-0628-4094-e1e0-08de216b3dd7 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|376014|52116014|7416014|366016|19092799006|38350700014|7053199007; X-Microsoft-Antispam-Message-Info: =?utf-8?B?T1ZNZm9ySGdzWVEzK1doM3I0UGlTRzZtUG12QVVHMjlZQmg1VGlJVEJKQmpU?= =?utf-8?B?VFkrTWJoNStTNDBnRllKQ3ZFSzd1enJWUkxCdjFWVzE1bnp0NVRvZFM3RmJ3?= =?utf-8?B?aFRTYXhKbU91d05yWE1XTmVFbnRySjdZek9aT0lERnQxckhLSTdweXg1dXBO?= =?utf-8?B?b3l3a1gzTnlkZkNvd3ZDV1dPOWo2cDhYMTk2VnJtOWJCcWVvNHdPY2FBWnpw?= =?utf-8?B?RXM5anBvOEZ3RFlWT1NqdmprM29NL1dCV1VoSUhtNmdNY1JjdFBCZ1daUFE4?= =?utf-8?B?SEl1T3JGR203OFl6VCtOKzRkNzh4dTRRVEpEMTRDRGRwd3JhUFNzaGVwWDd6?= =?utf-8?B?RVFIUGwwRkNmMGVEVHRxTjhkbnAvNENMa0gwdlI2Rk44V3Z1VnppV3Yxb000?= =?utf-8?B?Q25Od0k5VHJHSGVrTkxOWTk3bDBEWjFzYWFXNEhvQTBFUWRzNTU4SW1tM2xj?= =?utf-8?B?Vy96akNmY1h6TWhrbUtqMTA1R2ZDeEwzRnRZMFd5Qi9ZWTg4aUh6ZUNpeGpm?= =?utf-8?B?Tjc2cWw0QnEwcHlHbUVhYjl0blR3eUdpMUp6cmlLaW51cFhDdlNJVTM2aUFG?= =?utf-8?B?MmdwVkFWUm5xc0l2OXFCd3JObitqL3g5UUFLVFFnUWR6MEJCZmRQSFVMYy83?= =?utf-8?B?Qkl6cUo0OEdzdHZNVXJlTmJtMnlockJuUEl4WTdvaDFWeWxuUFMwNEI1Z3hs?= =?utf-8?B?TURaZHlOa3YrTzdlbU9hNWl4SjhSdTBqMzNlRGRvRTBoQ2k3OHR4QUhpc0o1?= =?utf-8?B?a0xGcVA4K0xLd3VaWmU4REp4VndrTHZwcEs1dE1BSnVLRllRbVlBcXdpODM1?= =?utf-8?B?Y24zTjR1VXpNbE9ZS2YxMWVMM0JxR3pEa3c5YTlYcjJTc1lSL2w0OHo4Zkc1?= =?utf-8?B?WnBHbE40azNXY0ZKMEUrMFBKMllxanpGOEUwcEsySUwwdTc4bzY3N3A0WXZp?= =?utf-8?B?MExwVlpHSmdleFF6YzdwYW1oUHI4SnVscnpkOWNNUFlnREJ5UEludi9zaGlZ?= =?utf-8?B?U0xoc00zcHR0bXJvT1lsbzRWaldPcXJpdTlQWjBJSk9teWkxbGxaNFptVndM?= =?utf-8?B?a0U4VTNKT0JPR2IwS3I0ZE1NWTVTc0Z5MkUzTGc0N2ttcWkvZ3NrRFZjWXFx?= =?utf-8?B?eFZKdDlKQm5PWlUycVVBQzgrTkRlWGlEYkhzNDRaOHk3UU41dXVqNHBhSjVu?= =?utf-8?B?a2NtWTVLa3RoSkkveWFBSTNuYjlYd1N3b3daSFRUYVJUYm1BYitoNW1GL0U3?= =?utf-8?B?dFlxQ3R6N3FxM2FMNktCRGhBMk5HckhoTVBKNG5sa3Q1dy9SditrR1NlMTRt?= =?utf-8?B?aytEL2RaL253N0NKK0FvcmI4OU44Z1BOcEtEczk2RWgwVC96RDFrdFUwRnF6?= =?utf-8?B?UWVrcXFlaE4rTk5USTZuRjBtbFVKL0lhTmpNQzZxb1BNNmFEMDl1Vlo3azV0?= =?utf-8?B?dnQ4eS8ydnFNZ0pVSVJmbitySURjVEw2Q1c3OG5nY2E3RjJ3T0IzZjN1YXYw?= =?utf-8?B?YmhxNzMzZkx1ZTgzOUFuSHdxZko3Zm45azI0bTh6Y01hbmgrWUpQN2F0Y3Vz?= =?utf-8?B?c1FEMlB2dTRKZjhRUVlNR21qSnoxT1ZXYzZvWXJiQkJDQndwTFNCNTZXQ0U1?= =?utf-8?B?dmdOK2FuK0NRMWlhTzFyYXhCeGxEZzFXQ2VSY3pGUmx4NWZKNTk2dVpQZS9o?= =?utf-8?B?OFFQaW0rSHJTbG1hY3JGdkpVSi9aWlUwU05FQ2gyelhZb1VwSU1jN2NVaFRm?= =?utf-8?B?SFBUODlOMmFxTXNoNUxJd0RKay9YUXpBa2c4OTJsY0lrWGt1OVNqOWYzN0lO?= =?utf-8?B?TTZxeEtwR0pJTHFFMDdDY2hoYVdyaU1HOTNhNWtNMXdycTVDREp4VldBNDhX?= =?utf-8?B?SUZYdUQvOTRDVWxrV1hPMFNTQkZXOUhrZ0NhODlobW1jV3hSdUhmaXNBWHY3?= =?utf-8?B?RGEzTDMxTU5keldEWU9EaloySmhseEJ2ekFzdk5XMlptclpoRERNeVROUHJ2?= =?utf-8?B?aElBRVY1RWZkR2s1UHRWaVFuNGExbFR1V2d2UXJIM1dxR1JTUUxVQ213R1pt?= =?utf-8?Q?+ERfbS?= 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)(376014)(52116014)(7416014)(366016)(19092799006)(38350700014)(7053199007);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?RlQ3TlYxYkNuRHZoeDY0SXowOVR3aXlnZDcrNktSa05ydG1uMldXZmdxUHVk?= =?utf-8?B?dlpSdTl4YmlIQzZiRGI0K3ltV280YTdFZ2RoMGQrdHZVMk02ZWpEem1Nck9R?= =?utf-8?B?OFJmT1BZbElnZGNNMy9YSmk0N21tOEc1RlZjN0hOaVc4Wi9vTGNhbUNwMWNZ?= =?utf-8?B?Rldhd2pYNGl1bjVqWG8waHloVEVSc0hSNER1UC9TR0ZhMFhWaDA0Z2VPS3Rp?= =?utf-8?B?dER4dkJETmJhbGpSZXNVNTF4RDZZRVVUdUZWT0dZYkJxc0tZYlNVK2xtZUh3?= =?utf-8?B?T2pqc1o0dFNZeGdEcUFGZ3E2c2lSUlZhd0ZKT0JneXFOaFpDZjZJNzcvWmJW?= =?utf-8?B?U3pUM21PQkdQcktPUkQ0QnFtd1JLb1V5Y1EzMS8wNjFKODNtRHBSdnlFRmlG?= =?utf-8?B?NGVtSWxBcmxiNU8yYW43OWdFUXFoMDFGRUJTMGtmSVR1YXcvSWhEM3QxVlNC?= =?utf-8?B?alpkL3ZONXV5YkxLTTUxYWhaN2llVU81WU5aT3dOWUh1cWNWMWhYNnBzbFNi?= =?utf-8?B?cjYxaklvdW9TUTBCZUpZaTJzNUxqMXFQK3Mzb0NBODNRbUIyQU1IRUV6cDVQ?= =?utf-8?B?UGNqeDlJdE1INGdGSktOZXpUQ1Z2eks3SDBPTm9mb2hrRjluamFyalpGR283?= =?utf-8?B?aWh4LzVQd0I5Uml2cXl4MXBOblJaYXI2a0xvazhKcXhEYXNEY21QV3FMYy8v?= =?utf-8?B?amtOOWYwQ1JwQVM1a2wvUW1RdjMzdWlGNU5ibkQyWGlXckJnamIrUVl4eU5n?= =?utf-8?B?d1BZMlBxVHJxcGV1ZjFoeitTcnJzZHhqWVNrV3dJWVVHeXIrbENBMnFackFD?= =?utf-8?B?R1hHOFByemJKdjhKR3dBSGM5L0F5dW1zQWRrdnF3MysxWjUzV293R2JoZzJQ?= =?utf-8?B?T0xQcUNnZzduSTlueXdNY3E2OWpoRlFlNVI2UTN6WGMyaVIzWTI1R2RSRVIv?= =?utf-8?B?RDNpOE5kSUZyczR3eGRZazNISFVZNzBZSEpaSWlDYjQxQTZHQlZncnVWc0hN?= =?utf-8?B?WDd2NnRTU2FEUTR2d1B6WmZOSmplVXl1ZlA5ZTUxdGRsWGhMd1dxcXFKcmpa?= =?utf-8?B?bGErMjFUY3F3Y2gxaEd4Sng1aTA3WUZnZ2tZN2NTZkRZZWJlNkoxWEhQaFV3?= =?utf-8?B?aThkR0UxanpxWXhaT3RZVnZGeHhEdWszaVV2VUFoQXN2a3hKY01tUnI1K3lt?= =?utf-8?B?cllyUVRjbHJIcHFJMWtDUUM2TWFBMy9CZGR1aXNDeTF0QVNxZFN3K201bUsr?= =?utf-8?B?ZXhmdnJXVlpjek5ET1lrNVJTKzN2cXJKc1F4ZVkwaHZCSmpqWUcwdnlha0R6?= =?utf-8?B?aG93THJFODdnVTUwcnYrcjA5QTJQK3NTNzJPem44eE1CQ1FsTWJMTlRvNm4x?= =?utf-8?B?TWExQzJpQnBsbW5YMFlkTlVSYS8ycUhqRkl0bUJaTzZSeXFIZFI3VDh4a1Bo?= =?utf-8?B?OFcvMW9tSi8rdHhaTWJuZXhsNmppeElLWnVsTzN5N1ZQN0xrYndFWDk3NE9r?= =?utf-8?B?eU1jZzlVZlZvNHhUaXlMa2FLeDBJRUdiWFFLOGdMYm5haTlkeHdSSFZNM1VB?= =?utf-8?B?Ync1UDRoODBzSStoZTFEZ2k5alI5RXVVdVNkVnNwRVVhTGVkWmNkNzRzNmU2?= =?utf-8?B?dWd0YTlrYzI4SFFQbzR2TXlOSGs5YzUrb0pJOGNWa2U2a2JvOUpZN0xxTmt2?= =?utf-8?B?NEhTeS9xNlAxNjhZS2xHZitkTHZvVUNyYTM2Z2Exa0Q2TGxSWWVLS2lsZHE4?= =?utf-8?B?QWREMnlmZ0VuRUthY2ttYWtEN25Zb0V4SDZtdXR1UFNrdFRLalE3bDhJdWZx?= =?utf-8?B?aFJrS0VZZXBCS0xIcVdUQ05ZeXlIQWQxVk9va2V6Rk1ZTVJBR3hqMVQ1MUdq?= =?utf-8?B?VHNtT3F1ZkFHL2ZUalF4UElCRUxwVVpjZW16WFdYZURLcnRtaC9ZeXZKM29P?= =?utf-8?B?U292MkVRV2xlNmxMUm1lQ2sxZ2FBbnlGZnNPRjRHbEd6ZkNiNHNKTFBGZzR5?= =?utf-8?B?a0UwMWltbUpmYmQzMU5tUmV2aTRTQjRXN0FwTVdjeEZ1NXpTek1kS2pIcURv?= =?utf-8?B?V1M2alZLNm9GVmpoS2xrcXpJT1ZpN25yelkvYUpReGFWZjNXcno5R05hUWd6?= =?utf-8?Q?QZotjLwkVIApZnthB3i3C3/zX?= X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 1a45673e-0628-4094-e1e0-08de216b3dd7 X-MS-Exchange-CrossTenant-AuthSource: DB9PR04MB9626.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Nov 2025 21:42:41.7612 (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: 9/7OV63XuAmfnc5UWNR1X6yXvw0X3gfWE7AdhVgirm1n9Ca/84nbtezvfyE6ERWKC6X+lCBE+JvZ1Hpk3nPwxA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR04MB8401 Use devm_mutex_init() to simplify the code. No functional change. Reviewed-by: Philipp Zabel Signed-off-by: Frank Li --- drivers/staging/media/imx/imx6-mipi-csi2.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/drivers/staging/media/imx/imx6-mipi-csi2.c b/drivers/staging/m= edia/imx/imx6-mipi-csi2.c index 1113ea2a37f03753423164069b95c049968cc0af..4f740170d2bbf586ac0a58b5d25= f8f8432e9e6a3 100644 --- a/drivers/staging/media/imx/imx6-mipi-csi2.c +++ b/drivers/staging/media/imx/imx6-mipi-csi2.c @@ -777,12 +777,14 @@ 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 ret =3D clk_prepare_enable(csi2->pllref_clk); if (ret) { v4l2_err(&csi2->sd, "failed to enable pllref_clk\n"); - goto rmmutex; + return ret; } =20 ret =3D clk_prepare_enable(csi2->dphy_clk); @@ -805,8 +807,6 @@ static int csi2_probe(struct platform_device *pdev) clk_disable_unprepare(csi2->dphy_clk); pllref_off: clk_disable_unprepare(csi2->pllref_clk); -rmmutex: - mutex_destroy(&csi2->lock); return ret; } =20 @@ -820,7 +820,6 @@ static void csi2_remove(struct platform_device *pdev) 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 --=20 2.34.1 From nobody Sun Feb 8 17:41:51 2026 Received: from GVXPR05CU001.outbound.protection.outlook.com (mail-swedencentralazon11013048.outbound.protection.outlook.com [52.101.83.48]) (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 D85AE352F91; Tue, 11 Nov 2025 21:42:52 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.83.48 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1762897376; cv=fail; b=ejneD72RfUa7NxVRQryMioUjgN0LFjtTC8iyfWCWrCoxj174WtZsd39S75wp8U40sQMqz5TXVz6Yj1d5bp5hBih8aTe7DutyUHEXix590DfVCfYIbk8VW0+Ik81/NQt/qj/Jq1tdBlDUIQEzb2MxjjDvpoGudtNS2fjF2TB6Hf0= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1762897376; c=relaxed/simple; bh=821JGvweGkZLeCSbUFTn/43wIZ6Bq2oJDylytEPu72k=; h=From:Date:Subject:Content-Type:Message-Id:References:In-Reply-To: To:Cc:MIME-Version; b=KHOBwNUIxqRHzQHakDfWmiA8wO4+9fXGFPskfMA7gLPHplQzLjyzG/MgX7Hr7Nh4cx+c93VqAEHgWFmRo9pQmgSswHmJnYQsy+DROep8pMCPs0bxreoW/lhZQFqhA058ZKgDL5ShZE6rkBnoPVGChKj4y/c5IYmM/ZknmgfM2t8= 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=SwP5+Ca3; arc=fail smtp.client-ip=52.101.83.48 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="SwP5+Ca3" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=C0tG3uBAyYSCs/AHwo9+hi2D4ST3DbKJqW84clWFvFIE1ou5VaNzGJrhk/G6qJoMWvZutCgbsiOYgVNPR8VY1c3HlltxY9R1GxjAw/s0VYzWjdLPS+MUIfQTiEkkay/MIplwKZWiKHVBH0Nl+iqYOhS6edtwNcxtJKHx9uWThylHInoapnL9AW5Mptf7/bzpJGHj+zZHZ7woS6Z6LjVCpcX4rxqhQ3LnK+plQ91lTR3QOF8HXqG66BVXKvsOLWeKwS9PlWZHwgvTqgcgaVh47zL5OiEIuorgjqpPlTqZfyX4i29NW2BWEocbIlHn6UH0K1NxZLZLNETU2S78lxGqdw== 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=Ul57GZxBQ5hVeglnhBoJ4mLRK8WpOeZqpkhL4ytFbu8=; b=J58jJwe6xoKWbVhiTR0Dk72LiJ57Wt8sAMNVvyfl6TNSDI5B60BTiUN1CLsW+xM6kAaaSqI812eRfXRihFxAuUoYJOKau735adkQj6oSsvceohFZC2t+P+rO4SqS1shdlFhgUmwDlAm33Uht3DwB8wqS5bMR9ViK3jSFikON/2RcHk0KRoN047ffR/kaQAnLhoNKrV2gmEuEeW8lEhCg5G5EX5qWiHHiNonhAXvfGMNBtzaWMCa0XDdrlJrICRLwWmk6ThU8xGR0iGw+Sx+b+oCtRzhcC3DtRzRktUsyOg6DCCjFl7MJwaqq2hML8Yy1JwE1RfDrLQerwrfWn2dVug== 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=Ul57GZxBQ5hVeglnhBoJ4mLRK8WpOeZqpkhL4ytFbu8=; b=SwP5+Ca3okM/KjC2ghGLxzXWmQt6vh46maE7tb4T4PDe7UZ32rTKY68p1Vqp/KutLFcFIqSM/hevirODvbGO7gJ2p3l3l1NL/ErfUaW9JH8B6x9j0wKYHOib9wTnJxWsv9jbsJCK1Cd20gWGmxpW8QZ+zEjoaBqBEAoFowJzOPb02o2G3SdJa8JM/CHayd24xCvkIcJ9FMRknmtMsa0apmOI0PEhSl1UOUZS6em9WIN3DKOz/tWqvi7Bqh92yHPXvO7q2CdumSmGSs5h00vmMJOfzGr2Oa9Y7YO9J/H+3f0Wei9YI9r2q3z9KHmA0ZBNuzZdfcH9V2pKVWXFLYY8tg== 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 AS8PR04MB8401.eurprd04.prod.outlook.com (2603:10a6:20b:3f3::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9298.16; Tue, 11 Nov 2025 21:42:46 +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.015; Tue, 11 Nov 2025 21:42:46 +0000 From: Frank Li Date: Tue, 11 Nov 2025 16:42:15 -0500 Subject: [PATCH v2 3/5] 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: <20251111-stage-csi2-cleanup-v2-3-371bb951776f@nxp.com> References: <20251111-stage-csi2-cleanup-v2-0-371bb951776f@nxp.com> In-Reply-To: <20251111-stage-csi2-cleanup-v2-0-371bb951776f@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=1762897350; l=4713; i=Frank.Li@nxp.com; s=20240130; h=from:subject:message-id; bh=821JGvweGkZLeCSbUFTn/43wIZ6Bq2oJDylytEPu72k=; b=wuBcoNIabt94lhJoPU4ZBzmwyelY8qpY4sgRDWF3+8wDZAlDi2iJxWYLo//yDQrjuRA5hsi7u iFYKjJ0hHk1C7XKKQo99h6xrb/ItWSbmozRphHI8L0kWBdpafDmLlvU X-Developer-Key: i=Frank.Li@nxp.com; a=ed25519; pk=I0L1sDUfPxpAkRvPKy7MdauTuSENRq+DnA+G4qcS94Q= X-ClientProxiedBy: BY3PR05CA0044.namprd05.prod.outlook.com (2603:10b6:a03:39b::19) To DB9PR04MB9626.eurprd04.prod.outlook.com (2603:10a6:10:309::18) 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_|AS8PR04MB8401:EE_ X-MS-Office365-Filtering-Correlation-Id: dd52d4f2-1648-485f-3257-08de216b405f X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|376014|52116014|7416014|366016|19092799006|38350700014; X-Microsoft-Antispam-Message-Info: =?utf-8?B?Zys4RDZqM0VQN0tQUWV4Y29iRGxUdStVWkY2aWNFYU9oNHRmY2plSm1BZnU0?= =?utf-8?B?KzNuRk5pZTRvZkJFVFFlS1ZOREJORXV2MEY4eUZTQTVhbmVPeGsxSkFZaDNK?= =?utf-8?B?TTZ1dTNTS3J6QUFKRG1hT0EzWkRDVE52TWE4RXZiOFY4dU9SMnRZN3R3ck11?= =?utf-8?B?a25FV2Z2dmZ2NTk5SGJ2V1ZxK2dteC9SclhvWG9mTmFJWFNJUnA1YjY2U2Vp?= =?utf-8?B?N0d0dXJReG51RHgwaVNEOXBVS2lkT3dybmdvYnAydUJwbHIzTGJieE5maGRa?= =?utf-8?B?NDljK1M3SVluZGhmdk5ud0N6SVg2N01rY0ZFaXk1T3g5RE42ODQ0VkhUZnB3?= =?utf-8?B?R2M1MWNOeVhORG9pMjZyenhicEV6UzZGSWkwMXdLQU5kejZxWWNPRUdxNkJ6?= =?utf-8?B?dXFOZy9JWlRDcEgzM0tUSkNyaCtTUmFMQkp1V242QlBCZ1pueTNraUdMUXJY?= =?utf-8?B?QUJPN1Y5VHY5eXZudHVPTlNMampUVi9mbGViR1Q4LzF0MFFnenpMWGtzanBl?= =?utf-8?B?cTI0ME1lbFZ5WVJIQjZTMXhEaGw0WkUwOThuT2EydkZLY0pWek0zRDRhZEwz?= =?utf-8?B?eVdNVHVtK3B4TDVGSHA5blVrSkRSUjlydEFKL0JCOHJ5eTZoUnMwRS9mMXJl?= =?utf-8?B?Yy9CdXJYVXo2VWd2cDk2Qy9TWXFRcjQ1VUN1dUVPdGc5NXNWRGNJOW9VVVRD?= =?utf-8?B?RzluSXdxd3NySk00bUF6TmowaVNFRmg0Ykk2NGEvODQ1WUhheUZrWXh0UkQz?= =?utf-8?B?RlA2NHRmVDlZN0llQm1DdGlwRFdkWDc3NTlTd3JzaXJQbGlDU0QwbC9GaWpU?= =?utf-8?B?YTBtOHNveC83eGhzc2MvbHFIY2J2bkdWd3NLUmhiRW1jcHVRYURwS0RkNVVt?= =?utf-8?B?OW1sYU5EREJLTzFHdUVta2JYbmFNQWNjUWx3QTBsanlQY0hocWxkTFREdkdO?= =?utf-8?B?NzVLLzNEMTBQaWxJM0IwTGxPSFZuVGFNZm53cmJpUkxiT3VSTHRxQktRb1lS?= =?utf-8?B?Q0l2VlI3aWFMQ0NUbEJFcmNYWmVFSHVVaCt3eVVHS2JrZ1RmT3lsZXFuM3dE?= =?utf-8?B?RFF2L3NoN05UVG5mU0x6ejRubXBJaUs4bU5ES2FFTW5BdVNIeGZUY0R2N0lx?= =?utf-8?B?cHAwaG5TSlpPVUMxVG93dERtaEl5RU5QbHhTZ1I4eGRobU5mTzF4Z081dzdH?= =?utf-8?B?Z2FvU2xYQXFyQXR4UzdMMWlDMjFHd0o1Y05OTkF2SkxROThWTjkxcEczVVlQ?= =?utf-8?B?QkFONUFZWVRTTWVxNFQ0T2RtcGNlK21oQVNIUkR5cFhpMnA4Ri92VXhreWl4?= =?utf-8?B?djlsRWdzRnFxdkV4eitEVzE3QjJubzJwRDZQdGxDejVPR09RS3BSajBTbGR5?= =?utf-8?B?Y2huNHA4VkU5Wk90VXhETTZFVHF3bjB1UDJza2ZzdEdJdWMwRlUwMkhkd2ZN?= =?utf-8?B?OVdSRjhPd2dtQTdKWUZYNjFlenVES2R5cXBEMFJ3OTREbytOL01UbnhOTjkw?= =?utf-8?B?UkMxM2lwbUJ1RkgxbndWUUJ3NTBXeXlGZlMxY3V6TDExUDlLZzFiRlNJckFi?= =?utf-8?B?bnRQbGZ0YnBJLzcvRURwK2RRNTRFdGp6OWJ4b2ptL01DcEFXUEpIYVNaNzRZ?= =?utf-8?B?c1UvZ1RjSVBvSldZS1BGcHFjUlVvekRMdFBGZFQ4dUhGTXM0ZU1vc1pGR0ls?= =?utf-8?B?YUg2ZklrVUlPMW5iaGFRaDJHTitUbG12Q01kM29DeCs2WEtRK0Y4L2ZaYks1?= =?utf-8?B?MGQ5NUtRbmw3OGd1S29qU2RpMmlSZ3ArUkdMT09EMS8xRTB2ay9SZitBb25X?= =?utf-8?B?MlpLeSs3TDRlNSsxVVdZWUtNUy9DNDRQcDlHN3BFcEJoUzJzNEllVThCOHlZ?= =?utf-8?B?cWY0cGRsN2ZEZnY1VnVkZ1MreFlJd0FLSmUxUnNtNXhuZHVrdVZYaTFaVnNm?= =?utf-8?B?RUdMQmE2WlpxVnJxY1IyakFKbW5PNk44UnAwR1Bha00xcnRKU0d6NHRjdnNs?= =?utf-8?B?OU5Cc1dLZWVHZ0RORGNySmZTVjlUQ2Y4bEJrQkRub0NCQWYyd25PMnVkR0Zn?= =?utf-8?Q?VZjFtO?= 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)(376014)(52116014)(7416014)(366016)(19092799006)(38350700014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?bHo2NStBYXJoWnZkZTgrY25wUnNvYy9YR1RZMHJFODJ1NU52WXJQVXdOeHhF?= =?utf-8?B?VWdlVmFmYTFFZVZtQTV5OEdoQzFHcVBqWW5wcFM4Y3JGakFvaWw4dzFXdlJP?= =?utf-8?B?SVJVdk14TE9JRmkvNTB0bmZJanhaVzdwcnJJb0IrbXY1VURPdEUrQitsTTJs?= =?utf-8?B?dytkRG1ERlg3UWpiM3JLTUhXNGFwTExRUVR6em1JZkxxTTIrQlNtS0Z0azRx?= =?utf-8?B?M0VwZ21wNVhlTEZXY3BBcHNJSS9nT2JMMkc3UzB0TndQODZNSjZVTWIrOVRj?= =?utf-8?B?eWFTRDdXZEtBTHg0UmNURjRzbUtqYkJSdFNRZk1UUC84YzMyd2h3VmFBV2F4?= =?utf-8?B?MGtKZUhndTQ2em5RNGZkdkJyNzc5emhZQUpJZEx6dXJzd1VQcm5mbS92bUxv?= =?utf-8?B?QVc5RjFlWWdLaDZmMFMyeUtzcE5LTlU1bHBrOTlJb2ZINWV3cjBtMktLUHJI?= =?utf-8?B?eGZaQnYxUGJnWUFzWllaM3JkMmgvUEw2MXh2Z0JKY0dyeFBtSzVZcmkvN08y?= =?utf-8?B?RjZpdk5aNVFkbTJpU3M5eWZMMUdEWjhod1hhSnp6OG1uak9sYWRpT0VoVnRQ?= =?utf-8?B?bWZTb0tzZmY0S3Z1bmRycHR5b3NWb2c3bFR0dWMyZUhad0dpcFlVUnpGQTJP?= =?utf-8?B?RkFqYTBkd0J4YnFFQWh2NjNpTkVTTmpvdEIxZStKZHFCTSt2bDYweXYyOWVD?= =?utf-8?B?MzZ6dnJiVW5vcmdVL0V0RjZkVFpuc0VHZGs4WHIwdEpPQTBJZDNLQ1NSbjVw?= =?utf-8?B?TElOUU50L1liU1BiLzgrVmtmT1J2eXZpYk5LOEhzTnYvdGtJRlNpcWxNcTlJ?= =?utf-8?B?bXhoM2JFa2cvYUZaNGRKRlYzcm1ZY2lpT2JSbmhPdkxIcm9lNkpyNFpRQUVH?= =?utf-8?B?MVE2SUhYUU1qNXJ4ZlNRVjB6QVdydkljTjYwb2ErSVI2YjF5MGVFQTdSZmFU?= =?utf-8?B?dHAxRUVaS3VWODhLNkxPdHpUMFNsS2w0clowMHJvaHJGTkUrc0dRdnFUR1Vs?= =?utf-8?B?MFViSzhQUW90ZDE4ZFgvQ0xOK3V5NTFzZzJUb3ZwUWtwSE1mSThaRWZ1QzYw?= =?utf-8?B?bjU5SThmS1R2QnJEQkRrTkR2WXNPcG5kVUxBZUozU09tSmlVWXArZlNybEhB?= =?utf-8?B?elp2TDJDdGY4RjhLS2xaTFdkK2dORVk2aG9hMHlBL2NESUxINzJtdTRZeVpu?= =?utf-8?B?QkdXOVJNaWMwWEhvWmdxTUlUeFBJVlRvS0R1QVF2T1E5TVhGTnpoYjFXRkE4?= =?utf-8?B?cGwxSmcrOVdsZGUzY1hHRUI4K1FUY2dqbDB1bEx5ZGRxRnA4U2F0WXRFNVRN?= =?utf-8?B?N2NLMHBRM3FvcGxRVDVnY3I1cXoyUDR2RGkwWmJCZ0hUcDJMdHlQVVB6RHFF?= =?utf-8?B?Z3VhUWVESGZWeW5QS2FCRXVualNzNURqSVlSYmlEQ2kyTVY0VEV3M2pKSEdM?= =?utf-8?B?Nk5hV3ZxZVd6U0VpNmpWb2p0V3RxZEN2cGxXSmxURjZlU0hHZVN5eThZVWo3?= =?utf-8?B?NW1NbWNleW56MStmbVBFOXBRUUZhb0ZoRDNXWFN1dDUrekV1KzJYNGxPMTJz?= =?utf-8?B?VlBjdmZUdzY1NUlhb1I3MHhmNEV1WGE3Y1JPYkp1VmtoMkJWcE9WSHd0dm1y?= =?utf-8?B?Q1dja1ZRRXlOOFBMTVRkMVZwQzNpbVRJVXo4VGVyZWVEVHV0S1V0L0h0ck1H?= =?utf-8?B?Y2VkYWZKSkI5Z05NbEpCVFNKRndsRk00VWpaYUFjMityb05pSVpFMERqam4w?= =?utf-8?B?VTRvSGpRbDNDZjNUaDZVWHNOZS82L3VBZmN5OWVtRDRhSUxaOVFKLzNUbmto?= =?utf-8?B?MDNXUExOOEVWdzRCc2NLRUEyMUYzQlh6UnZkNHdCdk54U2JDS0l4NzJxc2FK?= =?utf-8?B?WVk3QlJXVys2VjJOQWhhdlZQM3ptcFBFNjJvWU83cndScjd3b1RWNXduUTZM?= =?utf-8?B?MlhiN05TdFlaSzMwWlFodGFlRCthVkNLcUpHZlpteFIzNE5qYis0MlpIejZo?= =?utf-8?B?dzRaMnhoVDBscmtqdkFtZ2ZNaUpwb3ZCaTg5dVN6dnNFV0RleUNLTzBxaHdG?= =?utf-8?B?cGlmMXhxWGJPM2tndmhZSmM2M1VPWXhUeUdxb21wb3BSV204a05ia1dsSENF?= =?utf-8?Q?U30oRjM3j+tlkuUe3atR4y3i3?= X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: dd52d4f2-1648-485f-3257-08de216b405f X-MS-Exchange-CrossTenant-AuthSource: DB9PR04MB9626.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Nov 2025 21:42:45.9525 (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: q8ZCw2u6HYY5fRuCaCgaNM6MdaZnFxND9rVN2Qj110/Jok0hlvEqzqHLGN/Kr87rfa+B9uRQLVgtJqYvdjWRdQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR04MB8401 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. Add clk_enable at log_status(). Do that safely because there are not register access before csi2_start(). Signed-off-by: Frank Li --- changes in v2 - add clk_bulk_prepare_enable() get at csi2_log_status() --- drivers/staging/media/imx/imx6-mipi-csi2.c | 57 +++++++++-----------------= ---- 1 file changed, 16 insertions(+), 41 deletions(-) diff --git a/drivers/staging/media/imx/imx6-mipi-csi2.c b/drivers/staging/m= edia/imx/imx6-mipi-csi2.c index 4f740170d2bbf586ac0a58b5d25f8f8432e9e6a3..e1b4b7fb53131ce9515b9441d8f= c420e85d3e993 100644 --- a/drivers/staging/media/imx/imx6-mipi-csi2.c +++ b/drivers/staging/media/imx/imx6-mipi-csi2.c @@ -39,9 +39,8 @@ 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? */ + struct clk_bulk_data *clks; + int num_clks; void __iomem *base; =20 struct v4l2_subdev *remote; @@ -343,7 +342,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 +389,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 +400,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 /* @@ -570,6 +569,11 @@ static int csi2_registered(struct v4l2_subdev *sd) static int csi2_log_status(struct v4l2_subdev *sd) { struct csi2_dev *csi2 =3D sd_to_dev(sd); + int ret; + + ret =3D clk_bulk_prepare_enable(csi2->num_clks, csi2->clks); + if (ret) + return ret; =20 v4l2_info(sd, "-----MIPI CSI status-----\n"); v4l2_info(sd, "VERSION: 0x%x\n", @@ -601,6 +605,8 @@ static int csi2_log_status(struct v4l2_subdev *sd) v4l2_info(sd, "PHY_TST_CTRL1: 0x%x\n", readl(csi2->base + CSI2_PHY_TST_CTRL1)); =20 + clk_bulk_disable_unprepare(csi2->num_clks, csi2->clks); + return 0; } =20 @@ -749,24 +755,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"); @@ -781,20 +769,12 @@ static int csi2_probe(struct platform_device *pdev) if (ret) return ret; =20 - ret =3D clk_prepare_enable(csi2->pllref_clk); - if (ret) { - v4l2_err(&csi2->sd, "failed to enable pllref_clk\n"); - return ret; - } - - 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); =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= "); + ret =3D csi2_async_register(csi2); if (ret) goto clean_notifier; @@ -804,9 +784,6 @@ static int csi2_probe(struct platform_device *pdev) 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); return ret; } =20 @@ -818,8 +795,6 @@ static void csi2_remove(struct platform_device *pdev) 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); media_entity_cleanup(&sd->entity); } =20 --=20 2.34.1 From nobody Sun Feb 8 17:41:51 2026 Received: from GVXPR05CU001.outbound.protection.outlook.com (mail-swedencentralazon11013048.outbound.protection.outlook.com [52.101.83.48]) (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 501CD35C19D; Tue, 11 Nov 2025 21:42:56 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.83.48 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1762897378; cv=fail; b=uMbn15uuFABMgJmP/Uqi9E/2wwtFqFnrVXUsGEMzbc+j3aY/VCwDiNXGWnF20WmwcoC6ZEHU+CDMXoUOFUIkBexfjjuthYRHTHh6HEVQ/wKUjD/VFFaIrkwd0kAHbdVzhqTq0KWuujFEx8XbCzPiCQ5of7lWPEnWAQV/6qQK/dA= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1762897378; c=relaxed/simple; bh=HUtJfZ5UwnVY167yFTUryLb7oW4vhVqma7POuJNTdq8=; h=From:Date:Subject:Content-Type:Message-Id:References:In-Reply-To: To:Cc:MIME-Version; b=CAAAx61/2E8jMqi++rlMH84htrUuA/xfpemsRMjCp2uLr10erdmQYjTYckiOby/cT7rFQ8fE78E1KXxEs2gmrMyvme4YQRPzybelvXadSe5ta6TClN7cGPxmZrGDnQh3gsiEhQc8ujQRBebg4qOyxwiyWA6OjVTc+qoZJvTflm4= 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=SoOjmree; arc=fail smtp.client-ip=52.101.83.48 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="SoOjmree" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=zSYWFHEGI5p3tG/Bv38MBuV9Gq9OSdhi7VADu+yhrW7OWzgv0F+wMr4fTdyvlguYuPQVZQv9Feo0I1m7e9dxhvaN1C1sp9DV0bALYQalk3UpR3TyszKc1+cN8RelWNnSr98AbK1m2jMx+eQrnndGIHp0yaJy6N5G9tIYbCdNix9fi3561JjRpoOcxYjyEFTfbiB8mjLIGJiPpbSwJEgyfZqL8GWTrYU3QR+EMNINka8nHsMtvwj1QyydEnJ7DJg6SVszi/bTpON3K+qDoSpGs9qyjN6tzavkzifNjJgbnkN0GHdsgLveRig04Gs4VXIOPZO8WMivkvuuS/f8GLFelQ== 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=lXO7m7C7aW85x0I8vOEzC/LeMjS7hFhZOXZcN/YC39I=; b=o0FYMFDHseLt1Aj5+OxlD65xKGnFkVDxK/Z/zKRLjxiCUSM6X4kWnaFl9GMNulwtmkG6C1v1j2GImX8k/Cwzz7Y0750EBk08JTwZm9NRc0+d4lsUTixcOTKdM+PnL06GbTsWPmlcJqcf/D9ik9mG0LTW2OqLknD28j2AqJXe/HPx6FNP5FCz/Cofu7TNiWx5TAVcplXXHM1htG3HzN+be2SZqpkET6z4n9pMmJkQCVV+oBfIFVZLzc6ooMi1LrK1JTf5s/lIgZvO5/DYUpZypW6xFScqEJlVlma83waxILc42adUZ37qstVuxLozurZpYFETGa1/V8M4vdNQjR/14Q== 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=lXO7m7C7aW85x0I8vOEzC/LeMjS7hFhZOXZcN/YC39I=; b=SoOjmreeOBrnmB8wwATnNmrWp3kgznxmHSSDBRV3WXPGZkg5FM1uSkskikHl2Ott8WJys9rQxvN7fNeBUkuczGhUhN95gMxe1xjyfVC0PdkSiRzZwtSYZJlEQ6tRMifOnsp5B6ekfyXzkjPxCYqFpaq4fUK30c82WG2DwH7MU36HoN3aH3Y/YaQaFauO54n/x77KxOhBkMT6wGPwAuMoVnxDIfTQge92Pn5uWn+L5G5EFpi0uJRhDAltHacX+DZKRevrjlKWuHy94tDjcsyTRbnCrr6ao2HTi5TVRg1y1F5ny5QP3NMfIcaXWmjpzlci0EY4FwZrPL2SFXcqdep8CQ== 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 AS8PR04MB8401.eurprd04.prod.outlook.com (2603:10a6:20b:3f3::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9298.16; Tue, 11 Nov 2025 21:42:49 +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.015; Tue, 11 Nov 2025 21:42:49 +0000 From: Frank Li Date: Tue, 11 Nov 2025 16:42:16 -0500 Subject: [PATCH v2 4/5] 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: <20251111-stage-csi2-cleanup-v2-4-371bb951776f@nxp.com> References: <20251111-stage-csi2-cleanup-v2-0-371bb951776f@nxp.com> In-Reply-To: <20251111-stage-csi2-cleanup-v2-0-371bb951776f@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=1762897350; l=3875; i=Frank.Li@nxp.com; s=20240130; h=from:subject:message-id; bh=HUtJfZ5UwnVY167yFTUryLb7oW4vhVqma7POuJNTdq8=; b=2LMwXYISZMbzooLTCyD7KvCJdrlgeCvDKlTXcDrLp+brwi8Wn2djCHInx13sM7b3Jgpp5I4Nt Luc2XGFyrEDAyTDYWnUj0tCTx5v9Wk9fl8hIRbYBmLSQEFbprFTzeyM X-Developer-Key: i=Frank.Li@nxp.com; a=ed25519; pk=I0L1sDUfPxpAkRvPKy7MdauTuSENRq+DnA+G4qcS94Q= X-ClientProxiedBy: BY3PR05CA0044.namprd05.prod.outlook.com (2603:10b6:a03:39b::19) To DB9PR04MB9626.eurprd04.prod.outlook.com (2603:10a6:10:309::18) 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_|AS8PR04MB8401:EE_ X-MS-Office365-Filtering-Correlation-Id: fd2eade7-642e-4dad-07cb-08de216b4286 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|376014|52116014|7416014|366016|19092799006|38350700014; X-Microsoft-Antispam-Message-Info: =?utf-8?B?U3VTL3hFU2pEYk9xVTRTVEp5R1NkR0FzN1g2dStveUVzRHorTFo2N1BobzJU?= =?utf-8?B?V0E1VmVaWm0ySmV3YXFDZFQyTWgxb0RjeFY4Y3NDK1JVNkpueURBWW1uN25I?= =?utf-8?B?cjk4Zmd3WjIxdCtLenRVZXY3T2hycjdOTUtiZklVa2tEVXFjMXc1YnVEMlVG?= =?utf-8?B?eDBpT0w2cEVsTEFXWS9ieGZkMXRTZ3VJLzYwN3o2VVpQeEM4MUtwcm0xRThW?= =?utf-8?B?OXpmcitkMUVPWlhsV0VFbTQ3K0loZUlJVC81VjVEK2YwdCtQU3krQjhnZG9s?= =?utf-8?B?Nkh3ZVFwMXI1SjgzcVh5TWNjWVN4QzJYK0VUR0RhaURCQm8zRkdMSEFORzAy?= =?utf-8?B?cTdVMU1sRHZOY1NZZFYwaXdUaE1KTmQ5VGJlWFJWK1lpeDAzL0JiRmo4QlNm?= =?utf-8?B?V0RxdkJXbGV1eW1JOHpNVEZjcGRKTVE1QkFaR2NzOG52UzlxWjQxWWNjUVkz?= =?utf-8?B?aStNWnZPQXZKZkl4azRqY3diVnNtOTJCQThDeFNaRzRxYnlqR3g3Tjh4dzBC?= =?utf-8?B?T244THhJMldPZUMxZTZUL1hiSm9lekR0eWlsdlM0bmJXRTg1SEJXZGRQRyto?= =?utf-8?B?aXlVR0VUTUhtYlFpMHJIUGdkQ0Z2T3o4VjR3NFhoYzFqTWNJT1Bibm5pK2tl?= =?utf-8?B?azZCYlBoR3dNRDNLQzMwRncybnYzZUJPUnEvRE5OdjlvdUZzMjMrNWRMd3cy?= =?utf-8?B?alVyUUp5SzRDLzkzVWcxb0ZwTW9Hd0k5T1pybUZFcXppUHFJNTUvZmlrT1Jv?= =?utf-8?B?WllzdnlRbGNaWkQ3Njh4U2JEa21JQ0E0YkxVRmlIa0JINUwzUkJBR09OOEV5?= =?utf-8?B?SlJaK2E3T2R3V3dGekNoQVNjemVOTXBpNlExWitubjh3NjkvRmJMZ0lmK0FT?= =?utf-8?B?M0YvMG5LbUFpcm5PbGYzbkFwMDZ6VGltbElOakgyeXZhZU5iYk1xcGtHTkh6?= =?utf-8?B?TkxuZkdwVE1MTWNlNk5XN3pyL041ZHN4N3lmY1hhUFdKc2V0UFpUZmUrWmU1?= =?utf-8?B?K3dPQWZUYWp5V3lKbjhFMWo2bjg5YzFRTWhtY3NDWGFQbnByUm83dmMva3ZK?= =?utf-8?B?QjE3aE02NHRrM3NjUUhIcmpGclRRaDQ5RGNFaUFNNkhnenZnejgzYkJzaDBn?= =?utf-8?B?dFhvQjJTRDh1Tlp3QzU4QTk2cmpQZHRWNVVjOEhhSC9YbjFLbEg5ZmlGNk1t?= =?utf-8?B?WUhaMGtwSHFCVEV4WmtXbncwMUpwUzl1WjhzZlMvV3hydk9yUXVCbFNpTDlu?= =?utf-8?B?WTJoUXVlNjY1SWh1aFhKUjluMHZ2M0IzTHNNM1VNdU9nVTJ4c0toTmsyNjg0?= =?utf-8?B?N3E2bFVpb2hNOEVpbFVJbHovYmtJSWF3Q2FPelA3UDVMdzQ5QzhCUnk1Mklw?= =?utf-8?B?dlNLZk9VOWQ0YVZVaFFkNzV6ZEVCZTVqbFJzdm1QSTVldUcwUmlqRVNvbVps?= =?utf-8?B?TTlZSzJZSGgxUkh5cHBGT1QydDlNT0srK2lHcmlTOGJuTTNjKzRXU21WN0hC?= =?utf-8?B?NURaaXhqZzArYnBSVnhzZkQyNmtJUGZaVnZObFRUb25WQU9OQTBBZTJIYVFL?= =?utf-8?B?b0YwbXNqWlFpdXlPa3FxWFNVcGFsMlZxeGR6ZzZ2dWhSYkt5WEJ5VlhIamZC?= =?utf-8?B?V3paYWl3RlVldW9JZ0xLaUx1QkY5eGRkakQ0K2lDVWx2bzJNUSszK2c1N2JM?= =?utf-8?B?a1hWWCtnS29kSVp4dS9UV0VUYjFLenVwcXdvWDZvbzd0NldqNzZHUHV1NUpQ?= =?utf-8?B?R25XYlUxd3hzUkhNN3NodlIvNVNMUWdkcW9QQm0yYUZMdXJ4Z1h4dDJBSndz?= =?utf-8?B?SE5ZTVRyQnArYlc2QnVHQ3EwUis5QXpEZnJqNXhTMkhBMlU5M21TNCttMEI2?= =?utf-8?B?dmtPaSs2Mk5zT05sa3hIbW5seDcwQmFBbE0xNTBYUi85YjJvY1JDSEh3ZHFL?= =?utf-8?B?R0dENkFOV0YrbjExbi9qTW1oQkVEdHcxVGs1aFI5bFBFZmhhUVRPTWhtK1pm?= =?utf-8?B?R0R6d3orU2piNmI2eDl3QjU5Y29oSVNobTQ4eiszUzEySEdYN1FiNDN4TVZv?= =?utf-8?Q?1m+Jqp?= 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)(376014)(52116014)(7416014)(366016)(19092799006)(38350700014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?Znh2QWduSHZOVjREVlhHU05Lb29TQ1NHeXlJYkN3UEluNHRIcWFDLzFIUUFh?= =?utf-8?B?V21hOU4zRmdLTW9wUFRVY3FiY0QvSG50ZGFNTjNlQmtXb29wLzczSFFLQzM3?= =?utf-8?B?a2Vtd0pzVjgwT2tadXU2dlpwK3NmWS9tc0RkNmRiZVFMVHFoODRkNGVlWWll?= =?utf-8?B?RVVSTFJTbWN2cE5wM1dQdzV4bU01SG1zZlBWdEIxS2o4YitOd0JKNDRMd21N?= =?utf-8?B?cld0b3FoU1hmSGgwbE5EcStXWnpSOGl0NEc0MlppMXZBQy9TTHNkdzlwQ1Ur?= =?utf-8?B?Uks2M3ZDdkIxT3RJQUIzZ3FuT1NRbTZIeSt0MEhUY0NxM3U0MHVzTVR2QlF0?= =?utf-8?B?bDhxZUxzbG5TRlZzRFlrMWJWc1ovWmhGTVlkQmhZTG1GT2Rsdm5Mc2NaQUxn?= =?utf-8?B?MFdncHJIWEhKTThLSERxVjhRS2Z3S2tuT0xGblo4V1pWVFZOb1N1NVVJOStV?= =?utf-8?B?enp1ajM5dXhkNWJaY0JMV1VyZ1N0bW12QjNnRWE5Wnk0aGphaGNyeFo5TWh3?= =?utf-8?B?UDFsMHdOcVlDaCt4QmZhc3RZOGYyamQwbGVqMGo2ZVM2NjZFbXQrS1Z4akhC?= =?utf-8?B?M2pzaDVGRmNZaWpYMjBMZmFmZGNKNGh2bUdDMytpTVNqa0drbnRNUmxYSGxI?= =?utf-8?B?WXpJVXZWZkMzTEQ3d0MzTXVjbFJ5K2RIUDh5YVJNWlJxREhTMjN3aU5HMnpa?= =?utf-8?B?M3d2NEwycVN6QUhNaTdPbmw1OVNRSFduUU55bks5dlh1YVpGVnA5WVcyQzhK?= =?utf-8?B?TU8wZDNEMjYyQjRVa1RVcHFwWjVXVFYvUjF2ZjJZQmFFQzJBSXcvbkJ4QS8v?= =?utf-8?B?WjJiYXgxYXdCNUVOMDhsVHNnamhEWGM4bWo3eFVYYUxwMmFOZWdseEUwVDQ1?= =?utf-8?B?MlEzczZ4RXZwN3lpV3NYdzVFcTB2aXV0dGl6WTVvck1rNHA5cHFZRFVsU2xF?= =?utf-8?B?bnZMYlQxMGdsa2tXaGdMcDZqb1FaMWZXZ3JsKzdsOHdiZCt3ZjVjb21TR0NQ?= =?utf-8?B?UmdzcnFUUTJsWHl6M0RRa0FTRnhpWEpLei9CM0dMQnlsUWVNbFFsWEVtVUY3?= =?utf-8?B?WmRVRHlSZFhiZURXTTFGUkR3bmNlU1YvVTU0YzA3S1E2UmtrbkxnZmlWaFVW?= =?utf-8?B?dUVGN0RsRUJqTGIyTlRlRmNXVW55d1FvdkJuQUJZanMraDBqNGhlYzhGT0ZD?= =?utf-8?B?RnZkUHdXTkdBVFlXWmxUbUQyYnFEZkJxY2VQWnBBR1NjUHBNc2RodUZRYVBY?= =?utf-8?B?T2xYc0FuTWhaM1VnV2tpSk5EdmFJb0Q5Z0lNOFlkOEJLQ2M3aVdiamQ5TU5v?= =?utf-8?B?dTEvZjVma2JlVHk4dFhZQ3hLbHRrNmlYd1dHa05DS1JTKzNGdHdEcEswcmM0?= =?utf-8?B?aDU2V0NEa0l6OWxidk84a1lDSjNYZVRjVUFRWTRYOWhCRXZpdEZnWWlXMU95?= =?utf-8?B?YlpNNFJjenpHOFo4L2dEWTZwM0xKU3JPM0diNnJyZ0lKMnVxTlpyS2hWOGdK?= =?utf-8?B?NDMra2xTb29kMkxJcGdJR2toRFh6bDRZNVRmV2RSUTlQL09HdVZSa3ZxSFZF?= =?utf-8?B?MG13aHJ3QjNSd0x2Qjl4VUxqZkZnc1ZneW5oOFdtaSs5YzY4VUpjTlRHYTVU?= =?utf-8?B?Q3UvR2VFbnY4WkpzSG5NVy9NaWhMVzczVEtnTWxOMXdqdXprdTBUR2xFdTAy?= =?utf-8?B?YnRCMUpFYml2d0pobjdJcFRhR0FTbWQzblFNaFlGQnhDM2Y5aDNQQVBJb3dM?= =?utf-8?B?d3hQZUpwcnRuclN6bFJEc21OWjVIUU03R1NWOEVaWTRiSksrZktNc3RETHox?= =?utf-8?B?SFd3a3d4MFZMem9FaVhSUENMdTdqU3k0MmtQY2RuRjM1RDJIRys5T2Q4bmEy?= =?utf-8?B?WnFuR3l4bWl1Q0pjUHdjR0ZqUGloYnFoV0c4b3dRaXlST3RaQmNUL2t3S2F1?= =?utf-8?B?QlM3NW1YMjZ4T3VQMU1LU1A1S2dmTDMzdDlZbmRDWUdlMW1GMzNwallFZURQ?= =?utf-8?B?QTlPb2RVVUo3bmpEWmJlVWhPMWJNV3U5Wm5SNjBXWHc1RzAxR1NyRk05UkxC?= =?utf-8?B?RWNJT2U2cG51WDV5c2xqOWN6a2xvcmhXWmhSUlNiZ1g4MDRPcFk4U3JVQ29m?= =?utf-8?Q?x0WIMN0WmAbSi7lhDQSuH/X9S?= X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: fd2eade7-642e-4dad-07cb-08de216b4286 X-MS-Exchange-CrossTenant-AuthSource: DB9PR04MB9626.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Nov 2025 21:42:49.5679 (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: C4eE0InCjMAYlBCZKZ9nUl7voof5tvzPqwr18nI2Rhr6qEkPxOO1YeyhPgT1rX4SO5xXesHAjmIZPGy21bLspw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR04MB8401 Use guard() to simplify mutex locking. No functional change. Signed-off-by: Frank Li --- leave as it without cleanup goto branch because there are two path to update stream_count. And it will be replaced soon at Use new v4l2_subdev_pad_ops.enable_streams(disalbe_stream) replace deprecated s_stream interface. https://lore.kernel.org/imx/20250821-95_cam-v3-18-c9286fbb34b9@nxp.com/ --- 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 e1b4b7fb53131ce9515b9441d8fc420e85d3e993..762f19ffd0858c952027afa8e0f= 36fc87246e1ea 100644 --- a/drivers/staging/media/imx/imx6-mipi-csi2.c +++ b/drivers/staging/media/imx/imx6-mipi-csi2.c @@ -412,21 +412,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 @@ -441,14 +437,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 @@ -466,32 +460,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 @@ -512,14 +502,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 @@ -529,17 +517,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) @@ -548,9 +533,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 17:41:51 2026 Received: from GVXPR05CU001.outbound.protection.outlook.com (mail-swedencentralazon11013048.outbound.protection.outlook.com [52.101.83.48]) (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 B26A535C1B0; Tue, 11 Nov 2025 21:42:58 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.83.48 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1762897380; cv=fail; b=hMczaECBKDrM4oyDSCW86Alp/ueBaDwPjCTgCbP3OnciUhzw+pEy+/qwRSb54rNo6OGQKaM1MT3sJP6KyvH1V8FCXXzf6CzazFkA11qpUR24RfhdlCmnyrK+HTSUH15zP1nuo3Vp+hbx6eHr+gkSotGxMc91bZcWMdMDZUneWyM= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1762897380; c=relaxed/simple; bh=EPx4lzmvmCsye4Te4aDiO3xOTYXdELRvhCxugrYXaNU=; h=From:Date:Subject:Content-Type:Message-Id:References:In-Reply-To: To:Cc:MIME-Version; b=OUeUhai6dQye5+XLgUGQaVAg1uaBms3/qHZbTDpkPYEo6Qbbk+MC19472dkw9UXyV1Yh5OQC0DUy/Nh/BLZBvHiZkMyZWZkNb0tJSfSfwILEnTGDRChhElQ3My+AV3lvbHXejvHUPoaIt58fxu2jQqx2mFSgEu1q70jvDTwRSNU= 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=lofS9boz; arc=fail smtp.client-ip=52.101.83.48 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="lofS9boz" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=B0erOC0vblLsSGU60rJXdyyQORvZuA+TRzxD6o4A61pEntTlzuUzSjcqherAXxcfwuUNB0sTP7TSHZ+DHBM/nGXcfMJmDypoFGWuXF9x+uRKhYLhqcVnh2RkIUpljj8I/Dwo6vg/48ROhjWsrS3k/hWydM5xH1cTk1qZ81SrcMJ6zO0MTVUuht8AVWURyFHQkPCtdqeVzEDD6kVZdci0e3SAtXPdBlIt4NZE6yJpdjwjg1nebFeXV/I09WerNgTZWi4MwpGc//GUnKEtwKJrTEJ7UQfeIRKtIUF1PLNFgQfAAQHcGhkjyEzBHsgdF8dBWMczEXe2NzLOKZ8Fcq2tzg== 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=IdzeSUnntxMRKssrfMEMSBkLMcm7aXbn8sbMuQKG9zE=; b=cCHhURonNGk0tSBFfFsh+il/XXdg+XfuNmqkZhGdPPg5sRfrC+Ne1nbtv9rsr6VKjfJOPIyQTpRkOK5T1fFie6rrXXUeTg/yQzsuMeUqUbZWxHV1MIYtXC45N9ha/Ohlg/nURPad1bcW+LCGo66uwjp3puVyFiVWvH62Leb+KTGIgC6mqD0VxOpthaj85SwyNi6EvxBLjBzq5DQjtZtLi47Jf2o1NISvu1/4Bkyx+nFq/xoZsGObG40pn34XsLXOrc7zLUMPWSX/HkcsahBm1h8VYIbsBFyqPokEvZhQOz+dE7FhswavPma78UxVIUcMwUqzNUuWl4PqSVbRnutR/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=IdzeSUnntxMRKssrfMEMSBkLMcm7aXbn8sbMuQKG9zE=; b=lofS9bozRxVUUqzpUoBruUaAKvOqKUjavuKFW+iNIbjrkd8Vwsfupi440EQRUVprQJA4dGmuXnn0kblERSpQ05mtAWVzpSVvosGnEofe+rO+FPNeg7HlpCL8jLhJ+m8dgNzCh+bcAnCENv2CPkGSlT1th+izNb51I0FhUceIGJ88dV64xK3CaQDgl/sDZlIpHnr3GeBZ0VFGPjmZXViTHz4cEnBIAIyPPCNjmz4lFBwjJjR89RKnbzVMkfpCyQn/Y6jTyfHECtlyaLlx5hjWZsP3lORoVmOfJma0oN0tSAqFw8zE2XvuX+0+BX0lpXYTgHzEKZ5oF2z+0Lu9DtaqTA== 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 AS8PR04MB8401.eurprd04.prod.outlook.com (2603:10a6:20b:3f3::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9298.16; Tue, 11 Nov 2025 21:42:53 +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.015; Tue, 11 Nov 2025 21:42:53 +0000 From: Frank Li Date: Tue, 11 Nov 2025 16:42:17 -0500 Subject: [PATCH v2 5/5] 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: <20251111-stage-csi2-cleanup-v2-5-371bb951776f@nxp.com> References: <20251111-stage-csi2-cleanup-v2-0-371bb951776f@nxp.com> In-Reply-To: <20251111-stage-csi2-cleanup-v2-0-371bb951776f@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=1762897350; l=1642; i=Frank.Li@nxp.com; s=20240130; h=from:subject:message-id; bh=EPx4lzmvmCsye4Te4aDiO3xOTYXdELRvhCxugrYXaNU=; b=MARZfhNkl+azb6QrEJ7x/bUTFqCDIzuiLYw5P7Q9xHfZA1oDdU7DiWyceZjyVvzv2p+ymHYN5 cso8oYhgiTrCCuord6Jg5yblZiuk6brv+2aRS2y+kP6N9j2YEofhFO2 X-Developer-Key: i=Frank.Li@nxp.com; a=ed25519; pk=I0L1sDUfPxpAkRvPKy7MdauTuSENRq+DnA+G4qcS94Q= X-ClientProxiedBy: BY3PR05CA0044.namprd05.prod.outlook.com (2603:10b6:a03:39b::19) To DB9PR04MB9626.eurprd04.prod.outlook.com (2603:10a6:10:309::18) 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_|AS8PR04MB8401:EE_ X-MS-Office365-Filtering-Correlation-Id: b445d30f-8126-4af8-bc59-08de216b44f2 X-LD-Processed: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635,ExtAddr X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|376014|52116014|7416014|366016|19092799006|38350700014|7053199007; X-Microsoft-Antispam-Message-Info: =?utf-8?B?UGplUWY3azVJakRJSmh3dzRLZ2c1MklXVDMxQzBLZTNUL1NwL0FkdmJjU0dn?= =?utf-8?B?RVRkOFVaWk5UTENaNkxYZ2VGQno3T24zSmlZVVdYYTBxRHprWDNrZEVoTU94?= =?utf-8?B?YU10SExkZk1RWTlXamdMYWl1TzM0WENrcVBvR0RzbzExd0UvckdHS3hldEdG?= =?utf-8?B?YVp5bSsxeDFCUHNVK1lEQmFLV2RaZmE2MnhpWFp2OFhYQVAvVURJNVNtbGNO?= =?utf-8?B?Nk80cHd0OXhIRzM1VVhWcHFmQlF6Wlp0TEhXa2dZY05LalN2ZWdpcVlvbTIv?= =?utf-8?B?d01pb1VFalVkTWxsK2hrZkFoNFV5N25xcnlyK2ZHWWV0UzR5SEFKbzhhME96?= =?utf-8?B?ZmxCU3BOa0pOMzNRNjZUMGQzK0d5S3RNMzB3ZnJEYktjdFp1dE1LK0pwTkNE?= =?utf-8?B?eFdqUkF4S2V0b2xyZ1UyWmMweVRNSGdZR3Z2eUpqb2RUNzVwV2VzY3NoVE5q?= =?utf-8?B?NUJpUUs0K25ianhPTGs1Ymsrd0dlcjloWUN0SnZqVmxZWUozUmJIOUNXMml0?= =?utf-8?B?Rk9QZHV6MnVnVzNYdlpCYkJEaTNCaklkVGorcWFYaTc5WCtNTjIydGkrSFBW?= =?utf-8?B?RXEvVm1UWkszN0luZzBNcWxEYXFCb3NLR05menRvem13N2dLN2FTZUVxNjQr?= =?utf-8?B?ZE9kV0FrR2hXdnhBS1FHeWxDa2RkSHcrTnJJM3kwWUZUMmFOOWxzNlJ5Vi9l?= =?utf-8?B?TVM2S3FrZDd3QUhnaGFZczNkSUNyeEFjSFNGNGw1MGxwWFVwVUdGbnpEMmVK?= =?utf-8?B?K2I2aTM0cklQRnVXdTZncE1lTHdYVU9VQ0k4bzFMWHVWWjE0OFpHVitPbjJh?= =?utf-8?B?UFU2a2pEbVBCRTQwcEE2ZGViWFhWdytDUEZ6Z2V6dlVLTUErZnhldDE4SXBw?= =?utf-8?B?elpKa29HbTJubEhyRWxMMUt0NGhJbUtIeWF0Y2JHcnVyU3RPUm83Uk1DYlll?= =?utf-8?B?dG80b3B4OGJnWGhQRzNCYUJONzZEYlJ4UlRsZmxkRG5lMlJtQzlGTGhRczlT?= =?utf-8?B?QVRzcGJhc05tdWw5QjlCdFozNUlqT1B0dzI2aW96K3FSQkwvWUh1a3I1Tk4z?= =?utf-8?B?ZlFrMnUvbzBLTE1Ncis3WWF3b0VxS3NneTNGeEtDZmhOSTlkbDRvVDUzRnZj?= =?utf-8?B?M2RiWjlkZ1dwUmFvRUV1VGJYSE9xSDVqbWt4SCtRQW9oUGtKV3pwZ2xGY1RW?= =?utf-8?B?bzJxdkE4b1dDVndqZlFlSWZ3bHRkalZxR29wRFNHeGFCRWw2eG44blZrK1Rw?= =?utf-8?B?aDZmbDV1cFdxaFJDWFpYTUJYSkNza09XRFdwVXFmdzJ6RExpQjE2UUZySHVt?= =?utf-8?B?OHQyL2ZNVEVkL0Mxd3I0WGVHMUF4M0plWjE5YmZ2SnVZRDFERytJWDlTbERy?= =?utf-8?B?Z0hHWDlSVVhaTFkrLzhabTNOQ2NVVHFvMmhlelV3ZFptT0d2SGlYVlJySEtG?= =?utf-8?B?WFZ5RmE5RUZUYmtUUUVwQXowSmJianB4bWovdWtPWEdtWnB0b3NtZDR2ZW5x?= =?utf-8?B?dm03SERxZ1pRazRZeHlZYU9SZXBRbnB5K1lwSkVHcEdHckhPbytpVWpHTUdG?= =?utf-8?B?bFdCZnYxdEd1K28zMXl0K0FGUnU0N2JYd3NpdzBjUTlYU2JVU1JIRDQwQUls?= =?utf-8?B?TEN5VUtuWml5YU1OMmVyc2xldHRjb2pZQ05MSGNXdlNSSFRvQ3N4Tjg2MjdO?= =?utf-8?B?anA1dWVMbktQVzRJazF2V3BsL2VvZ0RrYXBCd3dSVDNLaWR0cUZrdXZwbEdh?= =?utf-8?B?VnVtTkhmSW1FZ29JNVFQY0c5andnZ0tIb1EzK21GQjN5SjBRV3JraExSaWh1?= =?utf-8?B?SStqVit1bWtTS0RNTFh1K0tXbGwxNVRWS0JyYXEvMjBmcForRmJqTEVaVkll?= =?utf-8?B?UWdrNTRWQlJNTWc2YldxQVlwRS9XZHVzS2ttbUV4N3hZZGprWFMvRmhQK3JD?= =?utf-8?B?V2dabExHR0FibmZ0NGY2WGtmS2pMSWZUVk9OZ2srdkFXamZZZkE3T3NUYUhR?= =?utf-8?B?VWZ4WTQ0SllocnVVNGk5a1hweDc5Z2xwRSs0dUlNai94M0lObjJUWkFzWlVH?= =?utf-8?Q?DRNShA?= 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)(376014)(52116014)(7416014)(366016)(19092799006)(38350700014)(7053199007);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?NElvNzFHZkgzazhMalF6bWtUWlVUWEd6SGJRdGFNOURmcEs0Z1dQclM1Qm1U?= =?utf-8?B?b0FQME1SeFBuV2krbHRLV2kraUNPTGtTZUNTNFZUdDRIN3h2V0srY0hrNDhL?= =?utf-8?B?VkVRQmtsai9kc2xZcUZYVnByODJSb0x3Um5vVFgxclB1RXJpSEx4MnFIdStS?= =?utf-8?B?azNycHlOOERTVmQ5L1cyU01ORm1TVEh2YmZpMTZjZzlJcjVuN3FIQWNwajhY?= =?utf-8?B?emF3VExyYzBEcS9qRXhFYXFFeE0wMU5YcFJMVktSbW5lMzNWam1qclY2M3Ax?= =?utf-8?B?ZytwWk04ditBTUJVaXA2cHczZ0Y5d1R3bi9BYWNYQmRuSG9WWXZRY2x3eFJs?= =?utf-8?B?dEZQR1ZGelFIMyswODN2UDVoc1BhejFtK3pQaGNGTHV5Y0M0amhjeGozMHZW?= =?utf-8?B?andEVDZoZi9Mek55bGhudGFkbllqckM4UWZNMkZuWFhYT3FRWHRjd242L3I3?= =?utf-8?B?RUh4SVpnTlYzSU1tdGQ2QUl5cEt6WGt3QnVMU0ErbWJreXByc1I2alorR2Ni?= =?utf-8?B?V1RsZHl4QjAvODZVUmJUTjBmVFdlTU1sZFpGd1hGakVRYmZDYldXOEpPRVRu?= =?utf-8?B?dmdudC9WVUlJY1kyWG1yMjl1ZjhobnoyeHF3VDhmVUt3clBEZS8zQlRXWnda?= =?utf-8?B?UHVsQUJlaFZlYTBTcFdiOWQvNWFSakhaMGNtQ3RBdzZYVkh4MFNobm9RejQ5?= =?utf-8?B?cENmeHlYQmlDN0pXRndmaGFLMUFreXV5dWVXVDRGcmwxZUYzQmpVN1M0TGtU?= =?utf-8?B?SnROc3dqVndJYmYzc0JJQTdxZ0s2SkdPV08wSXBCaEE2UnNyOVZjUGw5clJs?= =?utf-8?B?bG9NcDRaZlY3ZTBES0FaVEh3S2tzVVBQMTVUaWYzQ0JTT0o4dUNHbWxtRGNz?= =?utf-8?B?MDZXSStXZmJTNzVLbERvWGowWlpJMitkVVNGbW5SWWtBUUNCc1dWRUJuVXRT?= =?utf-8?B?U3l4OHlwa3dRQXJ4bXQ0U1QvcXVGQ2pmNmRPVnNadlJpUEpQTlFtZkVVVDJy?= =?utf-8?B?em84dTl3REZhMGV6RE9lazI3K1JqM0FZRndwRVhXSWFGMmtQb2RPVDg3M2VB?= =?utf-8?B?eTdTZitDMy9jN3I4UHoya0pBc04zdlhCcTVVSkI5bUE4UnNkQktOdU0rTnBn?= =?utf-8?B?Z0NmVnB1R3lnOHFqdHQ1Yjg1eHJGamZzK1R6aHQ5T1RzT3BCbVJKdUZ3STNG?= =?utf-8?B?dUh6TUpWWXJQNXgxSHZ1VEZRVk1wUzRKRG5uR2huOTZWYTBaamcrY0o2dFZz?= =?utf-8?B?MFNqcmJrWFpNam1jeW01NC93Wk9yS1o4b3pBMFRhK1QwemNqeUduTS9oOUh4?= =?utf-8?B?amNOZjRLTStYeFRwYWxiTURVREJmU0lHSlI5WEVUQlNtS2xxRTdTRXB6Q3Y0?= =?utf-8?B?bUdiUjZHN0RURXp1QXhKM2FjdkRqVElFTmpSakp3YUJFWGR3RlpabkRWcTYv?= =?utf-8?B?VzRYYlFMdmwyWGpuRnBYZ3VrWlZTWnIvUVVzNlZTaGhuNWdpdzlxSGxLcVVQ?= =?utf-8?B?eVFsRnR4UzRiZnUxR3I3UVRIZVFreXRHZk81QlhDdnp4RHFvY1BTMlpiZ08r?= =?utf-8?B?Wk9WeEovaUY2cUFXUUZDRTNJR2RiLzBJQWoweFFqdThDVEd5Q2Jpd2daTVU2?= =?utf-8?B?MStaOUQ0UGhzV3NOK0VnYjYrY1llMHdBd0F0MUNhSGNwdmlScXJ5dW1MM0ow?= =?utf-8?B?M0NsQUhrVXg1RDI3Z1h4cDJ0UEhkYkNRWjNHRnVGY2dSQkMxTnNqNjFTamVw?= =?utf-8?B?cjRnUmc3T0xZcTV2ZFdhd3lvNStTK3JmRVZBeTE4aFRxZTV6Mnp0aUhSOTFn?= =?utf-8?B?bVl0aFpLb0drTjBER0grbGpXWWNKZGRLQ0JZRzhEV1lTZm9mUi9EekpUMWxn?= =?utf-8?B?aGkvSS9ycUx5bENlVXZrU1Q3aUhpcmNjY0wycTRCQTEvbmtQaEYzWkl3NDRQ?= =?utf-8?B?R2RxZGdGRXdXVWIreHQ0SGJIS0xYdy8wV1JBaGtPbWRuV05hM01McVY0T0o5?= =?utf-8?B?eTZGY0FKcXFqN0YzaXdRZnoxdlpuOWVFcGNkRnFNdG44VUorOWNGSHVWeXhD?= =?utf-8?B?RVZXY1ZNZWVkeXUzOGVsV0RjZnh4K0xUYWZQL1JpZSt2QjNKM3EzWEJZY2tG?= =?utf-8?Q?K/irDBe5UC4rxuAsE9yrOSvvr?= X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: b445d30f-8126-4af8-bc59-08de216b44f2 X-MS-Exchange-CrossTenant-AuthSource: DB9PR04MB9626.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Nov 2025 21:42:53.7495 (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: Lgu0CRI6Mg16YWfAwNJDsP98w3Vds025Lshm2VugFTw2fEVcqCH1C8Fsnq8oVyW8zHCX15I3XmC+x95if9hOgA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR04MB8401 Use devm_platform_ioremap_resource() simplify code. No functional change. Reviewed-by: Laurent Pinchart Reviewed-by: Philipp Zabel Signed-off-by: Frank Li --- change in v4 (reset verson v2 because split to small serise) - 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 762f19ffd0858c952027afa8e0f36fc87246e1ea..3d8995dcc9132c1b92c36a65e55= 476e3ca2703ac 100644 --- a/drivers/staging/media/imx/imx6-mipi-csi2.c +++ b/drivers/staging/media/imx/imx6-mipi-csi2.c @@ -709,7 +709,6 @@ static int csi2_async_register(struct csi2_dev *csi2) 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); @@ -739,15 +738,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