From nobody Thu Oct 2 10:58:01 2025 Received: from AM0PR83CU005.outbound.protection.outlook.com (mail-westeuropeazon11010021.outbound.protection.outlook.com [52.101.69.21]) (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 AC35424A06A; Wed, 17 Sep 2025 13:19:44 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.69.21 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1758115186; cv=fail; b=dhSoptmezdLalVP5nqaWSWx/IU1JHcCresB3r0YV6UcqxM59648VQ10d0TpD3oWUbAgIq+CIsEBgh8LATUhC9J89T2Oc21zFHDjmGCPWX3F1IJ7P75gm6qOqhhFZDC3IWZ7sbqh7qf3g8i8oeq+dvuKVtzCOSF0Y6Vqop/91s7I= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1758115186; c=relaxed/simple; bh=DswwFWtFlDjvaxJO2YzmaVkND9khUNAnAA0x9LPf4vc=; h=From:Date:Subject:Content-Type:Message-Id:References:In-Reply-To: To:Cc:MIME-Version; b=okVuosgLFE7+bFPeG2OarG3kd3H5YuvAawCR9X9740uXd+ux+JLuUSJFBVSKEtETlYA1NWRwcyK54aZEZksei4thrKBtK+q5r8vKTSnArl19BG3WmmA5i9AJYSvxe5kS7RS6k9qr3v/1Nf7PA1yRUfmgWBuNp17F1aDn/mfHQ3E= 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=SdcAptIT; arc=fail smtp.client-ip=52.101.69.21 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="SdcAptIT" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=Q5zHITQhR/ONjnm+0FLRDPTf4dOBcLd31Wy117EXB/iH68n+n45S7uztpP6P4efLFlW0bB870kC2G7O5l7mB8dSq9ciTx54hjueDCIMqtJNEuT+IEt9qCGE36doTgXogb1puZ75N7X677+FWYO2m4ssXIkD1wMoKqXqiudb5sOoPsIpxVunm/7JnuzmkI0t/2/WXQ9xLP0ovxGdm/IYQsiiS6xtdUFRsldQWihS6if1vAW7FBD6dY/W3b33J0I484L9VZNkLPB/Vm9L/I4ECOW6N2IRQ3hyFHgnuPFLACkeOhMfdSYHKdM+i+LYXT21uH1Uj2olkGYL3UyHTqp2l+Q== 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=5snXDkxF3jv3gx1sKS+33LYSZua219/DceMklZyEeU4=; b=BQdrOTlo8d4tW3Kus2vsogl1Kcnn/a56I+AY6hDMYo6aM9i/95qdxAQZD42UqhWuZp9A35Pd6wFY4wpu1Ml2imYsnTt9TtQERQgcY5gT1fg0qBD0vuFAsA2bk6RzSwn8AbenWYzEPdmJ9dDOlfPaNA6jIPIRsT7nFvzLUB4ghxbviq68VlEElgrPlwKBOwV5vCYRbpWBa9ieL/byDHp9VfLARlLGlHOl0WP1o1BaaqBhA1TsxSXpuEJ7up4r/RYtDQibk5dsmIuqlTA1p6j8BjfZTv0PTnuV/N7Tr+lpFyTXnGzwqbkFDnoNKAOvRFpp0MR5IHSU9SECcnN2qcNlMA== 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=5snXDkxF3jv3gx1sKS+33LYSZua219/DceMklZyEeU4=; b=SdcAptITExydxhZbc04RSpRsyjyKhjF4bFITbQ0zMpH2kFW1dfS/rkOA0hRMDJ8r6qqQ71rh4RWE/1QVvFh2eH77KqvWAcInn9ruQpSEkhIXNrhg2gA6sanOFFs42Pooqw68shovH8/m9eKe0QbaxR0fsK6d0B6USrH9FKXw+kuKwq0KqQ+f8W/MEbYO4nG/IwNMRi4fZmOLELahkMpU2eGxFtqrYyocYDH0kRnkqs5u+Sp4DMKIoioaRySBoBVSsnFtBDoWBylGERTbi0dr8e95w5s45Ugi/+j5MVzq8nIqbISbKOol9OtqttX1FlUm6juiQApriRVNlblnRuAEIQ== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nxp.com; Received: from PAXPR04MB8459.eurprd04.prod.outlook.com (2603:10a6:102:1da::15) by AS8PR04MB8325.eurprd04.prod.outlook.com (2603:10a6:20b:3f6::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9137.13; Wed, 17 Sep 2025 13:19:42 +0000 Received: from PAXPR04MB8459.eurprd04.prod.outlook.com ([fe80::165a:30a2:5835:9630]) by PAXPR04MB8459.eurprd04.prod.outlook.com ([fe80::165a:30a2:5835:9630%4]) with mapi id 15.20.9137.012; Wed, 17 Sep 2025 13:19:42 +0000 From: Peng Fan Date: Wed, 17 Sep 2025 21:19:13 +0800 Subject: [PATCH 1/6] remoteproc: imx_rproc: Fix runtime PM cleanup order and error handling Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20250917-imx_rproc_c2-v1-1-00ce23dc9c6e@nxp.com> References: <20250917-imx_rproc_c2-v1-0-00ce23dc9c6e@nxp.com> In-Reply-To: <20250917-imx_rproc_c2-v1-0-00ce23dc9c6e@nxp.com> To: Bjorn Andersson , Mathieu Poirier , Shawn Guo , Sascha Hauer , Pengutronix Kernel Team , Fabio Estevam , Ulf Hansson , Hiago De Franco Cc: linux-remoteproc@vger.kernel.org, imx@lists.linux.dev, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Peng Fan X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1758115170; l=2775; i=peng.fan@nxp.com; s=20230812; h=from:subject:message-id; bh=DswwFWtFlDjvaxJO2YzmaVkND9khUNAnAA0x9LPf4vc=; b=g5uhm3jZkqz7iyL4elGG3sYMYdfmcGFag87v/k3nITO9qqzXwl2gztFHwKo0tDjUPIpFeDDnw oRVm8YHyJoeA/kI/jaxK1NAwUn4fzijV47yjWeYJWoumznFg74YdE9O X-Developer-Key: i=peng.fan@nxp.com; a=ed25519; pk=I4sJg7atIT1g63H7bb5lDRGR2gJW14RKDD0wFL8TT1g= X-ClientProxiedBy: SG3P274CA0016.SGPP274.PROD.OUTLOOK.COM (2603:1096:4:be::28) To PAXPR04MB8459.eurprd04.prod.outlook.com (2603:10a6:102:1da::15) 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: PAXPR04MB8459:EE_|AS8PR04MB8325:EE_ X-MS-Office365-Filtering-Correlation-Id: aa8978b0-52e4-418e-8266-08ddf5ecdc97 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|7416014|52116014|19092799006|376014|366016|7053199007|38350700014; X-Microsoft-Antispam-Message-Info: =?utf-8?B?NHZTdSthSFhsbi90Q0xqVk5hRFZGUmZnTUF1dVFzWnJxcDVWMWV1YVhLZ0JF?= =?utf-8?B?Zm1rNERsbldEQ0FtUmFRcWJXa1kyaG1QaC9rdEZ6MXpRZWNzR041VGQxQVFr?= =?utf-8?B?YS9maHRTVGMra2ZZTHlSa1YzVWlFK0YxQ042NlNXSXVUUDRuTjlQeVA3d1Zw?= =?utf-8?B?RVRBc0tGY1NRa29XTE9Sb1VERldBV2lidlRtR3g2YklhRUVQTUFGQTkyZVkr?= =?utf-8?B?ZHp1MENqM21ucXh1dU56bkhMYkxyK0ZWV0NMb010dEVpdm5FbkcrTUxpMnpZ?= =?utf-8?B?b3Joelc3aFZZWmxPbXJFSmxPdW96M3JaQzk1bWpaeUpXN284OURmbHlVNGVy?= =?utf-8?B?Wkc4QjkrMmdzbXpPeERVUUo4aGNrTXRmSWdBbHgxN1J2ai9qVnRST0QyQmIy?= =?utf-8?B?UEUxem1NOHNJMzJmeVpJRmZjQ2RadXJtYWptZFp5YWEzT0FTdGxqdDhGYStj?= =?utf-8?B?Wk1ROTE2QjFIWkFXazdRVCtucUhTbFZGYnIzUk5hR2hoWktEKzBFRE9zNU5z?= =?utf-8?B?YjZxOGdSRDUxa3F5Q0dVRDhhQ2NFK2pBNEQzMGM3NnNVcWVUWklGaytjaXFo?= =?utf-8?B?Z1NPQ21kYTh5WStuNGUxQWthRklldVlQR3V2ekgwMSt4MWNKVjZiWk9oRUlU?= =?utf-8?B?aUdkMnZ4OVFuTGpZVytsQ2xTVmtwN05IajVqVy9SVFZyck02UEpaeElXcS9l?= =?utf-8?B?ekF0RXJiZmg3MityUHJIQkpFSm03ejdqWFpsTDR6dnRMWjlxTmdFVUpUZUFM?= =?utf-8?B?NVl2cW43TzhhdTZON0pLaEgyK2lQc3dwRTg3MXpnblppYnFiR3RhYnRqNjF4?= =?utf-8?B?S0ZTSlY2WTl0VXg4TnJKbkQvUzAzcGx4eHFycUxuWjJzL1hDaWhyL1FrQmhW?= =?utf-8?B?NFZac0doZlhQMHBxVExzTVBCeVhxVUVJYVVHVUdoQWtkUDJDSUFhS0Exa1Vp?= =?utf-8?B?R1FjakVnM1FlQ3k3dWZUMStlcGxxN21JdVJ0VnJFTzR3czRUdWdBRnI2ZDVL?= =?utf-8?B?Zlo1ZWVjWHJrdkVuekFPTkJDSS9WKzdDU0RXMDM5MFljR2RaRHpjWnRLZUZL?= =?utf-8?B?aktONGhocGVDaHFIKzBWd0c2ZzQ0dGlSaHJ5N0RHQ1oyZW92bHBrQmNMbVNE?= =?utf-8?B?b2RGdTNYUTVWdjI4bHpUSjdQb1pNelptVTFHUTdvYzZkdHNGV0dsNkpKSDJT?= =?utf-8?B?dGJXSVdKT3RmWTlIOFF5ZUJuQytsRkRKbURSTnNLSlNpRVhuM1VuZFlzUHFp?= =?utf-8?B?L2RObisvMzArbmU5RjJRajg0dHdTd21Kd0ZXTUxhbzl1eGZEVmNOSGluQWEz?= =?utf-8?B?TCtZU2JVN0ttYlE4N1E5T0kvRjFYTHp0MUVxa0E0UGpZZlhtMkgydWtWdkQ5?= =?utf-8?B?ZFFhRk1vSkJWcCtQYzE4TU02UHJEcHB5dTFQK29hUGxDaEdwN1RTNGNCQkN2?= =?utf-8?B?QVJXMHRUMktReWNIUmVMZEtmMmtvdmQrRnVBeEJ3UWJpZS9rVTdGMU91ZlYx?= =?utf-8?B?bGFFcVAwbkoySjRldWwyMVN0akhKd3ByMmtKcitiUUJnMXRBREhYYUt4TXg0?= =?utf-8?B?KzBwWmhVVkZZL1pLN04rREoyMjJJbXBTTnhjZkhnOE56aTJxbG10dDU2Vkgr?= =?utf-8?B?UGlieU45REdFUHpwaGQ1NFRSc2JUUDYxa0Jzejdhb0JQdUE1ZE1xOVVJdytx?= =?utf-8?B?SFhnZVNGQVc0RWZGZ0piYVVoTXN2ZnhadW9pak1XL2RXNlNXSjF5OGM3YytM?= =?utf-8?B?ek9MMGF2b3N5dE0xYlY2Mm16NDdkMG9tVnhLakZqOUE4cWVmTVNSUURGTWor?= =?utf-8?B?MjY0OHBNQzhNaWVLeDVLS1N5bVJBRGp4ZTNjWXprNUdrM2dha2IwY3ZwbWEw?= =?utf-8?B?NDNCWG5ESFp4RUxheWV2djl4VWhkYWo0d1FNOUgyWWVHV095clFST1JxUFJD?= =?utf-8?B?OTk0QnVGSlduM3dEQU1qRUhocFZHcXNUNkxmb3FwNHhzeGNSdkZvMy9kdzhW?= =?utf-8?B?Q0J5UmthTGZBPT0=?= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:PAXPR04MB8459.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(1800799024)(7416014)(52116014)(19092799006)(376014)(366016)(7053199007)(38350700014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?UGp4NXN0aFlKNDQxeXZXT3EwSDJhcFpCdEVjanhucW54RVpHSkJLL3cvUEl0?= =?utf-8?B?WFBZR0FtOFE2Tyt2VHNFZU5LVExkamxLSHcxcEE0WW1ocitYQWd6YXlDRkQ0?= =?utf-8?B?U296eitrL1Erdk44WkVaSW5GY3ZNNlhQbEZ5NXdVbWpjenpFakg3MEUrcUQ1?= =?utf-8?B?VkoyWTVJaEJ4NFdzQ2JueGx0RzdJcVpPd0RuaUpYa2VZVXEwQ21HNkk0T05G?= =?utf-8?B?c0g3R2hqMm1UNDlIT2h6YzlkcUg2RnlzZ25GMTFKTzBpRUt6eWZWOTFMaXJl?= =?utf-8?B?Wk1SYitudXhoYTFOMFNhVlJrNTg1YWQ0c0dYaGxBWTJSS2tiVXdpaW1NYnBm?= =?utf-8?B?UmtEOWJYeTNFazY2cE8rTVBCZ3JWQTNOemJzekluenpkVU10SVhKZGdwSjNi?= =?utf-8?B?QXg0TTAyTXllNjRRL3gvNjE3d2V2ci9EaFJFSjB4Sm1Qa2ZITndHc1lsTjhN?= =?utf-8?B?dW8yN2Y4dnRiMHd1TzY5MkViNDVSZEovbjhxeFA2T2d5Uy9iczdXbk9BbVkw?= =?utf-8?B?VUlVbE5OclJwSlNwb1ZLeTVkNmo4SlhJQ2laRUo4Y0cxNnNsUnRPY2ZqdnN2?= =?utf-8?B?RzZqWTJIWkFjRGZOMTRRODkzYWkvbitZQkpZM2VOd1pacitvV2Q1OExvZUEw?= =?utf-8?B?WHlkTlZMSmJpMFUrRHpIc3hLcGwwcSsyT2F5WTV6aHd1enJNL0xORFVpWHBX?= =?utf-8?B?Q1ZqbDVlQ3VRZEFwRlI2L0dZVkdxdERYb09uaVJLT2ZkUU93TjA0Z2h5N3g5?= =?utf-8?B?K1VDSk5hWlVnb3BUSTJOa3ByS3JhUlJIQWl0YjR4YjhxblZDOUw5ak13dTV2?= =?utf-8?B?VEUzL05Ib2pod2pJcVdkR2JHTzdKK1F6cWxXRkltRXRZZTlKL2MzNVlFN3d4?= =?utf-8?B?U05SVzRUTW1pWEN1ZnY2ZnMyN0tpR2ErRCtxNmg1NWZXZzVrSXhyWUNDbkQ3?= =?utf-8?B?cTRQN3hSdWRRaG13Vm5pUjBrVzRVMDNMdVlyUEg1SGIzY0o4bXFOTDkxR3Rr?= =?utf-8?B?YlZwRDdRWUd5eUxLbVlkajhaanRzSEcvMktWdjU1ZGVjN21Uc0M4UVo1bG9C?= =?utf-8?B?ZFppcW1GZ2dMSUpnRkMzSUJQZi8xamxHNFlsVUtHZDBvWWtVMDRTMG9zTFNW?= =?utf-8?B?QVJMU3dHR3puQmxNSVg0QTVoZ0FlWlhKUGVLN3Q1Q3p0TmppRUx4RjhuaUlw?= =?utf-8?B?eTN5S1lPTFU3b0Zuby94TVUrUndpNStrK2RDSFo0Zjhqb0RDcUtZTHk3QTd0?= =?utf-8?B?QzFjZUNtdk81RGFXVlh2cmtIZ0RndnhkRHpoRjhaU2ZVYkFWMlRmMTBOU1VB?= =?utf-8?B?RU9HVzhoc3lQMGdRVkxrQ1RNM0dhQmR4ZnhQS3dwa3dXZWhZK1JjMXB6djIy?= =?utf-8?B?RnBTR2lOakNWT1NGRk1xKzNYenpuVmRlSWJ6U3YxcUpQYzJkcGJmOU81SVEw?= =?utf-8?B?SElRMys2TkQyQXVVR2xMU1RCVzNJTnBLVlducUtHdzk1d0xqaFpzZy8xcnQ5?= =?utf-8?B?TWpDT3FqMThvdGhCL0pLNU0zRlNSTlJBR2psaXFRc21sV0t2eUZWMmtia1Vk?= =?utf-8?B?aVNXZlBYZi84UXNISWZtcGNzdDNlNEVIOHhuZW54ZHBUMUZwbnptOUNkWGRJ?= =?utf-8?B?dTcwMlZzK0xRM1dYVENlMTVVNU1za0xkMURYaC9SWjh4VHRYa3lkaVhzRlVm?= =?utf-8?B?bnhKT3VtNXNIM2RzaGVUZGdBQk9LOUpOUnd0UEpobld2VUNFYVRDQ1BPT2pu?= =?utf-8?B?L1A1bERnMUo0R3ZlT0dnT05zeWhSa0tMcW5tbDdXYmVxNS9mckpWYnZyZkZs?= =?utf-8?B?MjQwZ2FZbFFZNXVaSVVFdkFHUkFENUNBMnVxQ05waGRWUjh4Qm5QNzJSSUtp?= =?utf-8?B?ZGNqNUNpWjdsZnhZbXRnanNnQzk2RXVudG9MZE1ESDdqeHpQSzNnZ1Y1ZXhO?= =?utf-8?B?SUdxR2NVeXB1citoRGxsRDhseEJxQndmanlSQmJneHU4VTRoNVBHY3VsRGNI?= =?utf-8?B?SjY0M3hWeUJEMlFUWTgwbmU3YVJIRDd1U0RobER0bVB6Rk4ybjdUaE95dzFJ?= =?utf-8?B?WXFOdEVMeE9OL01HSG40dDFXZXFkT0ZDcXBuTkRCQTZvL1JvUm9BYm5aa1Ni?= =?utf-8?Q?lypK3adLZCq02uwEPnHqMAYSC?= X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: aa8978b0-52e4-418e-8266-08ddf5ecdc97 X-MS-Exchange-CrossTenant-AuthSource: PAXPR04MB8459.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Sep 2025 13:19:42.0312 (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: xpV1dGFmBeCi4YiMvYzFEdRBn6bMf1V2NsY56ZkOJX2gY/rHqH2GZYWfj9AA+lepEgSuRcoI3U2rVHSEzNwEig== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR04MB8325 The order of runtime PM API calls in the remove path is wrong. pm_runtime_put() should be called before pm_runtime_disable(), per the runtime PM guidelines. Calling pm_runtime_disable() prematurely can lead to incorrect reference counting and improper device suspend behavior. Additionally, proper cleanup should be done when rproc_add() fails by invoking both pm_runtime_put() and pm_runtime_disable() to avoid leaving the device in an inconsistent power state. With using devm_pm_runtime_enable() for automatic resource management and introducing a devres-managed cleanup action imx_rproc_pm_runtime_put() to enforce correct PM API usage and simplify error paths, the upper two issues could be fixed. Also print out error log in case of error. Fixes: a876a3aacc43 ("remoteproc: imx_rproc: detect and attach to pre-boote= d remote cores") Cc: Ulf Hansson Cc: Hiago De Franco Signed-off-by: Peng Fan Reviewed-by: Daniel Baluta Reviewed-by: Frank Li --- drivers/remoteproc/imx_rproc.c | 24 +++++++++++++++++++----- 1 file changed, 19 insertions(+), 5 deletions(-) diff --git a/drivers/remoteproc/imx_rproc.c b/drivers/remoteproc/imx_rproc.c index bb25221a4a8987ff427d68e2a5535f0e156b0097..12305f36552fb5265b0953a099e= a0d561880e3ff 100644 --- a/drivers/remoteproc/imx_rproc.c +++ b/drivers/remoteproc/imx_rproc.c @@ -1046,6 +1046,13 @@ static int imx_rproc_sys_off_handler(struct sys_off_= data *data) return NOTIFY_DONE; } =20 +static void imx_rproc_pm_runtime_put(void *data) +{ + struct device *dev =3D data; + + pm_runtime_put(dev); +} + static int imx_rproc_probe(struct platform_device *pdev) { struct device *dev =3D &pdev->dev; @@ -1125,12 +1132,23 @@ static int imx_rproc_probe(struct platform_device *= pdev) } =20 if (dcfg->method =3D=3D IMX_RPROC_SCU_API) { - pm_runtime_enable(dev); + ret =3D devm_pm_runtime_enable(dev); + if (ret) { + dev_err(dev, "Failed to enable runtime PM, %d\n", ret); + goto err_put_clk; + } + ret =3D pm_runtime_resume_and_get(dev); if (ret) { dev_err(dev, "pm_runtime get failed: %d\n", ret); goto err_put_clk; } + + ret =3D devm_add_action_or_reset(dev, imx_rproc_pm_runtime_put, dev); + if (ret) { + dev_err(dev, "Failed to add devm disable pm action: %d\n", ret); + goto err_put_clk; + } } =20 ret =3D rproc_add(rproc); @@ -1158,10 +1176,6 @@ static void imx_rproc_remove(struct platform_device = *pdev) struct rproc *rproc =3D platform_get_drvdata(pdev); struct imx_rproc *priv =3D rproc->priv; =20 - if (priv->dcfg->method =3D=3D IMX_RPROC_SCU_API) { - pm_runtime_disable(priv->dev); - pm_runtime_put(priv->dev); - } clk_disable_unprepare(priv->clk); rproc_del(rproc); imx_rproc_put_scu(rproc); --=20 2.37.1 From nobody Thu Oct 2 10:58:01 2025 Received: from PA4PR04CU001.outbound.protection.outlook.com (mail-francecentralazon11013005.outbound.protection.outlook.com [40.107.162.5]) (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 7C1D61A262D; Wed, 17 Sep 2025 13:19:53 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.162.5 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1758115196; cv=fail; b=ml0NoNNkZnhzDlmYvkOkQF4iA4ewKq1xD3LuQg9p+Ugdst9FCUtPfW7Nz9tYY17QaJc7QIMWulLeC7yL1Zn0nsTOYr/UEx1hTxz6tTHN/d4cWYwel33/bpuykCNjCayTBGjfN5ZtYdqGIWF1sqkZmczbWh7NpWBJLYxd68nteRY= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1758115196; c=relaxed/simple; bh=PqqGJoxSvEH+lfUeLuE4bZoVyQT7HHUA2RLx3qfsCEg=; h=From:Date:Subject:Content-Type:Message-Id:References:In-Reply-To: To:Cc:MIME-Version; b=LjZfWH2skAW1IGHqXKge/hFmjiUVGUJRiWqY4lL4XnNmoreKLzmUmaAMb52KmnyzE4rGjt+hbrwbSE06Wa7tlEmaDgrOuBO5MuYZUCBCsyRYM/Xj6em2XUcLLzpJRYzkhmdBevNf3Nc/AIUBMEK4wz9rx973+ov30bYpf7PyF4k= 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=C/latQfm; arc=fail smtp.client-ip=40.107.162.5 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="C/latQfm" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=sdK4BP/YscZ3ud6hPNahp52LitSd/0V+gb2vamVZs5G0X3Gbl744uB72eNLm/fLHTWGC12xE4D35cMUYU0RKQGRsOqM0IeJIrjEY/CviIuF7I2R3ZroVeO6yK8iZppbomMhCtaTxszpZKJPfEQlSWkn/uD1B8HYtlIVyQzcLCK956+wtSzLlNGQVVQ45F45lfjGW+SHWo52KYtS3OpWjxnOkAPxaqHHqZvpbr4rUkrKN+L6WjrK4JjyUq6M3G52LRZAIvd2d9QZmYS1ueppk7LfkbsNRgGmYOOEAeLwtvTUREVIfewvm9S6e7J8A/61FVYRQGvzMnBPgkNJzPUp3qw== 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=LYCZImqUbrRLDLO7pcrdDy0R4T7m0LqbZG5PZWwIDVY=; b=Xihu5s02AWPQ/AKu73alDXP0H7SIicQm5bwB9saxMCCzMcpIsQecDXAk997TxND/l/78gGpC4ZvtXmY4I638/F5eeI+N0xu/1DxyJTA0hv+7KAiHy/wulwS3uLGc3ThaHt+xzTqO3MP+bAusEXtt4zFHSiHHKk2ySg2S+6Lqq+MLBZpHynzLvAMqZ5x388P3LSHqqiCFbN8F2BrffGpMXmvKEJvvUv4Lb3KD3UJbzudknX7RDFe72U/mxnqcMs8JJzrZWgr78ZEdqIcTsV75UA9H/e50+4zlaUpQzFnVNFF9KEjTZzJxTNL8aasm6hqidpDMEgLAp6VKIbSb0/Ucjg== 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=LYCZImqUbrRLDLO7pcrdDy0R4T7m0LqbZG5PZWwIDVY=; b=C/latQfmpT1GK3LudpUkvF7MySP3fWIeo1uMQYyGSZqfwr7w7tZ01rZxnqYPUX2d+dFP7OjJZ7wHeKDC/ms2a4R2NpS7EQXONUQHQeyASk4qO1oLH1Ks1EZ+vIW0NNrtlXU+Hr8GZOsHze/I3IYwWXah5xIzwYyzYGNFc19W438/TPnldEvoTVmP+E5Iv1W6Io4EJRbF3rjRhGmxxMjbYzRCOtjL305ywjhlRSb/zP3JCXo2IMCWprSmRC13nCRXWGBNzk3qlCMuFlvk3TUM7LN9YRu99Gb3FmiW9p73M09PFZrXgdi8TZLhN9fNw7l1YC+n0Fmx3xjQFr6H9OkkaA== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nxp.com; Received: from PAXPR04MB8459.eurprd04.prod.outlook.com (2603:10a6:102:1da::15) by DB9PR04MB9751.eurprd04.prod.outlook.com (2603:10a6:10:4ce::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9137.11; Wed, 17 Sep 2025 13:19:46 +0000 Received: from PAXPR04MB8459.eurprd04.prod.outlook.com ([fe80::165a:30a2:5835:9630]) by PAXPR04MB8459.eurprd04.prod.outlook.com ([fe80::165a:30a2:5835:9630%4]) with mapi id 15.20.9137.012; Wed, 17 Sep 2025 13:19:46 +0000 From: Peng Fan Date: Wed, 17 Sep 2025 21:19:14 +0800 Subject: [PATCH 2/6] remoteproc: imx_rproc: Use devm_add_action_or_reset() for workqueue cleanup Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20250917-imx_rproc_c2-v1-2-00ce23dc9c6e@nxp.com> References: <20250917-imx_rproc_c2-v1-0-00ce23dc9c6e@nxp.com> In-Reply-To: <20250917-imx_rproc_c2-v1-0-00ce23dc9c6e@nxp.com> To: Bjorn Andersson , Mathieu Poirier , Shawn Guo , Sascha Hauer , Pengutronix Kernel Team , Fabio Estevam , Ulf Hansson , Hiago De Franco Cc: linux-remoteproc@vger.kernel.org, imx@lists.linux.dev, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Peng Fan X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1758115170; l=2091; i=peng.fan@nxp.com; s=20230812; h=from:subject:message-id; bh=PqqGJoxSvEH+lfUeLuE4bZoVyQT7HHUA2RLx3qfsCEg=; b=4p9QlK45+TgkjZOtCR1r6oGGqwL9Opw7AaIrWwgv0TH6XhI0r8y/W2qbYUeZC1tpq5MHmhleW TpXOUFZuKbSBIKJ+FXFUJc7o+RCj6Aqf5LKp+U2mz0Tq6E+xUReT7+P X-Developer-Key: i=peng.fan@nxp.com; a=ed25519; pk=I4sJg7atIT1g63H7bb5lDRGR2gJW14RKDD0wFL8TT1g= X-ClientProxiedBy: SG3P274CA0016.SGPP274.PROD.OUTLOOK.COM (2603:1096:4:be::28) To PAXPR04MB8459.eurprd04.prod.outlook.com (2603:10a6:102:1da::15) 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: PAXPR04MB8459:EE_|DB9PR04MB9751:EE_ X-MS-Office365-Filtering-Correlation-Id: e0d63f3d-1a88-4416-7e26-08ddf5ecdf6c X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|366016|52116014|376014|19092799006|7416014|38350700014; X-Microsoft-Antispam-Message-Info: =?utf-8?B?VjhEc1B4eVF4eDNqN1Z0RkZybUl2RlhaMC94eUFwM0ZnTEJZdFdjQ1lIajZV?= =?utf-8?B?ZVdvY3RkNGpIUDJaVXhCVFZOdUhaTGZ3M09WOE00Rk4xQzlkMjRwRjM4TEUv?= =?utf-8?B?TTBDQ3dnS1RpMm5nVWNMeGMvMDAzVGxpb2JWMjc5TWtzakd2SlV0bzN5NDd0?= =?utf-8?B?SnJZMFBWc242Q0dnaHNHYXBOSDcrR0c5cUp0ZnY2bmtFZlRJMlk5Z0dPUW5T?= =?utf-8?B?WW1yYTZ1c1l4UG5jRWprTzhlNTA2TDllNXBCKzllU1p1NTFCR2NZMXJxN2l2?= =?utf-8?B?OURHOEpQNHdVOEhES2pPc1lYdkMyU3BaSlRaVUdrb2hzQllHLzM1NDRCZXhv?= =?utf-8?B?dDBQWnRIQmxaMGpBYXFuVWJPRUxWejRDN1liWUROaXRiSnBnVFFMWWM5Rlhh?= =?utf-8?B?WExwaFF4cXplQlYyNUdwaTZDUWF2dSs3SEdHbzBUcTQ2alpsMWRWQzdWUnQ1?= =?utf-8?B?M2NpT2drRDVFaUN5dFdCWlVxWE1PQmxBN1krYWtxM3dCOU5qbHc0bmhZOXdi?= =?utf-8?B?MnBVNFJOM2VvNEZVVTBRSjNGdDIwYnNyKzExNmdRZDc5aGlobVhVZTM2VWNr?= =?utf-8?B?Y3FEV0JyOEI5dzdNS0ZFWG1CSmgvbVkzZEora1ZwT0pKRUJJcUFmU0I4S005?= =?utf-8?B?dm43ei9JajRYbEZydk5KQjlKNzk1ZDlJVHZBTk9pQ0VKSnZmaTBJczBwWUdP?= =?utf-8?B?bVo2RUZ5VlFZUkRIRFQwMUxPcTlvZDJQNG5aRkl1Vkw4NHlQNTJubjM0MnB6?= =?utf-8?B?QlFFWWdTZUd3UFlGbGpiTWIvanFHcmhQbG1wNURkM2VMem0rUGZZaC80WFB4?= =?utf-8?B?NU9GTWxTOXVlZmgzc2V6VHpTZWE2MEJ2RzhTSkxqTFlmczJwenJ0akFGbjll?= =?utf-8?B?KzNOT2ZDc3luL3dsOCswdmxGVEMxQzhLZ3RiaVRBQmhuTXd0d2Q3bjd5S0JB?= =?utf-8?B?a2VxQ1VrTXk3a2pMcWVyME5URnpEamJvT2tHNzdoZ09vMVAxeHk0Tldac1Vy?= =?utf-8?B?cGYzUm1JU2N3eWVxQVlLcVA1YittUDJPbG9UZFNwc0xsSllrSU1GdGF5YTU2?= =?utf-8?B?VktxTUk4UXdzL1VuTTlrdGhlUE9BQkNKdHpJTWNMMm42clhCektrR29DNmx4?= =?utf-8?B?NDl0WTltWFFlWEYraEZZZnJZaTFWaXJJbDNUa2g0Z1pPM0xiOWdydCtCQm81?= =?utf-8?B?UXU1ZUw5UENYaGtmN2p1b3R4VmRoZHF3ZHJCMHZHamdJeWMyUTRncDduWTF6?= =?utf-8?B?WGlwWTJkRXpjWm15eU53TE8zOERBaFhzZ2c1Z3o1enNwWVFaMnBrcy9WMHVp?= =?utf-8?B?eDI0UEFmWTc5K1p6andidVdIcS84bEN1NUwwOUR5YzlxWlFxT1lyaXM1bFMw?= =?utf-8?B?ZVhnZWxNTDJQV0NnYnZGOG02MU1qK2MzVmVlNG5wVTFxaDduSnltM2dQVitY?= =?utf-8?B?ZFpZcWVPUFBCalNpdTFMbDlHbm9IRUJCUEJXT1R4N3FNSTJzdVMyZ2JPY1J3?= =?utf-8?B?WE9LaXBHVk1WZjZ3bVQyWVVuOXc4RzNzWVdQTnBsOTVNMURsVFhKRUQrVzlR?= =?utf-8?B?V29obVBvQUR5Q2xJWEtGQmZCamx1bzJjQjlpYVQvNnJDS0FpWFpvcFVNb0JV?= =?utf-8?B?aE5QODAzc1RjN000dzJlbXhFUnY4RXlkUXBKZzZNMml3UmZMZUVvb1ptZkRy?= =?utf-8?B?cmpaVXZUNytVZ0VNblExazhRR1NGZUlHTWZwRkxhbElNWkZzenl5ZWxTKzNY?= =?utf-8?B?eE9FN2lxYkVJbG40SjBOQzlTY0tsK3pQejFMbERtOHBsUFU2aGZ1cGxBZS9m?= =?utf-8?B?blFlNHJsck1BMFJTakxBZnd6WkZrOUZtREpJOC9ZWnNNNlpkbnJoUlBtcGVJ?= =?utf-8?B?UXNhNmp4RXppMTYzQ1V6MHUwalNjMzRrbVhQV1dvNU5EeHpOOFJHTk5SMTd0?= =?utf-8?B?ZmZZaXV4ckxzOTdocW5xdEZsWE4yOUF1ayt5L3p6MENvNmhPNXRKWTd2bW9L?= =?utf-8?B?TURtMmhabWhnPT0=?= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:PAXPR04MB8459.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(1800799024)(366016)(52116014)(376014)(19092799006)(7416014)(38350700014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?T0J5NWRlc3RxWEhXZGxoMVlVRlBnYzR0dmV5RkxnMmdzL3RJcVI5SittdnA4?= =?utf-8?B?QlRFTXU0cmdxOEhHaGNjRkhtWElNUEZRRmdVZnQ2QTM1a2ViS1d6eWlQemc3?= =?utf-8?B?L2ZEallJUXpCRjFOZzJSSTB0S0lZelcyN09WYlRYeWFucGxBVUZsUFdVellt?= =?utf-8?B?bDEyVUlMNE9jekpRU1crN0pCYWkyM0toQUNTTFVqNW8rL0E0RHZPQnFMZUhk?= =?utf-8?B?c0JMVG10dDJXMXEvNkxONDFKNFFXbGc3YzFxNUFTdGtKUlNDeGxVL21WTC85?= =?utf-8?B?QnMxeVc3NFNiV3I5R0pyWUQySTJYazMxN0t0QTQyU3FDTXI1NlZHTyt4LzU5?= =?utf-8?B?eHRNQnJTSDM4NTYwQ0k3UFZ2anNaNEgzYmVlZDNGS0hYQ2NKcThYcXk5eGhw?= =?utf-8?B?SllHUng5Z0FHL0l0d3dEVXorUmJILzh0LzNEVGFtVm9pSlBLakVsVENrTWdp?= =?utf-8?B?Q2NOOVBmOGlwMzZCTXpWdHo4amFxS2ZZeWNPQUxHNG0xTm1CeElndDdaYVhU?= =?utf-8?B?ZTRVdnMrZmNxMk9KN0VPbWFNQXVOR255cE5sRjRlWCs4ckJRMzVUKzVlUkJi?= =?utf-8?B?dUpFZjFMdjBYSDlWRmFKS0dLYXhrVVozdHZNWjJEMzJoamMwRWY0WEUraXNL?= =?utf-8?B?M05OWDQwQnlvZGI2SiswbTdpZFBzbHYra2Vld0Q1eVRUTnZBRGs5OHBIc0pj?= =?utf-8?B?Q2EvVTZLVWJUOFBvbGFEd2pTcWFOT3BBUXF4Nlg4Y0tycDRjU3pYcC81MDNI?= =?utf-8?B?NjFlQjV3RnhvcHV4VUM2aTc2NVVBdHhSQXFHVlVDdzJWZWlMRTV3QzNqQitz?= =?utf-8?B?cThGWXM0a1p4eG53bDJodUkvRmdVdUNTTWtZNloxVVJWbG5yYXFVSWR5Qmhq?= =?utf-8?B?bi9IR0dXczAweVpTSEhjeGhpZXFCV3p2RE4wVGRPWkMzUUFUalA0bFVZNHVk?= =?utf-8?B?WUVTUTNCVWIydnBSLzl1VEZka0RmTmdkbGcrTDRkdkFOdTVFaU1scVc2WUF1?= =?utf-8?B?YnVQeTJtWlAvL09MNlFMRUMvSjBpcERBaGxxL00xeGg3SDRjVUdhZk5QcHRS?= =?utf-8?B?c2xlY1BpRENvaXhpOHV0eTBIMnNuZXBYaVg1cWYvTHk5b0dOdXd3ZC9vMERM?= =?utf-8?B?QzFvSk56clpEL1VQZ2VqRWtYY3dPYzVYRmsweXNYNk5oSDl1dVN0Y3grTHJD?= =?utf-8?B?c3gzaDJHSlAxUVNUSk1wdkhVTXVmOEJDV1lZays3Nmt6MnV6Mmx3NWh3cWpx?= =?utf-8?B?VEhNakJLMGNBNWszZ3hwRTluNlhtYzV4Q2Zvd1JMVnk0akg2bk9JcEd4ZVFp?= =?utf-8?B?cmR0MmFjSStjL241cFRwejJkRzJSM3Z5dmVMZlRHTCtPbGlIUlJvOGFRS3l2?= =?utf-8?B?MTFaQ0RtUHhoRWNmWitoTGMxNzBDNnBIV3EwdHdMTmk5a2x3TkVraThyaEp1?= =?utf-8?B?bFJKVWRDbExZeHY0WHJraHJGVWZvZGRnU2J4OUp1alRFdU1qSUtzQ3lhdnI3?= =?utf-8?B?ZWNBblJEWEwzcWVMTGp0SUtiTm5uc3ViZzY4SlhMVlovQzB1aDZIUmtpUEty?= =?utf-8?B?U0FEU3BXZEtLSllMS284dHlOUkM4ZHBobEJ4ck1aY1ZoUUdSMDY3TCt2MTdz?= =?utf-8?B?V3JzbndneUxzTTFrTkx4dHZGcHpyaFdpeXlFQ0pUeUprRWs4Wk91VWRwQ2pz?= =?utf-8?B?VFVCVHY4Ti83aU1HTzZDUTN0SDVzSmNqYjJHRjY5ZFl0L0dnVFI2VVkxM21a?= =?utf-8?B?U0E2THY1TUJsdnBRTC83U05tWE1VbmNmbXZTL0JWeXY2R1JGbXUvTCthZ0cr?= =?utf-8?B?azRyZktQcmpBMHlZZWNIMTdWN3JaMDhGR3dGNnMvMjlKWDRMUSthOERtMWxM?= =?utf-8?B?RkhLaXRvanBPWkMxeXZjUXZrUzM2cm9mU3doK3ZleUx5SXdDRVVlNE1mcTVK?= =?utf-8?B?QXN1ZFU5TlptVXRsS0dkdURRcVVSQTZkVXN6eS9pVnQ0UURWVEQ3RGhld25P?= =?utf-8?B?bnN4S3Btajl5OEZLMjRxYTFmS3M3OWRRVWFBemRjb0ZxUm4wN2d6bzFidEVL?= =?utf-8?B?NjJoZHlTN3g2KzBPNFYzVDZCUW05eC9GZDNDNmRvUHVzMWRUMURCNXBINTJZ?= =?utf-8?Q?3M733BIGuR38kK9aIq0T7no0U?= X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: e0d63f3d-1a88-4416-7e26-08ddf5ecdf6c X-MS-Exchange-CrossTenant-AuthSource: PAXPR04MB8459.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Sep 2025 13:19:46.7932 (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: CLMBkuBSPyWSbkCH2iBukCmD+6UNsBBVtmvjQ4f0NilF8BvZ12rX6WF+pf5R9p6VtodaFnO7YZf9SHvlr56HdQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB9PR04MB9751 Replace manual destroy_workqueue() calls in error and remove paths with a devm_add_action_or_reset() helper. Ensure the workqueue is properly cleaned up with the device lifecycle, and simplify error handling in probe by removing now-unnecessary labels and cleanup steps. No functional changes. Signed-off-by: Peng Fan Reviewed-by: Daniel Baluta Reviewed-by: Frank Li --- drivers/remoteproc/imx_rproc.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/drivers/remoteproc/imx_rproc.c b/drivers/remoteproc/imx_rproc.c index 12305f36552fb5265b0953a099ea0d561880e3ff..cc776f5d75f1f614943c0525087= 7f17537837068 100644 --- a/drivers/remoteproc/imx_rproc.c +++ b/drivers/remoteproc/imx_rproc.c @@ -1046,6 +1046,13 @@ static int imx_rproc_sys_off_handler(struct sys_off_= data *data) return NOTIFY_DONE; } =20 +static void imx_rproc_destroy_workqueue(void *data) +{ + struct workqueue_struct *workqueue =3D data; + + destroy_workqueue(workqueue); +} + static void imx_rproc_pm_runtime_put(void *data) { struct device *dev =3D data; @@ -1084,11 +1091,15 @@ static int imx_rproc_probe(struct platform_device *= pdev) return -ENOMEM; } =20 + ret =3D devm_add_action_or_reset(dev, imx_rproc_destroy_workqueue, priv->= workqueue); + if (ret) + return dev_err_probe(dev, ret, "Failed to add devm destroy workqueue act= ion\n"); + INIT_WORK(&priv->rproc_work, imx_rproc_vq_work); =20 ret =3D imx_rproc_xtr_mbox_init(rproc, true); if (ret) - goto err_put_wkq; + return ret; =20 ret =3D imx_rproc_addr_init(priv, pdev); if (ret) { @@ -1165,8 +1176,6 @@ static int imx_rproc_probe(struct platform_device *pd= ev) imx_rproc_put_scu(rproc); err_put_mbox: imx_rproc_free_mbox(rproc); -err_put_wkq: - destroy_workqueue(priv->workqueue); =20 return ret; } @@ -1180,7 +1189,6 @@ static void imx_rproc_remove(struct platform_device *= pdev) rproc_del(rproc); imx_rproc_put_scu(rproc); imx_rproc_free_mbox(rproc); - destroy_workqueue(priv->workqueue); } =20 static const struct imx_rproc_plat_ops imx_rproc_ops_arm_smc =3D { --=20 2.37.1 From nobody Thu Oct 2 10:58:01 2025 Received: from PA4PR04CU001.outbound.protection.outlook.com (mail-francecentralazon11013005.outbound.protection.outlook.com [40.107.162.5]) (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 6D4432C0263; Wed, 17 Sep 2025 13:19:56 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.162.5 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1758115198; cv=fail; b=QO1pxjsTK7NzwlatQPbIcOcOGKyOC9klG/TEK1SRnhPFJ/GrMIW6BJy0RhrJ5QNQmeMHNt+q+Z+zFkfmg79/waY0S/Sp2aDl2Q5ekI4UxdOhMPwTY/IWQF3ufblX+lU16xwtzP+alA1r0vkcYUR70TU9vlgwiKBEUNScg3lVgjA= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1758115198; c=relaxed/simple; bh=2MvVcLCP72WaT2i9RsDQd3IshZHvpdF587xHsGNY3qw=; h=From:Date:Subject:Content-Type:Message-Id:References:In-Reply-To: To:Cc:MIME-Version; b=Yv/g7z9D0C4R/Cl6ifRWFK5PH3BqgHAXftNu3s7GX0zQyV9wX//sN2urEx1SUqdCyRvzI9Rzi+1yulRASOUsfxV/QKsfdyfaXFLd5+oeyqmDqSnZoy/qgbJkr9T4W0frBXYCXsOiBbyXH4qPaXcv5TVQPYDBo84Mgwp4bPjl4oY= 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=IT2AvUxR; arc=fail smtp.client-ip=40.107.162.5 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="IT2AvUxR" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=ct+XOieYie/M/NNLLQcoHUwqMfhVev3CLkIk86pPqUgw7llGRVMK9nx3sKaNV6MYYowfuzugyf2MA4g6rB4n6LOADD3EQ74doHRW38vUwClLrVKy+37DicLoZKjrxJz7AwhKJ8DS8ZxrP0JSMX0Uac5rY39pJ/GWB0W/sosHr/RI4+JCPiYnsUz+63NUkvM7E061XG/z1T4C5uCzaSuDM1pqErfXSgkr8a3y3u8Gp6XVmdOFaJKrX2xJCN7IjqmWhZaiRqRzRULF7KTzYFGpD7AexJW19QfRx7N9PNwOgKmLwi12vxJkI/QbsxyFrldXq+0+G6XlwCgItS9Qn6Amvg== 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=/CMraOTOMzC3nrOwRNk9WjUxW8M4ZfoTVYL6pfc0WcE=; b=aWnfl2MOmPt3QWwYTbAHM1EEMByI1rzY/bqSCt0V3w/lO+OeTKn2Of+SQqjepXn8qm1v7YvRxi627jIdwHS+cpAwaosLjlnhiz+BAu/KqoLiiI5g1iVyJs01MgwxC4OqJ0JW4SS3638zVNLyKIu8lggtKiC2dG6ysGOrke7CUWvEM2Tb1h27/YVGRqkXbXZjRDGXUrSwAykFHLzwK6iFzuM57cdwlcbJ1abgQcXyuRAaxoCm5dcLVTpSrLCBrRlVYqSxnHPXJhCjHXoDUYozKqBngNsprmxxiSpAjMZ6L2yRKd3myB6NLAWQx1OnMyZMl/JyucmdWfoSbkZpZH9HRQ== 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=/CMraOTOMzC3nrOwRNk9WjUxW8M4ZfoTVYL6pfc0WcE=; b=IT2AvUxRINleCvuvHj+LJ2mj2ydo2eWP8pJSni9+cZG2xm9q4f6SWKQEggbzc3p8jVsSem8z3exDiSvRFQNWSVsBo45sYe2NLANhK6hmD3wJVHt6UU7+r6oO4gOtRxjmfIVEuWqZ+otpDuzI0a2hPspviOZtN2PycAzPfaa4KfH9WvjQ8r6vNg76g2jZTTuCF53NnJQevPi2U3QcwdkQ272fo1qApgXSHGE6gFL5UnARmQMxfBDeABI65MQRc+iYffitZfgpUs+JYXo4PKmPOMr07HCqC7WE5e1j6QvxrsysEgtWHbEXiKFaKJ7t/PD5GhDqWp1tmC2EV5g5b1MQfg== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nxp.com; Received: from PAXPR04MB8459.eurprd04.prod.outlook.com (2603:10a6:102:1da::15) by DB9PR04MB9751.eurprd04.prod.outlook.com (2603:10a6:10:4ce::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9137.11; Wed, 17 Sep 2025 13:19:53 +0000 Received: from PAXPR04MB8459.eurprd04.prod.outlook.com ([fe80::165a:30a2:5835:9630]) by PAXPR04MB8459.eurprd04.prod.outlook.com ([fe80::165a:30a2:5835:9630%4]) with mapi id 15.20.9137.012; Wed, 17 Sep 2025 13:19:51 +0000 From: Peng Fan Date: Wed, 17 Sep 2025 21:19:15 +0800 Subject: [PATCH 3/6] remoteproc: imx_rproc: Use devm_add_action_or_reset() for mailbox cleanup Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20250917-imx_rproc_c2-v1-3-00ce23dc9c6e@nxp.com> References: <20250917-imx_rproc_c2-v1-0-00ce23dc9c6e@nxp.com> In-Reply-To: <20250917-imx_rproc_c2-v1-0-00ce23dc9c6e@nxp.com> To: Bjorn Andersson , Mathieu Poirier , Shawn Guo , Sascha Hauer , Pengutronix Kernel Team , Fabio Estevam , Ulf Hansson , Hiago De Franco Cc: linux-remoteproc@vger.kernel.org, imx@lists.linux.dev, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Peng Fan X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1758115170; l=2645; i=peng.fan@nxp.com; s=20230812; h=from:subject:message-id; bh=2MvVcLCP72WaT2i9RsDQd3IshZHvpdF587xHsGNY3qw=; b=aE6E087kldzOgeb0vmWfpjtzSSBBTtcx2daIgkAxU7LJAFQCFUAzzSMwHTGGBVS4bipNvrhzL Jf4ccg9NhuODUzdU8uPMIRQeoY1+FqOB5wEtPuNKD4lKHlM/4qH2Z7O X-Developer-Key: i=peng.fan@nxp.com; a=ed25519; pk=I4sJg7atIT1g63H7bb5lDRGR2gJW14RKDD0wFL8TT1g= X-ClientProxiedBy: SG3P274CA0016.SGPP274.PROD.OUTLOOK.COM (2603:1096:4:be::28) To PAXPR04MB8459.eurprd04.prod.outlook.com (2603:10a6:102:1da::15) 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: PAXPR04MB8459:EE_|DB9PR04MB9751:EE_ X-MS-Office365-Filtering-Correlation-Id: 6a897f30-1441-45e7-b12e-08ddf5ece22c X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|366016|52116014|376014|19092799006|7416014|38350700014; X-Microsoft-Antispam-Message-Info: =?utf-8?B?Y2I5VjkyN3UreFhjNEpPSHRaLzlpSm85dkZVc2lyYmJOMzZXc3V3eXZvLzNU?= =?utf-8?B?aCsyN0N0Tm9xbko3RlFkL2RaTXRxYmkzNWY5NWF1WVRIbTUxTHNkbmxreG1n?= =?utf-8?B?Yk5YeFlqWDRvV1NwUTBiRG1Cd1FSVEJNVzgzaSt2TFRnQUhnLy9VSWFiQjFn?= =?utf-8?B?ejVMUXpWL2s0ZENrSGtseS96K1ErNzVCcGZxSlhIQ21GVzdZdHZYNDBOeVMz?= =?utf-8?B?cDhJL2gva2xMeStGeWM2RkluUFRiQWxhUllSWlhFb0JCVHM0UkdEQ05DUDhk?= =?utf-8?B?SS9UK2xFQ0w0aUZhdWZ4WTdKOEhSOWgyMllSVWxGYkJwYUQzWktyVjhGMlhL?= =?utf-8?B?STBJSGN3bDRERzdUbTM4TkFyNXBUNm5pQ0dqckZqRmJQN2xyMXB5ZnQ3T2pW?= =?utf-8?B?WVB3eHFId2NOUG44MVluZ0x5NXRUNnM1RzRhV0YyOGpNYUlPSDJ4SWxtUTZN?= =?utf-8?B?Q2tKZ2N2dmtrdlZHQzJXTzRkYjVCY05NdmF2V3gwSmJGSlVyUTVTSjlwbVRy?= =?utf-8?B?L3BxOHBVbkhYZU1rTVo2RjZ1NnQzRlRFVHJITTdjRUhpTGx2VFVSYkRhR1NJ?= =?utf-8?B?RFErR1lwK1JTTS9oaW5aSkovV1ZKTC9tNHBGMUhPYXhvZER1MHdoZUl2MTV5?= =?utf-8?B?SnBUZFlqQ2JQRzFJWnNVdHRXTzJPN3M5V0Z3bjJWQlJjb3FRSXB2ZW15dTJY?= =?utf-8?B?U1R5cHV5aWJGQjZzNHk3STdlaTRrbFNxZ2tmbWtzblgrT1ZpeEdTTVBJbnQx?= =?utf-8?B?QXpIVC9qYzVHSWlqTjlKaGFRNEkwRmlSMVdjNDlLTFhnd3NJZFI1YzdINU4x?= =?utf-8?B?SS9YTDhVa3BOaG9ENUNrNnIvV2tMM3J6VC9RdUk2Y2tHdURhWFB2WXBURGVq?= =?utf-8?B?THdac01pSVk5RSt5THArTDNTZmN6aGlFN1JBRWJ6YkRuT05qcVY0cWhYS0o2?= =?utf-8?B?aTErU08weGpqMTFQYnJLeG5zbEVtS21CU2FRZXVpNWpGeXdTR2tyQkc5endt?= =?utf-8?B?a3dOZzNTZ0gwUUt0K0YxaHVGeFhMTnBxUU1tMHQvL2NabjBOeEt0Wk1ySU5O?= =?utf-8?B?K3d4clU4aURNRHVjbkhLVEw5QVp3ODdNSDBaWXJjOGxWUGhIa0M4dXo1cFZK?= =?utf-8?B?bWZMajh2MG5GelJIVERpQnNPU1hyTHlLR0dxTDA2SVdwcVpsb2R2ZWFWTE14?= =?utf-8?B?TWE1SkxkNDRZOGdJaEVoQ3p2YXpjNk1acXNlQmwzUTdtRkRSTFNRTXlDRU80?= =?utf-8?B?RTNkR1dLK0Z4QTRvNm1TTVp2Q1k5dGppcE1jdm94clIyV0ZaRkhISkR3NXhF?= =?utf-8?B?eWs4UlZ0M3pIWHRFMVFRVk5oZ2hBNVpWVEIxeWpEU0QxNTJKUjE1ZjBUVEdt?= =?utf-8?B?Nk80QUhDNDk1bERUSmg2dFN5UFdaUExVSFhDYUhKTHJiYTJiYWhEc0NjRjFr?= =?utf-8?B?amVIQzQwK3AyV25zR1FxSWVaWEYzK1RYbmtHWWNxMnNyd2FRTnlLUW1mazkz?= =?utf-8?B?eGdjVDU4bjUyM2dVSzQvVnRTaWM2QndyNVgzYTlkbGl0NmpZYk04ZTRrQ1cx?= =?utf-8?B?SjZScC9mWnZZeDhWR3htRGxLbFdDWlpXR3ZLTFgvY2ZmcUhtaC9YK0ZCQzNJ?= =?utf-8?B?T29relYwNTk1TmlsMEdjZmFrTDNWc3Q0Q1UzQ2FjMjdvWmViZ0V4Nm42OUVy?= =?utf-8?B?dlE0MnZKanVWODh3ekZFa1kwdE93NUgxeWs4VnpCSmFsM2EzMmNjQVdpTkxD?= =?utf-8?B?TFB2SWdXMktrSUNWbWY4YmFXR1lBZDlpcGU3cE1hS25yOVVrVmR4aVJHNkZL?= =?utf-8?B?aUJqN3lEWktNdlZuWnZSdGFIaEYzU0JXQkNnTERvUXQyclFkQjNBNU5HKzZO?= =?utf-8?B?ZjNZamx4U0ZRYzQ0Z3EvaTRRK1RhY1lTN1FPVXJCR1hBZHcrZzB0dGJsS2FM?= =?utf-8?B?T0l5Y3hEVExWMmRUUnl1RThhT0FKekRrOVdGbG1TeDJEZnNPcldqQlZlZWxo?= =?utf-8?B?ZVNmUkVhUkJBPT0=?= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:PAXPR04MB8459.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(1800799024)(366016)(52116014)(376014)(19092799006)(7416014)(38350700014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?ZitPUUQ1WTlEOFBKOGRXNnpWdXVjQkI5VGNMODRzL1NIUXdheVVVWnRqam5L?= =?utf-8?B?aWhsZ0FQaDhRY3ViK2pDQndlOEZJS2ozenZZN21FUTU3dGU0T2doR1ZjdFRL?= =?utf-8?B?SjQ4NktvZ1VrUytrS2JWVHQyQWxxNStBNkxYaVVFWkR3RXJvS3JsWnA2MUMv?= =?utf-8?B?bm01S3YzSHVjMjQ4VGQ5NCs3RFFQaEEzeTZPeFU0NzhuTjhtNEhMNm50cFpl?= =?utf-8?B?VG1KSi9ReXdSMGVMOTFEcGlESWgxMWZOSGJWSDZRMjRyRnBCZThzT3hzd2VY?= =?utf-8?B?VktCc3RaejYzM2pKVkt5OHZ6OUd0M21JYnprR3E4Z28wV0Zwd2NiUkZhWHlx?= =?utf-8?B?bjlnMGtjZXJNYzdmWHFKdU10VnBJTkFmUmpGdUplemVaMngwd2VaZjQxaDE4?= =?utf-8?B?WHRHQ05IbXhza00wTzVXQVNzV2MwcnBnM0NSOXhYRDJ6NFV4VUFudVBMcEZ4?= =?utf-8?B?Q28wSXNaM1lYV1J0Z2RqUFFBVjczMmk5SStIblNaWUdoU1NzV1dteEkvRmpK?= =?utf-8?B?SlUvMVNMYXdqMi9hczdNa3lJUEc3cUc5OWd5d1F5SFJYK2htWmNvd2ZGRlRv?= =?utf-8?B?ay9hZ1JGcVozZi9VdFFlK1V3WHI1SExKdE84bnpGZ1dUOE9XQ0hVRGo3QUt4?= =?utf-8?B?ZFVod1FKV1hOd2JOWnJSaXllOHVCZU14V0lDMWRpaXBoMUtzOGVrRjBPUVZB?= =?utf-8?B?MDdLNXRuMXorVG1CaktMNHJCTmMxclFyQlpyYWhWK1lDRG5HVkJGU24vc0tk?= =?utf-8?B?QnZoalZLOHp0b0Y0aElLbnduN1VHL3Q3TjlIRzBadUQ3ZHJEU1pTdmZIMEZ2?= =?utf-8?B?NjlQWDdMT3drSUxQbHJVY0o2ZmgyS01ISENPa3M5bjBqeXJIS3g3bGVkVmRj?= =?utf-8?B?ZWEyOXloeGJXTW11Q1FZVVNodG4yS2pmaUUxVm1vU1cwdTRWb2JaNlN1bHZi?= =?utf-8?B?cHR6L281Z0ZENXltZWxYV3grRXZVVXl4cmRkZDVnZDZMbC8xdjBXUFhvdU14?= =?utf-8?B?NWd0VmN4YmhxL1RNYXNIOHkzcHNHd1Z5Q1h3K1h1bk9UaExFTWN1RjltM1Jz?= =?utf-8?B?V0h0MHVUMS9WcWFjcXppU29WZ2MyVlZHamRQOHVITTlvdU9Wa1A2U3oyVFBh?= =?utf-8?B?YjN0cUxBN1loeWszaGFSTE9wb0hrL29NMjU0RmhqT0dBMUhRTlNNN1Y1TFJM?= =?utf-8?B?aUNVc3p5c2N5bll1MGE0Rzlsb1BrWE01YVZsU0RZakJ6NU1tRVBrZGlrbGZa?= =?utf-8?B?QXVOVWc2cFhteWFaOXVGUVYvK2NOOVU0TGk0VDBYdFRnNG91azgzdHZXc25I?= =?utf-8?B?OURKaWRIZnlMeXhnV2NhVE9FMjQySDlWWGV3a1VmVFBNSm93L2NIbW0xeU1Z?= =?utf-8?B?QmlvU3FvQStleENCeE5IcXo0aVVkOWZVbXFNOXc0NDBYMUpwcndjUDZDNDB2?= =?utf-8?B?RlVJZFdQci9xdHQwL1hkTHlkZ000TGhuMHAyc3pEdTJONElLeEIvK2FLVzhQ?= =?utf-8?B?VklxS1RoZUFWYjlWdVJyOEtiTlUzM2VIY09CekNYZTJxdE50WEw5V3pDbVBZ?= =?utf-8?B?ZW9pZlU1TGdTNWF1QWI1aFhHdTc1UEh3T3drU0NocGxudVIycmFUd1UyMHpR?= =?utf-8?B?Q3Q0WWZCOStldWdrYXV1VkpYTGRiQmh4YXc4ajhkT1EzalJjdXNVMXphb0Nj?= =?utf-8?B?MmNZR2RLT3lTWUVsZjRhYytXSWg5bzFla2htVmhzbWhKMFVEL0ZDMU50NHhK?= =?utf-8?B?UUpucld4Z2gvbGNBNGMyV3V6VUp0NmcwWVlCbEoyRkdzQmFwZVZld2VOWGVs?= =?utf-8?B?UXAyYW9ZL1RZQ2FuM0hRdXpOdXcvRUphSEhrN3AzWHpmY0g2d3VxU1lTTXUv?= =?utf-8?B?cEs3clNDcGJTeUJHRnhaQjcvZTE2MEVkUnJDWVdwUUJwUUxVS0VTMDFpT1lR?= =?utf-8?B?dUFOSzY4RVRQbGtzUFNIWXo2c1oxZFlOOGUzaks2ZUI4dGJnRGlyeXZETEQ2?= =?utf-8?B?S2ZxdjYzbTN1MHhmcTBxWVk2alQ4aWMzZEw1dlI1cnl6dDdrTDR4anZVcWhR?= =?utf-8?B?L29NZUVpRUlESXVHZiszK1hFZVlyWHZIMGRrZ1JiS3E4L1R5RjJzL01SSTNn?= =?utf-8?Q?gzp2ltfJ0kEJBRXpAUxNmRDv5?= X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 6a897f30-1441-45e7-b12e-08ddf5ece22c X-MS-Exchange-CrossTenant-AuthSource: PAXPR04MB8459.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Sep 2025 13:19:51.3860 (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: pRgkBqsu3QgyxgPvb8wYbic3wHmYOgRq1TcpPjfZVq5Fl/Ek5YamaP+hKcLRdsnCKh51eLF2+kIGdO7I4ItRDA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB9PR04MB9751 Convert imx_rproc_free_mbox() to a devm-managed cleanup action using devm_add_action_or_reset(). Ensure the mailbox resources are freed automatically with the device lifecycle, simplify error handling and removing the need for manual cleanup in probe and remove paths. Also improve error reporting by using dev_err_probe() for consistency and clarity. No functional changes. Signed-off-by: Peng Fan Reviewed-by: Daniel Baluta Reviewed-by: Frank Li --- drivers/remoteproc/imx_rproc.c | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/drivers/remoteproc/imx_rproc.c b/drivers/remoteproc/imx_rproc.c index cc776f5d75f1f614943c05250877f17537837068..e30b61ee39dacc88f9e938f8c6f= fe61fef63dbda 100644 --- a/drivers/remoteproc/imx_rproc.c +++ b/drivers/remoteproc/imx_rproc.c @@ -93,7 +93,7 @@ struct imx_rproc_mem { #define ATT_CORE(I) BIT((I)) =20 static int imx_rproc_xtr_mbox_init(struct rproc *rproc, bool tx_block); -static void imx_rproc_free_mbox(struct rproc *rproc); +static void imx_rproc_free_mbox(void *data); =20 struct imx_rproc { struct device *dev; @@ -780,8 +780,9 @@ static int imx_rproc_xtr_mbox_init(struct rproc *rproc,= bool tx_block) return 0; } =20 -static void imx_rproc_free_mbox(struct rproc *rproc) +static void imx_rproc_free_mbox(void *data) { + struct rproc *rproc =3D data; struct imx_rproc *priv =3D rproc->priv; =20 if (priv->tx_ch) { @@ -1101,15 +1102,18 @@ static int imx_rproc_probe(struct platform_device *= pdev) if (ret) return ret; =20 + ret =3D devm_add_action_or_reset(dev, imx_rproc_free_mbox, rproc); + if (ret) + return dev_err_probe(dev, ret, + "Failed to add devm free mbox action: %d\n", ret); + ret =3D imx_rproc_addr_init(priv, pdev); - if (ret) { - dev_err(dev, "failed on imx_rproc_addr_init\n"); - goto err_put_mbox; - } + if (ret) + return dev_err_probe(dev, ret, "failed on imx_rproc_addr_init\n"); =20 ret =3D imx_rproc_detect_mode(priv); if (ret) - goto err_put_mbox; + return dev_err_probe(dev, ret, "failed on detect mode\n"); =20 ret =3D imx_rproc_clk_enable(priv); if (ret) @@ -1174,8 +1178,6 @@ static int imx_rproc_probe(struct platform_device *pd= ev) clk_disable_unprepare(priv->clk); err_put_scu: imx_rproc_put_scu(rproc); -err_put_mbox: - imx_rproc_free_mbox(rproc); =20 return ret; } @@ -1188,7 +1190,6 @@ static void imx_rproc_remove(struct platform_device *= pdev) clk_disable_unprepare(priv->clk); rproc_del(rproc); imx_rproc_put_scu(rproc); - imx_rproc_free_mbox(rproc); } =20 static const struct imx_rproc_plat_ops imx_rproc_ops_arm_smc =3D { --=20 2.37.1 From nobody Thu Oct 2 10:58:01 2025 Received: from PA4PR04CU001.outbound.protection.outlook.com (mail-francecentralazon11013005.outbound.protection.outlook.com [40.107.162.5]) (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 B0B19302CDC; Wed, 17 Sep 2025 13:19:58 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.162.5 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1758115200; cv=fail; b=Ha5GyS+9I9yWg4/6SErWl0qqUG+7vJRzG3QWtbnBlviRAirWTTNTtASocrAc4/rABmxIhiaECZfCr1Np5QQdt8RJjR8AE5dHa4HQdAKzP35o0ZEwpCoO5rfECBvRt9omj7+7Epc4UoGBRfZf93LapBr2J4OEtq+B9Yn3AOT2Q3g= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1758115200; c=relaxed/simple; bh=+/j8JncNqpu74Wr3O9zlH+chJ0/pE8cr+NTap46Pfec=; h=From:Date:Subject:Content-Type:Message-Id:References:In-Reply-To: To:Cc:MIME-Version; b=JP0R7AHbxcYEsrZPhrBot0mnY6si+r0hNCf3u04hjxsuf2mFf418hUN1GrT040DpPe5RSiAqGQiUg9fM3abofww5O2Vl3cQ71KDagVHfkjsv6yAZ45LrsGudXK4sQlyBI+W/S9cmoaqeT8hwYsI9ApblF4QCu3mSIIkJQuoSQyw= 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=dIxXn0Kw; arc=fail smtp.client-ip=40.107.162.5 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="dIxXn0Kw" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=YnkcBSA37biifpdaG6Fw2jDx3SnX8F9731G5jVPGsgqaeXjaGgV6nXbBg4YpugzC5lKtBq+LMFL3kPtjt01fhN5RRkghdGU8YNbRLZYihH1R2G+3YxSXqNrC8Xw5IEBHm0vcanQOnsQA+0jMNlBoJfdyMzAUDafeGYSe9mGu816uXq985IPA9A7FKmP+dFo1huk7LFBtVpdgX3V/CcbMDUNK5H7Bax/R16OMJ1riBujkISq4U+o9T2HICQcCquvbBRk24l16RqslxuZe1woYz1/GgFHKBEnIjUKQC1PrtfLg+zc7YT7UglvECmI64ABeACBJzcliB8aygF+oEZF48Q== 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=psArSojbc7wN+nR4x68M0aGnL0UwIgNU3PmNssBv8eQ=; b=XaSNkMHsoBzSZk8ZGfQaZuB6cN6I/nkZFfcVhhHNFKA4J/VT6BMfh4EcbRWkWdVl+Az6STjradU30Llzf7U3KupkkJP3zZjMlQz3zPkFBd6BV7NaL8+moTcGbV4zC0xc2HWB7D2BX6xZcFCLD4rL4toHJ2dSlL0qZHWSS29pqO2KJ1gkMlpvytkKtATrlIs3GuaPzip8c1SeSgk6ffDzAY9z8GEEXeaxZ6VT/4YdiBJDd5xuwZWvKK99ABvO9l4Emm/BHVFF1L/WA+2JygmvuedNZERbY3es+F90O4nkXKp9wkj4MGg9AeYloUOiqD2QTVVa7CQjQnAuEbi5xhIS4w== 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=psArSojbc7wN+nR4x68M0aGnL0UwIgNU3PmNssBv8eQ=; b=dIxXn0KwidWXVLoc30mHWfpazhmL5uyrtbSSNTQ7ZggZX9Pkf97b4Qdh+1bZFUL2Z6ra6SzpUKpVy3StB6b5oyG0LkPv/ffIMc+ITtPZz/M6GTZn09v0kvXldvAvxzec76Zjsx03g1ceErXYEj5bA0P2KwERDOGZkrPh5SjSxjr5ar8Hy8osgUM3SRbEcwQk7Yz/Sy/h8gkq0CWk+AHHfB1OGHBBtZU/Sn4sG+Mb/mhKw5wcVX+A3ukBR1w5Mk7ovMbrckhrA+0QoEj2a2k67ceOgBPKsVFcd/SkUMTZi8jl9qL94dKEo7TU1O0GeqaZ9UjRRZ0SKcR7j9Dxs2Xurw== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nxp.com; Received: from PAXPR04MB8459.eurprd04.prod.outlook.com (2603:10a6:102:1da::15) by DB9PR04MB9751.eurprd04.prod.outlook.com (2603:10a6:10:4ce::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9137.11; Wed, 17 Sep 2025 13:19:55 +0000 Received: from PAXPR04MB8459.eurprd04.prod.outlook.com ([fe80::165a:30a2:5835:9630]) by PAXPR04MB8459.eurprd04.prod.outlook.com ([fe80::165a:30a2:5835:9630%4]) with mapi id 15.20.9137.012; Wed, 17 Sep 2025 13:19:55 +0000 From: Peng Fan Date: Wed, 17 Sep 2025 21:19:16 +0800 Subject: [PATCH 4/6] remoteproc: imx_rproc: Use devm_clk_get_enabled() and simplify cleanup Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20250917-imx_rproc_c2-v1-4-00ce23dc9c6e@nxp.com> References: <20250917-imx_rproc_c2-v1-0-00ce23dc9c6e@nxp.com> In-Reply-To: <20250917-imx_rproc_c2-v1-0-00ce23dc9c6e@nxp.com> To: Bjorn Andersson , Mathieu Poirier , Shawn Guo , Sascha Hauer , Pengutronix Kernel Team , Fabio Estevam , Ulf Hansson , Hiago De Franco Cc: linux-remoteproc@vger.kernel.org, imx@lists.linux.dev, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Peng Fan X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1758115170; l=3567; i=peng.fan@nxp.com; s=20230812; h=from:subject:message-id; bh=+/j8JncNqpu74Wr3O9zlH+chJ0/pE8cr+NTap46Pfec=; b=GYifSUDnkclxB/nkeeJLitzJRLm/57ASyRV52kPoZRAdQTLbgv3z6KSwgNXJ5p8rHEPqjidj+ zwcJ1dFvIzOAqH40PjE3DDUu5cURALGGgBuzq/hbBeiVsk0Xt7Q72Sc X-Developer-Key: i=peng.fan@nxp.com; a=ed25519; pk=I4sJg7atIT1g63H7bb5lDRGR2gJW14RKDD0wFL8TT1g= X-ClientProxiedBy: SG3P274CA0016.SGPP274.PROD.OUTLOOK.COM (2603:1096:4:be::28) To PAXPR04MB8459.eurprd04.prod.outlook.com (2603:10a6:102:1da::15) 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: PAXPR04MB8459:EE_|DB9PR04MB9751:EE_ X-MS-Office365-Filtering-Correlation-Id: e1890f15-4e07-49a6-f292-08ddf5ece4af X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|366016|52116014|376014|19092799006|7416014|38350700014; X-Microsoft-Antispam-Message-Info: =?utf-8?B?TUh2REVHU1o5VWNkMUtzK3d6MnBqQ2NrMzB2QUwvYVorZFp6aFBpZFEwZC9i?= =?utf-8?B?ZXRwVEJHTnRuMGhmQjhGUjVmYmxaVEZiWXZabmgvUzBpRGc3bkQ5YTJHUjF6?= =?utf-8?B?dzRpcDY1Mlc3K0l3THp0UzV3SEZSWngzSDU1aUpNUFE5TGxZQ0lxcUJINmVj?= =?utf-8?B?a3NDdmI2cEE0TVRwSGZuQ2lEZTVXWUZKVGNHcFFNUUwwUUVUYkFrL09XUnBQ?= =?utf-8?B?Tkw4SDdBRFNlM3dxYkw4cXhuQllrN01HM3JyUHNGNkhyU2paRmxYR205c0xG?= =?utf-8?B?bThUUVZBWEVMQzVlR01iK3dYcC9tc0dCdkdwRXUvTkRLeVc4Yi9jYVdLZDJw?= =?utf-8?B?aS9tWW14ZSt4OGx2dTRpY3EzYitwYVZzR0xocDBlYW1pc3hnZXFwWkh0YXd5?= =?utf-8?B?TTlocHRqaE1DWUo2eVY4UE43bCtZcDNBQUVxd3gxOUdqMXZTT0VaVW1Vc2Ez?= =?utf-8?B?Z1VZbXN5MVFzVFhoRVp3bThEWFVqbUhGeGgyZ21uQndOVmtDV2E2WFBJQWNQ?= =?utf-8?B?Z0cxVXhhT0dVM3IyZDRmNEV6R3FpNG42RFhreUVzUDN0aWx1aTJsT3JOZG5k?= =?utf-8?B?eUdIMXJ3elJCeExlVm1VcGtoN05UdURwNmluSVh0cHlvOXM1MkdNN0lnQi9v?= =?utf-8?B?K1R5TkFGSG16Smo4MGxCVmp2YklEbG1YS044OHU3WmRiUisxaFM1c1AydC9N?= =?utf-8?B?UjNVQURoN1lNeUZ2OVZzMXMrREo3bWp0WWRQYmlROG9vQUllLzBiQVdra0Jw?= =?utf-8?B?YUUwVkEvU0VjQ1hEb0VnNmJpV0NYTWdoQkFZb2RHNHo3S2VDaUNlOGR2b0w3?= =?utf-8?B?K3l4Rm1KV2NrY2dOTTZGeitTazJDMHEvMHF4cXRpdnFWWmYra1Z2U3g1K3Nr?= =?utf-8?B?UmR4c0NKbytjQ29uNzNDdmF5M2N0S29LWVpCSGYzSE8zaHdmR0R1KzhUMy9m?= =?utf-8?B?Z1BrNm5nNlJLa1dybnZRaVN2UlhiU24rTkRzRlIrWDhZSkRzWjdRVGpkbmVy?= =?utf-8?B?dVp5TjUzeHJKbUhQclk0V3hqTlQwcFF1dFJiSkN4V3Z4K2d6SVZZejJNcGkw?= =?utf-8?B?UmdRMC9WYUlucy9PMFRnWGQvcTNrV1h5NzIxMGxVZjZhaVlWNHB0cVExQ1Q5?= =?utf-8?B?MzhDdDlMcnp2K2E3WnpHTG5kY0x3dXk4MzBJR2xXK2lhUHRnSHF2ME85eHFt?= =?utf-8?B?bXplekNnYlYrYVFDakhRRzlaUDBUSzdib0daRnV5QkRRWTZUZmJmbEp3alFn?= =?utf-8?B?clptcmdjNGJzbjBjRlRTaHFsN1Q2K0Qycm9hZ29ocWlJL2NpTWVGb2VFajNF?= =?utf-8?B?WjR1ODB3bHlNNzFyQnVxK0xGbGdyOGV3ZDdSREFxbVVTSGhibWh0ZjNMUEtz?= =?utf-8?B?QmU2aWxrUlJkUDI2VlJKVFdWNzdIQVdNeVVVUWlNL0xMamJHaGsrWUloenJU?= =?utf-8?B?Ynh2MVNxdmgrNldxZG5YSUNFelh5Qm95cEkrenRaeVdBTFlHWGs2cHB4WFds?= =?utf-8?B?UDdWNGtnRjFXMEN1ZFc4UGV1cjJ2NmtwaEsyeC8rc3M5NUowalVtQUZwWmVU?= =?utf-8?B?NnRKTTRrR3NtSG1ROE5pS2VLTEdXVDB3dktGS0VMN3RSSGhHYTVaTUwwRHkw?= =?utf-8?B?ckgvdTR4WjhoUEV2N1VrRVAyMit5eGpyUENLMGtFZHp1RWRaWVRlZDZ5Z0pC?= =?utf-8?B?cFhDbGlyRlMxRGk2cHg0QURHT1V6eTlXeDhXRGVzOS81VnpHNkdiUjlNUWR1?= =?utf-8?B?cmc2YlB6K0NKOU96cWhOWitObC83MGVvWTJwMTNGY2N1RjFid1dQVGlTam9V?= =?utf-8?B?MkFIQUdwczNXdVpTUUZETUxaYUdkVGhMUlNUcjZKVzBVTDNnMHBmVjJoajBS?= =?utf-8?B?cms0ZUIyWHVnZGw5S2IrTnptZmdLNVJsSHJjbUVmaHFLWTdzSEtKSWE0cHYr?= =?utf-8?B?YjJUdVFncU01TWVsc2NsZEpjeU0wNkZPQXQ1QUFURWlsYlpwWTJVWldONlBT?= =?utf-8?B?USthV092WmdRPT0=?= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:PAXPR04MB8459.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(1800799024)(366016)(52116014)(376014)(19092799006)(7416014)(38350700014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?OU1peUpNWjJPNlVwKy9jWndyTDUxbXNBQ1l0SzhJSkFQSGFLYXQrMG1DaHQ4?= =?utf-8?B?cDhBa0NGZCtiKzUrcUhiU2xzc3ZCdWVyZWljYnhOU3V5N2l5ellJSUZmRGFK?= =?utf-8?B?MFVRdGJwOHJUQmdSZzltNmNrZDVaS2VVMklMTkViUTBTd0FHaml2M05QbXp5?= =?utf-8?B?N1dUa1JjRjg2Y3MzUHBxbXNUMmZqUjhBcW1BdFhjZG4yOGJQVFVzYndSQzVO?= =?utf-8?B?dDJFUmdHci9nUElCUnd0UzV5cWpPNjJSbXR0RnZ3ZGxZYmtDY2M2VkhmVlc0?= =?utf-8?B?Zi8xb004MVNzZkM1QmZLZXdHUER1dEhpWDc1am9UcE1mNzFYaU5uZmpVcWlC?= =?utf-8?B?MENoN2cwTnhOYTBWWWdEcE40eHlnUXZWZjlzaC9zNEgzeVMzTWlCNmo0cXdw?= =?utf-8?B?bEFpeld5dERwM1VSbm5haGNDdVdFODJ0MEs2WjMrNXl2R0haNmc0dE5DM29I?= =?utf-8?B?Nkhpbk8yNUR4Vm5xdXY2Z1B3aE1KY3BrSDdYUnc5ZGZSQThRNGlrbjZ6dTl0?= =?utf-8?B?YXY3Wkx1c3k2Y0RlVU9FL3prRkNxZ1oySWYwQlZQRk5qOVZzMWtHaVJPZnZC?= =?utf-8?B?NTRyVnFWYk5MZmcyeDJHOUdwV254SWhvQU1oOUZLTUlzQW9MUmdoTEZlS0Zu?= =?utf-8?B?cEdESy9HbTlBTFRpeFlWaE91SVpSRms0cDNldzB2NnhCVjJxdUp2SEFBSVpk?= =?utf-8?B?eFY4bkRuMFNNcVhPRHBERHVFd3BJcm5PMnZxQUhaNjd3aTRQN1pDWHhicmNL?= =?utf-8?B?WlJ6dTBXT3BJMGVaTkgwd2l2dGxmaWFvbG1XSGtmUEJiUkQwV1N5WStGeDlm?= =?utf-8?B?Yzl4bGhpem1CWkRienFvWWgzcEhrU0piT1YwL1doYlUzb0svZ3hId2h0R0M0?= =?utf-8?B?bEw1d3p6eXV1ZXg0bXRIa1BNRnI3WlpIMko4UngwNGlDWWxKRDZkM0tzbGRH?= =?utf-8?B?VG12WTJhVEZ4MUVuVGpTL2xTMDdxQitwbHVXVlpoeWhoTVRUZnRhNVBqNzdH?= =?utf-8?B?TXBEWGk5Y1pwekc0YjlkYm5zNFB4ZGxPRElQRkpGSm0wcmlDcU1WQzUzaU9E?= =?utf-8?B?ZUNubnVkZVNFZitCS2t2OFpLZitOVEovK1FVV24yV1N5OFZwRXRFdzFIS1l0?= =?utf-8?B?Ulc5T3F1MGFrVzNIemxkU2pveGhtQnhtbzRoN2tYSVBDYU9xcnVQbm9nU3lM?= =?utf-8?B?R1lGWFhVQ1c0K3duV0x4dXVxbS9zazJTZXRBT1o5cHZLSHdka0NCSUpYellG?= =?utf-8?B?YzZsUVZwdWRiOTZQQ0duNjJNdjJEZER3R25XSUtCN2FaU1VuKy9qWUNKSkc4?= =?utf-8?B?ai8weGxFQU40WkpzYk55MHNPODRxaUhFYjBJelBnS0dmeW1YRGhaVitjL1pq?= =?utf-8?B?STR4ZHN5cFRsVURxT2FVc2tKS2pFSWJibFhjSWgybnJRWkZtNWFZajhFWi9B?= =?utf-8?B?dW9TV05MZFhoR1JRajBXTENZTitBQjUzaVRsVE91dnk2UWIwMi8vWTJ1UGRN?= =?utf-8?B?NU9vZTlaMGFxaERyczBBbkxtdXQvZFMwWEQxSEpycmd5SXk1TldNU3RyMmo4?= =?utf-8?B?QytkSjc2T3Z0SGdZYzY4S0dLcjZPVHN4alc3eldCTTN4Q2xkZmFqenpUdHND?= =?utf-8?B?VGtmWkVUbHdTL2ZSRnkyOTZmR0xUSnVqL3RPQjAxbHF3b3BnbFRHd1dXb0xO?= =?utf-8?B?ZjRzSXhaRjN1b0VsaWJ4M0VxczM4MGR2YTNOeWx2UlhPZllYNE5Rd2xJR1VO?= =?utf-8?B?V0Q2THhISmRMb0JCTUZudE9qNE9LUmVON1BJTFZQRjh1My81VitiUmw5eDJq?= =?utf-8?B?Z1IveFlVY0VFNTZzbnl2ZmZoSlU1WkdvbzFHTW5CdW5VdE5Jc2pKb1REKzZ3?= =?utf-8?B?MDlyVkt6b0ZGUnRxcVVrQ25zVUNibncwTlRjb1Z2VUpxRStZMU94YzcxNlUy?= =?utf-8?B?VnNCbTBwZlAyNFdlLy9WcXQ1Z1Y0RkdzSDRYRm90RWQ3bGpZaysvQm1Yb3R3?= =?utf-8?B?OE5MNG1JMk5WR2tVNnpkYmxjejhTY2E0ZWwrRkpiK0hEcnFiREdndm15VzU4?= =?utf-8?B?NXZTVDFkUWVBYU5Vbkl0U0ZEaE9FQ3drWDN4cG9rUGZ6RWgvSVJqb0kxMzA4?= =?utf-8?Q?OByeFSC3kVI5byqLYbRyzhFUG?= X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: e1890f15-4e07-49a6-f292-08ddf5ece4af X-MS-Exchange-CrossTenant-AuthSource: PAXPR04MB8459.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Sep 2025 13:19:55.6052 (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: 5SwsxAg+v6uvoAMC1NQMhoLIqevs7TDZ62sz5FLSIVGfg14cx/85vEJb/J/S0yrLN1J1wbm39DRodJEvNO0uzQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB9PR04MB9751 Replace separate calls to devm_clk_get() and clk_prepare_enable() with devm_clk_get_enabled(), which combines clock acquisition and enabling into a single managed step. Simplify the probe logic and remove the need for manual clock disable in error and remove paths. Also, update error handling to eliminate redundant cleanup steps and use return-based error propagation where appropriate. Improve code clarity and reduce the chance of resource leaks or incorrect ordering in cleanup paths. No functional changes. Signed-off-by: Peng Fan Reviewed-by: Daniel Baluta Reviewed-by: Frank Li --- drivers/remoteproc/imx_rproc.c | 28 +++++++++------------------- 1 file changed, 9 insertions(+), 19 deletions(-) diff --git a/drivers/remoteproc/imx_rproc.c b/drivers/remoteproc/imx_rproc.c index e30b61ee39dacc88f9e938f8c6ffe61fef63dbda..c6cfb308ddb376f370fd4492f8a= 84f734602bac8 100644 --- a/drivers/remoteproc/imx_rproc.c +++ b/drivers/remoteproc/imx_rproc.c @@ -1006,26 +1006,19 @@ static int imx_rproc_clk_enable(struct imx_rproc *p= riv) { const struct imx_rproc_dcfg *dcfg =3D priv->dcfg; struct device *dev =3D priv->dev; - int ret; =20 /* Remote core is not under control of Linux or it is managed by SCU API = */ if (dcfg->method =3D=3D IMX_RPROC_NONE || dcfg->method =3D=3D IMX_RPROC_S= CU_API) return 0; =20 - priv->clk =3D devm_clk_get(dev, NULL); - if (IS_ERR(priv->clk)) { - dev_err(dev, "Failed to get clock\n"); - return PTR_ERR(priv->clk); - } - /* * clk for M4 block including memory. Should be * enabled before .start for FW transfer. */ - ret =3D clk_prepare_enable(priv->clk); - if (ret) { + priv->clk =3D devm_clk_get_enabled(dev, NULL); + if (IS_ERR(priv->clk)) { dev_err(dev, "Failed to enable clock\n"); - return ret; + return PTR_ERR(priv->clk); } =20 return 0; @@ -1134,7 +1127,7 @@ static int imx_rproc_probe(struct platform_device *pd= ev) imx_rproc_sys_off_handler, rproc); if (ret) { dev_err(dev, "register power off handler failure\n"); - goto err_put_clk; + goto err_put_scu; } =20 ret =3D devm_register_sys_off_handler(dev, SYS_OFF_MODE_RESTART_PREPARE, @@ -1142,7 +1135,7 @@ static int imx_rproc_probe(struct platform_device *pd= ev) imx_rproc_sys_off_handler, rproc); if (ret) { dev_err(dev, "register restart handler failure\n"); - goto err_put_clk; + goto err_put_scu; } } =20 @@ -1150,32 +1143,30 @@ static int imx_rproc_probe(struct platform_device *= pdev) ret =3D devm_pm_runtime_enable(dev); if (ret) { dev_err(dev, "Failed to enable runtime PM, %d\n", ret); - goto err_put_clk; + goto err_put_scu; } =20 ret =3D pm_runtime_resume_and_get(dev); if (ret) { dev_err(dev, "pm_runtime get failed: %d\n", ret); - goto err_put_clk; + goto err_put_scu; } =20 ret =3D devm_add_action_or_reset(dev, imx_rproc_pm_runtime_put, dev); if (ret) { dev_err(dev, "Failed to add devm disable pm action: %d\n", ret); - goto err_put_clk; + goto err_put_scu; } } =20 ret =3D rproc_add(rproc); if (ret) { dev_err(dev, "rproc_add failed\n"); - goto err_put_clk; + goto err_put_scu; } =20 return 0; =20 -err_put_clk: - clk_disable_unprepare(priv->clk); err_put_scu: imx_rproc_put_scu(rproc); =20 @@ -1187,7 +1178,6 @@ static void imx_rproc_remove(struct platform_device *= pdev) struct rproc *rproc =3D platform_get_drvdata(pdev); struct imx_rproc *priv =3D rproc->priv; =20 - clk_disable_unprepare(priv->clk); rproc_del(rproc); imx_rproc_put_scu(rproc); } --=20 2.37.1 From nobody Thu Oct 2 10:58:01 2025 Received: from PA4PR04CU001.outbound.protection.outlook.com (mail-francecentralazon11013071.outbound.protection.outlook.com [40.107.162.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 0AA9B2F5A2E; Wed, 17 Sep 2025 13:20:04 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.162.71 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1758115207; cv=fail; b=rSxuNYz2/q9FTOxbGg515+vXs5xDk0UQhc4ek8Cb4STfe5rg4VcksmWwjnWlNH/1QnuuWxh9JVdgUygaFVXEWgPAnAxaHyw2UzABn+WnUUjr/Vo28ynF7CCxP025NYVYz/VoVEPrCZe+6jrjrzTTxkAZSI9k9pcb0u6df9CsWjU= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1758115207; c=relaxed/simple; bh=L62A6LLBslT30Q0VTSgFWxxcN+eBF32yOpVD7e6zmYQ=; h=From:Date:Subject:Content-Type:Message-Id:References:In-Reply-To: To:Cc:MIME-Version; b=aXe7kYgsjwNhHa6UQ+sCZQ8lcZqjwGw0KS9DTIL/+k0/rGuAGU8iG+fj7T9qtUknYD9viWJB4jy9XOgTpgZVsz/TVhMWaxiBqmNpJ31/pV67VzUPickabuZiKqq7gkxfO26yN4KciKRmbjDPCnof7m0BzS9lr/EOUMr1J/HLfAQ= 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=STIMjH5L; arc=fail smtp.client-ip=40.107.162.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="STIMjH5L" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=WY6wfeoC56PixZNVRS+RJ9qRism/b+2wmKHo9dB2GuZH7jy1qZo8A/Jf/kGy0pgys5wkUf3fu6LGovoJFvsexu8D7AvYlqFs9uBaqiR2VrHo5qVktltRrsWRW+gpE3svOJgweuC8FsLveH4V54qWhlW2zA14v3vltE9NK1JXsQQanLwS+Dp3SGTy82y3H1XD0PW7IcbqBb0ZUhK4lgy/QshfCZNjTfjBv3EKsp/s4HsFpFmisukV/NpzoODD37FTTP24UxdocN1NgoGEltCeEgg4Fapk18PAm1AuNaCIKUU1GjSrhfkIjcNTeeqvaDwYyHTJAap4Ai9gISxVldnduA== 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=Bm83KrQ8KrKqhNHed4cC0ePWYr6E6C3y54L5Oa0Z7HE=; b=ArOtxyVsNZD2Iqe10l3lcls6//K/PnIM0+5Qa6zi3yebpXyWRnSzujLPTbb+mIcInDv1yIJwRP9DCgkVmRq6a9c1RuKUx9XrW9myLJnJ7bMu9G+cu4x1Ms3Wuh4Y4mm6bIFV2oqWP2yXwBp7FP8sSjAHX+yng4kUVKGEA5uXz42otT5PwAx7W4I6iyyP5VKnkfXSXnQVXfXdrZqC7y0ImSyPLZ6RU0wSsXc62Tqsm200IhDZJRYKxOW2OmQ3k/nZyQpIu5kwXdpnQof0t60okBS9jlJ5tsAdG5F6RP5+eE3F9XNuw4WBhpqUPqsPpTiHyQAI3U6MPWm/4U8MLAVSXQ== 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=Bm83KrQ8KrKqhNHed4cC0ePWYr6E6C3y54L5Oa0Z7HE=; b=STIMjH5LW4U1W5LXoqg0aJe3pTwkOn+y2xtOHIPGyX5tEvQxIuZE05PfHxM0SFcZCW9Dou7ewYs9nHOeVU75DgwwGYavtFizkd7wPmVm1UiytdPBzEK/owcJH6/WqyPrMyVn9xQDUpZYoIYchSvndM3/T8uVFtPEs00BTdMVqKUhIX86zU7YdCSNdt+lhmsPCNZ/r1HHqyUpSVICVUEn+8vp9IkPGovsF4fZbEuOyUuiXTUC3laVPr6fcHKZdmK8f5aP2piMrZaOGa1/l7P1hkigdvjde/dntTVp7eoh8QYaFw6NNnuU98DN3m59L710UlpBKizo/qKXEU+yLxRCzQ== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nxp.com; Received: from PAXPR04MB8459.eurprd04.prod.outlook.com (2603:10a6:102:1da::15) by DB9PR04MB9751.eurprd04.prod.outlook.com (2603:10a6:10:4ce::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9137.11; Wed, 17 Sep 2025 13:20:01 +0000 Received: from PAXPR04MB8459.eurprd04.prod.outlook.com ([fe80::165a:30a2:5835:9630]) by PAXPR04MB8459.eurprd04.prod.outlook.com ([fe80::165a:30a2:5835:9630%4]) with mapi id 15.20.9137.012; Wed, 17 Sep 2025 13:19:59 +0000 From: Peng Fan Date: Wed, 17 Sep 2025 21:19:17 +0800 Subject: [PATCH 5/6] remoteproc: imx_rproc: Use devm_add_action_or_reset() for scu cleanup Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20250917-imx_rproc_c2-v1-5-00ce23dc9c6e@nxp.com> References: <20250917-imx_rproc_c2-v1-0-00ce23dc9c6e@nxp.com> In-Reply-To: <20250917-imx_rproc_c2-v1-0-00ce23dc9c6e@nxp.com> To: Bjorn Andersson , Mathieu Poirier , Shawn Guo , Sascha Hauer , Pengutronix Kernel Team , Fabio Estevam , Ulf Hansson , Hiago De Franco Cc: linux-remoteproc@vger.kernel.org, imx@lists.linux.dev, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Peng Fan X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1758115170; l=4390; i=peng.fan@nxp.com; s=20230812; h=from:subject:message-id; bh=L62A6LLBslT30Q0VTSgFWxxcN+eBF32yOpVD7e6zmYQ=; b=aBoj+87OG9zeZKNqwqVTWrktTIzxj3T911pY7FlGtqe/p5QCFKBZONI5rB13K4GLDZ/mbxhVP xrpBwXXK/EICVKAp2frai5f7/FTpvHvsqR4y/10fU4Gjyy0c9kZgH/N X-Developer-Key: i=peng.fan@nxp.com; a=ed25519; pk=I4sJg7atIT1g63H7bb5lDRGR2gJW14RKDD0wFL8TT1g= X-ClientProxiedBy: SG3P274CA0016.SGPP274.PROD.OUTLOOK.COM (2603:1096:4:be::28) To PAXPR04MB8459.eurprd04.prod.outlook.com (2603:10a6:102:1da::15) 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: PAXPR04MB8459:EE_|DB9PR04MB9751:EE_ X-MS-Office365-Filtering-Correlation-Id: d7c0df9f-1684-4b02-3857-08ddf5ece739 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|366016|52116014|376014|19092799006|7416014|38350700014; X-Microsoft-Antispam-Message-Info: =?utf-8?B?QWo3dHErdHRudTlMSjRmdk1udGkyZVBaR3JyU21UaVFDQkowSzE5UTlrZlhI?= =?utf-8?B?eE1Ed0hVOGtrcjlsS29kMkFwa1dJYkpTQlRrcm82bnMyMlRESlArTFNLMlI4?= =?utf-8?B?YVlBS0p5dGI0VWpEZjk1UnBPa2xwRTRPMERLUFd6VWI1d1JZaVdUbDFxaHQx?= =?utf-8?B?d0JtWFZEeDJLaWQvQTV3d0xJb2lLTmFXSWI2Vml0WXR0bE1YV25EbUc1TjVF?= =?utf-8?B?amRMUlR1LzV4MFNUWm5sZlhUYjg1UU5EdHZONW1HcExVY2pJeEFJVncvcEZl?= =?utf-8?B?WktvVi9rMFZ2NElzVWs1V3B1dzNRd2dSOFN0bUJKbWZadCtKWnBEZ2NZNnVZ?= =?utf-8?B?ZkdOZFE0WjkxallHWkNJL09paEVKQTl4ME14QXhIK3VTaWRvWmE2akZ2RmQ1?= =?utf-8?B?WWxFaWF3b3hobENtNnAwRXdYbnNCcEtiN0JOT2ZQK1dtdTJXZjJiS25obitR?= =?utf-8?B?SGxweDREaGtaSy8vZ0tKNlI4SjM5Tm5tMENkUkpIWFQ5QS9oeFZZNFRJOGoz?= =?utf-8?B?enpTWGx2Uk9vTTE5eFFmRFZQVk42R0VCTXFERGw4N0RqOVJ3c3UrM1QvZlRY?= =?utf-8?B?aEZ5WVBFYmlHN2RaVEFtMmw4ZHdvcExTelErQTh4LzBROFNGM2x1dUkxWUpB?= =?utf-8?B?ZVRCdjZaQW5ERlBZeTgzUmNnUUtoSHNaZ0pFcVgzN0t6ZE5zTXBNcnN1SDRa?= =?utf-8?B?NGhteWZVL1YrQXJ5Ti9lcXVDaVJjKzJIUFlwMmVQL2ZjMlUwei85cnpDV1hO?= =?utf-8?B?YSt1clV1RWdBSks0THFSRi8venEzQWFCcXpPcmV2aW1EOSsvSHlnU1hwY25a?= =?utf-8?B?eWNuRnpnSFYrckJGb081dEIvTWVobkNGNnFhd21BSEFGTzRtNFAxR3F3MDhZ?= =?utf-8?B?eXlBMlVVS2psVGxSRkJSVEUyUE16SkdjeXNEem93QkhkUWIwS2JoREdqRzMx?= =?utf-8?B?VnM2cVRCYnNBRXI1UTR3Tm1RSSt5Vk5obWRJQ3RRSjEzeG9oa1h3bnlNb0tZ?= =?utf-8?B?MjY2a2JmOW55QUc1WmJhV0tyVXJXQllQTnJjQ3FHSWFyUXE4dS9yTm5VSnNu?= =?utf-8?B?bUo2alFxUUNnY3dQMTFxK1JXZ1FJUyt3K2I3N0NkVUVKWCsvVkJONUhjaVlU?= =?utf-8?B?bFI5cmsxbytSWnhBYTZ2ZWhJYWJoRGh0RGNnckhST1pWZWVQaWxhVmt2RmNj?= =?utf-8?B?VklSVWZ2eEZ3NlAyRE9BTEx3TWhmNms5RkVoQUNrMzFoVXp5YkhXOXc0cTIx?= =?utf-8?B?RGR1aStSaDcwSzVpcUQydGhKQnFrdy9pMXlVYjJzRzhNS0l5STdubDk4YXNj?= =?utf-8?B?ZUVBc2FwY2gzUnRQYUprcUlFWjNVV0loWno2VGgyN1pHVCthcnc4SGpiZTJX?= =?utf-8?B?RFBrK1VJZEo0RDZqNzFuaEJ5c0puYWFwTUNPUHBsMHVqV1BDbUpOTnJGQTNH?= =?utf-8?B?aUlTSlE3Nmx5K1A0Z0xETk1kczdWeFRHVVFGZGhURmhMVTJXVXFMSDlsd1JV?= =?utf-8?B?VVVQajM3UU0rUGJBWlpMNWFqb1RXMHBvSFM3Sm4rR3l3TW9CUXFPY09nUVpX?= =?utf-8?B?NCtBNytaZnkybUZ6dnQ4bVdRSmdVdXJDUHVIaUxUNDNDTlpqVHdZSmNmRjJx?= =?utf-8?B?NU1JWEJZMWY1Sm9HdG44L01zSWxqSFVXcHU5azM4eGZ3SG1IcnhrM3dtOXBX?= =?utf-8?B?OVVVTHZ3b3VpbDJzSFhjNElQa1dhbzQxTkg3N0VWYm4rOG80U1k0V1E4eFgw?= =?utf-8?B?UUVpV2U1Nkx2SmJYcEdkUGwvSUJUTW5FZmdydEZ2T2hQbGtBYkV5YkRXa3NR?= =?utf-8?B?UURNVitka1BBc1Y0aEdWL09najJ6UXUxaFVJNldNVnBiSWJsOUp1UldSWnhI?= =?utf-8?B?THE4VjAyb0ppbFMxVFhCc29QQk84NExxcnBBdXNQeDJxMm9lSVY3N2t1NWZx?= =?utf-8?B?a2p5aUttYlQ1ZUFBZnh2K2xUdlVCck5sZ29VNkczYmN4a2hOUDhhOXgxd3dT?= =?utf-8?B?OGF1cERyY0xRPT0=?= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:PAXPR04MB8459.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(1800799024)(366016)(52116014)(376014)(19092799006)(7416014)(38350700014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?dy9kN0pNV2tTTm9QeUlQaDlUdGxCTHNjdml2TDZ1N3hDYzUrZ1pMalVDMGRk?= =?utf-8?B?TndwUDh4VkYxdldWcUp0VTBiMG9odXhobTIzendMSENTRzIvV0lwWmYvS2xi?= =?utf-8?B?eERGQWVma2NSenByb3dhVk9iejdjWHRTc2c0bmMrSjdzYTE5dVBoRHNNd050?= =?utf-8?B?VEdhZ0xYM0RVSDQ5bnB6WC9ieE5iT1JhQ2xMMTFZUXBSdVlJRnp1RDRoMlVL?= =?utf-8?B?UUt3b2N1MUVkczVEc0Vsa05NNmdDVHk4TFZ3elJOdUUzYUd1WWNvOWxXK0gv?= =?utf-8?B?eURKQXBRak8zK2E3Y3VrSFVrMDBlK2w0KzNrQm9OWnowQmh5ZDR6MnBTS1hY?= =?utf-8?B?dVUxNk1jTUhkcThJdW04NFB0bDViTGVjcWlvMTJhbXlqelgrYkIrSUdpekFo?= =?utf-8?B?MVBKN2dzWXNneXFOVkxWQzVxeEFoU1pQZkYzY28yRmpUWlRMNWdTdzlsdFpX?= =?utf-8?B?UndUdHhlOCtkNnlmc1NzcFExaDlNUEtCM3NCbGo5aHZRMkRYWkM0MExFV2Vn?= =?utf-8?B?Vzg5WkFuUE91SnNUYmNpOUJLK25rQS8wUnArK3lQNjNVWENTSDJtVnluWUVF?= =?utf-8?B?ZGowcFRRUHFGcFF4SlU3L1NrSS9DWHB0QXEvTm5ua3QrVlViSERVNS94TVVL?= =?utf-8?B?b3UrS3QrNm9iZC9LUTEvUDRrczFRckUwZFBqSnZDdG1FbkxaMlNFa3Y0UjYy?= =?utf-8?B?c2g3a0hSNEJmZGlPZUVxZkRvV0krWjFuRk04OC9uRWt1dFpoVWpuTGxEamd1?= =?utf-8?B?dnRuYXJmVXVYZHV6VGtILzFHcXlOcEhvc2txYS9lckZnbTNCcVN3UTNHV1NN?= =?utf-8?B?eTFvempLVUNnRjZGT2xvVnoycHMxTlhqYmxJVG1HbE1vMFhKSWx2NURHazZs?= =?utf-8?B?eWlubExkTnJMSFppcVNodVdYenNzTXpCVzFFaCs2REhUREZSTjFSOEhMa1NB?= =?utf-8?B?TS9DcVN0TDF2Sk0xQmExY3NITy9DK21PZ2tYUkV2NXp6S3gwbzRLYzNzeXdJ?= =?utf-8?B?MVZZS0NmNEpZV0RwU0VaMmY0N3dSbVNPcS9XWXpQSTc3SUJPMlU1MW02UEs4?= =?utf-8?B?WkVFaVFnd1QyUEtSRm9tV2tDcnhNUUQ3dTVRdGFzaVZDd1k3V1hrTE9UWU9E?= =?utf-8?B?VE9wcjI3aDMycTBlekRRbGJ6REtsR1VMR01KbzY2b29QTWhyMTR5Y1RIQ2U4?= =?utf-8?B?Vk1jVEhEM0hpcGJSNCtvTHF1SVBUSmFDKzdzZzRLRG1RTWFRa2Fla2xrQXFW?= =?utf-8?B?Rmh0VkF4TDM2dFg1ZGJuR3oxRjJ3MWNNWStXbjlVRCtNNUZ3Mmo5S2pCUzhO?= =?utf-8?B?OFB5TkxpVWEzbXFuNkZsWmJySjUvSSthd2ZEK1FFVWxSNm40dzFYMFZjeW9L?= =?utf-8?B?UzhBUlBUQlRza1p4Y3FDbGRrbTFGVXBKb250MGh4OFhIbE43REZ1WDhqRkRr?= =?utf-8?B?ZjJVY0FBdmUrMjN0MXFsRFI1NUFBWHRiS3VhcGNYRlRXRDRjMEM5ek9SZlhD?= =?utf-8?B?Q3dHTUp3anRKS1VHL3VKOHMxazdzdEdqS0EzbHpqYmsyeEtTQnYyTWxxNzF4?= =?utf-8?B?OCtKcm04UHpaVTJwcmlwSUdvem42NFNQdUVVUWd1UlRXSHEyMnQvaUpMeDdp?= =?utf-8?B?RzRDVW1QTVBVZE8zdU5DZXgxM3dRMUVJOVBWSjlkcFNWbTVDbEZ4aEozKy9G?= =?utf-8?B?aE5lUkNCb1N1dUR6RkhrOVlWdnJhYng4b01VMDRrUHltLy9BZXBnQkF0V0Vv?= =?utf-8?B?dkxFaTRqU29kYnJ2NjVwaUIxNXh2R1Z2RVhzSDhSeDZHRFdLdlRYRHJ0RmtU?= =?utf-8?B?cTBnSFZsdTNjT1dqSjRNU2lWWFdHcWlraGl0ZXBFS1hKRWYxSmFpWDBSdDR6?= =?utf-8?B?bDJXOWhzYlZBYUdKRHptcFAyeGgrSU9JZ1RvVitUQnhoU2RFcStYOTlsb0xk?= =?utf-8?B?VmRlUlo4eHVRQlNvaWpocC9oVkNhdkJVOXA5MzAxUlVaOHBzc0FlRDA0T2hk?= =?utf-8?B?Q3JHeG9ZZUMwdE8zYXRFT3dQTEFESkVLWTl4RVdkcFRWV28rQ0VVUUQxdDBE?= =?utf-8?B?ZU1RR3c5czlWSEtuZ1AxNnNjVmMvTUpmalVyOWlQR0IySnVkUEFsV1lLV1ow?= =?utf-8?Q?gbowaStVNFORQPdaOyXeBvGiZ?= X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: d7c0df9f-1684-4b02-3857-08ddf5ece739 X-MS-Exchange-CrossTenant-AuthSource: PAXPR04MB8459.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Sep 2025 13:19:59.8338 (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: 9LHuld1xKOHMp59qoXXH/QHpcEblnqbB7h4NOJVftUW//Wmy9TeItys6jLmCbLWQ60IwMYivVscBU+1a1WefRA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB9PR04MB9751 Replace the explicit call to imx_rproc_put_scu() in the remove path with devm_add_action_or_reset(). Ensure proper cleanup of scu resources and simplify the code by leveraging the device-managed resource framework. Additionally: - Remove the IMX_RPROC_SCU_API check from imx_rproc_put_scu(), as devm_add_action_or_reset() now exclusively handles SCU cleanup. - Improve error reporting by using dev_err_probe() for consistency and clarity. - Drop the err_put_scu label, as it is now redundant due to the updated error handling approach. No functional changes. Signed-off-by: Peng Fan Reviewed-by: Daniel Baluta Reviewed-by: Frank Li --- drivers/remoteproc/imx_rproc.c | 57 ++++++++++++++------------------------= ---- 1 file changed, 19 insertions(+), 38 deletions(-) diff --git a/drivers/remoteproc/imx_rproc.c b/drivers/remoteproc/imx_rproc.c index c6cfb308ddb376f370fd4492f8a84f734602bac8..a53ff186d218f54123e1ce740b0= 277a6fe95a902 100644 --- a/drivers/remoteproc/imx_rproc.c +++ b/drivers/remoteproc/imx_rproc.c @@ -796,13 +796,9 @@ static void imx_rproc_free_mbox(void *data) } } =20 -static void imx_rproc_put_scu(struct rproc *rproc) +static void imx_rproc_put_scu(void *data) { - struct imx_rproc *priv =3D rproc->priv; - const struct imx_rproc_dcfg *dcfg =3D priv->dcfg; - - if (dcfg->method !=3D IMX_RPROC_SCU_API) - return; + struct imx_rproc *priv =3D data; =20 if (imx_sc_rm_is_resource_owned(priv->ipc_handle, priv->rsrc_id)) { dev_pm_domain_detach_list(priv->pd_list); @@ -944,6 +940,10 @@ static int imx_rproc_scu_api_detect_mode(struct rproc = *rproc) else priv->core_index =3D 0; =20 + ret =3D devm_add_action_or_reset(dev, imx_rproc_put_scu, priv); + if (ret) + return dev_err_probe(dev, ret, "Failed to add action for put scu\n"); + /* * If Mcore resource is not owned by Acore partition, It is kicked by ROM, * and Linux could only do IPC with Mcore and nothing else. @@ -1110,7 +1110,7 @@ static int imx_rproc_probe(struct platform_device *pd= ev) =20 ret =3D imx_rproc_clk_enable(priv); if (ret) - goto err_put_scu; + return dev_err_probe(dev, ret, "failed to enable clks\n"); =20 if (rproc->state !=3D RPROC_DETACHED) rproc->auto_boot =3D of_property_read_bool(np, "fsl,auto-boot"); @@ -1125,61 +1125,42 @@ static int imx_rproc_probe(struct platform_device *= pdev) ret =3D devm_register_sys_off_handler(dev, SYS_OFF_MODE_POWER_OFF_PREPAR= E, SYS_OFF_PRIO_DEFAULT, imx_rproc_sys_off_handler, rproc); - if (ret) { - dev_err(dev, "register power off handler failure\n"); - goto err_put_scu; - } + if (ret) + return dev_err_probe(dev, ret, "register power off handler failure\n"); =20 ret =3D devm_register_sys_off_handler(dev, SYS_OFF_MODE_RESTART_PREPARE, SYS_OFF_PRIO_DEFAULT, imx_rproc_sys_off_handler, rproc); - if (ret) { - dev_err(dev, "register restart handler failure\n"); - goto err_put_scu; - } + if (ret) + return dev_err_probe(dev, ret, "register restart handler failure\n"); } =20 if (dcfg->method =3D=3D IMX_RPROC_SCU_API) { ret =3D devm_pm_runtime_enable(dev); - if (ret) { - dev_err(dev, "Failed to enable runtime PM, %d\n", ret); - goto err_put_scu; - } + if (ret) + return dev_err_probe(dev, ret, "Failed to enable runtime PM\n"); =20 ret =3D pm_runtime_resume_and_get(dev); - if (ret) { - dev_err(dev, "pm_runtime get failed: %d\n", ret); - goto err_put_scu; - } + if (ret) + return dev_err_probe(dev, ret, "pm_runtime get failed\n"); =20 ret =3D devm_add_action_or_reset(dev, imx_rproc_pm_runtime_put, dev); - if (ret) { - dev_err(dev, "Failed to add devm disable pm action: %d\n", ret); - goto err_put_scu; - } + if (ret) + return dev_err_probe(dev, ret, "Failed to add devm disable pm action\n"= ); } =20 ret =3D rproc_add(rproc); - if (ret) { - dev_err(dev, "rproc_add failed\n"); - goto err_put_scu; - } + if (ret) + return dev_err_probe(dev, ret, "rproc_add failed\n"); =20 return 0; - -err_put_scu: - imx_rproc_put_scu(rproc); - - return ret; } =20 static void imx_rproc_remove(struct platform_device *pdev) { struct rproc *rproc =3D platform_get_drvdata(pdev); - struct imx_rproc *priv =3D rproc->priv; =20 rproc_del(rproc); - imx_rproc_put_scu(rproc); } =20 static const struct imx_rproc_plat_ops imx_rproc_ops_arm_smc =3D { --=20 2.37.1 From nobody Thu Oct 2 10:58:01 2025 Received: from OSPPR02CU001.outbound.protection.outlook.com (mail-norwayeastazon11013000.outbound.protection.outlook.com [40.107.159.0]) (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 49F203161AD; Wed, 17 Sep 2025 13:20:12 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.159.0 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1758115216; cv=fail; b=RL0PVYcQnnJkss3czEcK/x9u+sis1lx/b0bTUQ0H1t3q8U4vFYd7LkGmfvQKXYVdOo0XaJc8QPUlhVzuZsK+AA+0cEn293pGWON4tcesNub86uHJap+f9hDU1tnInsFjU8/F9+6eVkqal1Hz4DyrNlqhlp+xE5x/Gus3LvapsW4= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1758115216; c=relaxed/simple; bh=Uv5HmboUetc4ez8TfIwkqJtZysoxuBak7oX6CJuhJPQ=; h=From:Date:Subject:Content-Type:Message-Id:References:In-Reply-To: To:Cc:MIME-Version; b=N2/MG/uzV8ON9RGQa+MjvFFsZmI92eFWEkdrKxWM2AC3W2X1B9j92aHvGXYipGKgjYNwQ4BBx5R/au2NCFse+wrp2Ob+XCSh1Swru2NRXHWl74G7Op8rS8r7ZyW2sKXtrbgnGgXL7AB+VqtID+EtvPMklYkra6j2FygIvrG/uQY= 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=nUMyK/v6; arc=fail smtp.client-ip=40.107.159.0 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="nUMyK/v6" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=dHXRQF1UOnoF08iUwDTyz82e0h/DtCSSt+OAxOjibXzsAxLYtnNDiV+ECxdBWf4Uw+mNkJ8SZtD0Z7DJet731OaNIYUmO9n7K4V+sW7aFPs4OXan6OprQw5cXPhpTlieOGmc1D6Bgf+xqUcVwDHD5QVjDPGgHqA5E/iOs2ZF5xA/SHo8oaGFqa7qga76vyckpSLzl+658bbPLwXKZbffDfmAcW0f5UhBzOezQg7Oki2Kmj2yNQ0FrWOWfU3INA/BB2YJAuYcRhoTDYvQG9F28JYK75aOxaa3W0krF6DBhpAb8n8xMJUGHz4sjH7xcR233dgPXbsUhD9Jq4X/Zvtw3w== 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=ytNhmwKoq2hoUcrJyT9B+jeayMs1ISQPC5QX7UeAkc8=; b=BRlR8dSCSuG/7ojjF3I8WpD6OtJt+qkiFILbTBx+P2eAfedcN5U+FcnUp3WQ/AH6YnedJncw0Ekuhs28j8MgO4c81bbTXp70oQfpL1L0NoPQwUOnsOTQYpGzquZ4/dpKhep3jWdyDDaQC6vP8NCii7Jz1oaoW6Qquplp6f3BsT3vkvcBL5ws1K35CHS00cCkmaisBijXPRbheNd9snrYTnwCvz3dvEjRghBaAWfnC6rI/o24/sNl5Ac+tjXNy9H9b6uG7eYh6PwOyVKX6Dg0l8HxDoNAPtoKsKgI+Fn4Aex/0+ei/BCdy6ksiVc0cC0Vylcc0B4uKRPgRrCYkCA41Q== 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=ytNhmwKoq2hoUcrJyT9B+jeayMs1ISQPC5QX7UeAkc8=; b=nUMyK/v6FbbRRYpr58UGNnAdQEzON9aWJGsz/AedpVnRokmEoNj5fGgM6eow99fcmtRTrdvHbMPxjCU6QpbsMvRDBT7NSwypFcDdVDBsVU6WrlSznZk37CWYjB3UVNJcGQ03COHxUu7Wja4QXTbsmIr6iPK6qgFlVG/GQUTCVmE1jbNhJ6bBqZvRwK58rHwekN95RIXAEGD4Yhkucu5XGiiT/ubrtM/2vQFI3qdRktSaW78nQ/R/WZCXheFxUI0Gpy+75w0GJuZToqECeSua597rdbi2fSlGOYI5gCMptI4osXyWdWzArcBtdUyNQb92fnxX7XZ03BGeHUCzd96dow== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nxp.com; Received: from PAXPR04MB8459.eurprd04.prod.outlook.com (2603:10a6:102:1da::15) by DB9PR04MB9751.eurprd04.prod.outlook.com (2603:10a6:10:4ce::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9137.11; Wed, 17 Sep 2025 13:20:05 +0000 Received: from PAXPR04MB8459.eurprd04.prod.outlook.com ([fe80::165a:30a2:5835:9630]) by PAXPR04MB8459.eurprd04.prod.outlook.com ([fe80::165a:30a2:5835:9630%4]) with mapi id 15.20.9137.012; Wed, 17 Sep 2025 13:20:05 +0000 From: Peng Fan Date: Wed, 17 Sep 2025 21:19:18 +0800 Subject: [PATCH 6/6] remoteproc: imx_rproc: Use devm_rproc_add() helper Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20250917-imx_rproc_c2-v1-6-00ce23dc9c6e@nxp.com> References: <20250917-imx_rproc_c2-v1-0-00ce23dc9c6e@nxp.com> In-Reply-To: <20250917-imx_rproc_c2-v1-0-00ce23dc9c6e@nxp.com> To: Bjorn Andersson , Mathieu Poirier , Shawn Guo , Sascha Hauer , Pengutronix Kernel Team , Fabio Estevam , Ulf Hansson , Hiago De Franco Cc: linux-remoteproc@vger.kernel.org, imx@lists.linux.dev, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Peng Fan X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1758115170; l=1592; i=peng.fan@nxp.com; s=20230812; h=from:subject:message-id; bh=Uv5HmboUetc4ez8TfIwkqJtZysoxuBak7oX6CJuhJPQ=; b=0GRlqZycCm3A43/FuD2r8GcNKCrBED4QMiz+Bp8cA7aEBh6FOaYn1xROj/38IaUUbP2IjO99p bemMyBzJ9/ZAP0dVVEJ70j6UFyjiu0Ic02bdpbOXIkfnR5/1L8PqbWA X-Developer-Key: i=peng.fan@nxp.com; a=ed25519; pk=I4sJg7atIT1g63H7bb5lDRGR2gJW14RKDD0wFL8TT1g= X-ClientProxiedBy: SG3P274CA0016.SGPP274.PROD.OUTLOOK.COM (2603:1096:4:be::28) To PAXPR04MB8459.eurprd04.prod.outlook.com (2603:10a6:102:1da::15) 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: PAXPR04MB8459:EE_|DB9PR04MB9751:EE_ X-MS-Office365-Filtering-Correlation-Id: 6a87671b-7754-43f7-5467-08ddf5ecea71 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|366016|52116014|376014|19092799006|7416014|38350700014; X-Microsoft-Antispam-Message-Info: =?utf-8?B?L2JPOHppQURVOHdHeWtNSjMxRncybHZsbWJITHNQVitXRGVFbHNoTnRva0FN?= =?utf-8?B?MXIrNTEyNG1YSkthWk8zK2VML2xSRmtoN0pab3RDTDBHWmlpWm4zUTNXTk5D?= =?utf-8?B?Z2h2ZmlFaE5aNVlialJFRWhDb0lCZDdBa0I4dUNyV0Q2Nks1dVI2SnFpeEgy?= =?utf-8?B?WmhvdlBUN1RDVGlqMjNxdnZIeTFGNTYvb2NFa3NsS0lZTkY3d1hPOFNlcW1S?= =?utf-8?B?Q29PVG1TYjdHRC9Fcmp3ckpGYnRZM25jVHlvcFowOXRtaU1JaVJ6d3U5MTls?= =?utf-8?B?YVlad2JEcW1JMzhLYTBvSkNuTG5aenQxcWZybWlLOVhoWlhoQzUxeGIzSUgv?= =?utf-8?B?N1VDVTJyY24wd1hBZ3dlTG5ZVEpXeEltU2FtVDA0Y3RhL2h3eFI1dFpKSURl?= =?utf-8?B?L2plS29rM09XUjJEUmZqSmNJYjRnSW1tY0liNlJ4ZVErcjVpQlc3bjJmZWM0?= =?utf-8?B?RFpYTEg2RDR4S3JxbDd1S0JmaSttT0h1eGtxSE9VTG4vTm1FU2N0a1E2WHYx?= =?utf-8?B?d01KbkltMnp5QUxGTEE2M1RsQmQwNmJlbWFrUU5YaEpmdlpJdHVvQVlmd0xr?= =?utf-8?B?QkhnRmhGQ3lVNmU3NUJpQy8vMU5oNlcvZHZyQldiK2pxZFYvRUZZL2w2Q3k3?= =?utf-8?B?K2o1OHhTblJoLyt1V1NQYWVDMDM5T2FjV2JYSGFJUGJmaWgyVWRKMS9nN2Nw?= =?utf-8?B?MG04UUl5WUhkdWpUNG5aZlQrSWU5RWJCbUd5TUNqYnNsZHlkL2U0TmtnMkR5?= =?utf-8?B?aTc5WXRnWFBYNjRNUUs0bWFlTCtqOEZvRVo0L3JSVXhuZ2RkOFBVdGRRT3pU?= =?utf-8?B?NHlFa0l6N3VZbS9rNGZtemZkVG9aUGMzYnhUNS9zSkgwcFJEaDNXUGI2cENp?= =?utf-8?B?cHVWQ2kzeXZ3c2Q2UHNJdHJtQXVoSXJrQ0w3MEVwM2xIeEZISXh1cGdVOU93?= =?utf-8?B?T1A2UXlaY1NEVDdSNWthSG9SNzR1bVpCbGkxU0YwQlhKbGhGQWlTL1Z1Wkcy?= =?utf-8?B?OXltakpKUUJ6cWFWSHN0RHE4V2FjTXk5RzFnMU9GakhFeVJnS2krQ00rRDVs?= =?utf-8?B?ZEhqUGYxY3Y1czJpK29ibVNuZlBRcjJ3R0FXVVVRTFg4V0NJanRsdCtoY3JS?= =?utf-8?B?S1EvTUU2clNseW1sUEJUU1gyb3c0U0ZGeTludnFCelpGMGQ5Vm5KQ0EzUnhN?= =?utf-8?B?Mk1lOHdRZmNrK3diWHFWVWdBbzAxaVkwYUIxZXpsTitqNTE3RXBJQzZaeTN0?= =?utf-8?B?eG9XdVdTb0NRUFNXdHpuVXZCVVI1SytkV1E4YUFFOUJQR0dKWURoNHhuT1ZS?= =?utf-8?B?OUM5dTQwQWlQbytPL2FZdmFWWlVabEo3ZEpyT3VjcDZTVGVNNGVYcmxzUWx0?= =?utf-8?B?S3lPT0VyblVKZmVqL2pWV0REYUh6ZWp4M1pndFlLbFlOSHRYS3VxV3ZNNEZQ?= =?utf-8?B?c2xjWlUvbjhOTVZ5eTFlS3UvVy90TzZFVFNEc20yQjBZYUhmUG9uNDVORWZ3?= =?utf-8?B?bTNPdFp2c1o3Q21IOWkwTVZFVmRYVWFzSHZJcUQ2ZlJRQVJWTk5WVGFuaTJj?= =?utf-8?B?NnZ5TklOcnVYY1pQWDRmNDNUVFZsemptZjVtUFhBa1BaaWRVQlVIZ2hKYkNV?= =?utf-8?B?NXNPU3RQVUlCMlowVUdWQzc1V05vb1IvR2s2T2ZrYmxSWHlKUnRER2ZMUERv?= =?utf-8?B?cDRNTnNESXlrVEdiRWozaDBrY2pvTEJxMkhFaDBUdTZEQXhlekJUb2FMblNs?= =?utf-8?B?SHc1dDZ1ZG5ZdW15cFZoaGxpYnVoaFBOeSsxRjNUQVJrNFZneFdkdVdsMGYr?= =?utf-8?B?K29LWS9NeWEwR1RCQllUWDNWUkFuQUV2TU5MdmFFZ3llR1VkS1ZFVThNaFNv?= =?utf-8?B?T0JwRFhITmcyZGZRTjNtc1oxYk9RN0MzMWI2UFlmanBsRnUxeGxZY2RsaTlm?= =?utf-8?B?bW5KVWJzOUhLdVlVMkZidkQ2bUNwUWxKd0tLdFFtaTNhWnpzcTMzVW03b2JH?= =?utf-8?B?L1ZFU0l4MGdBPT0=?= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:PAXPR04MB8459.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(1800799024)(366016)(52116014)(376014)(19092799006)(7416014)(38350700014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?WkRMMjhRbzhSRzg2T3R2UE11S3FiSklIRVZwVUFONzdsaGt1a3FtRENnQW84?= =?utf-8?B?elhxaUhwNjBMTEJFakc0c0RHV1Z0ZHBWV0psRXl3R01RcERxbjlMTG1VbDhi?= =?utf-8?B?c0hSMHA4RTliWVNPUW8razBHNGV5MWdSNVRDWFJ3NjArdk1udzdlb2VpbHZj?= =?utf-8?B?NFJJUy9xQ1lIRFpPRmtZK2swcHVhM0JjMzFadERHaXk2T0xhYXhISzNGVjJV?= =?utf-8?B?RE04bENURjVOVGl5UVN1N1FUK3cxMWlKMDNkaEkzQ0Ntdi9aV3RhdG43bElm?= =?utf-8?B?WkU1SWN1a2ZHV1ZGc1dhd3ZRUE54WWJSSUd5T1kySldNZFJDYzgzT0pYekRj?= =?utf-8?B?Mk1XSVZSa0M4RFJYdC9oekl6Q2YxLzRpOVRuei91WlhKMmhIOW9LZWZ4eEg5?= =?utf-8?B?UWtLeEFlciszRXZtUytDSUphQkpUM0I1cS9DTWJTQytTOWs0VVVMeXczb25t?= =?utf-8?B?Si8vOEc5T29GbTFHb2owUlVzVE4yckFvd1pGYmNreW5xTGZnd3dvNzJKTXE4?= =?utf-8?B?REg0TnZPU1hLTmdMYnkwUnlub3VWaUhxUVRiZzcvelR6MnlibmZQUmQwNEdo?= =?utf-8?B?TnIzdVRIOVo0RFZJSWhtU3J2MlA5SWhYTWtQRTQyWHRTVGdCdXdqSmdhNDFr?= =?utf-8?B?UnZxcTVzYXZwVXNTKzNjTFpQRnQyZHorODNQVGhIL1cvenFOM0tJSWt6c3Iw?= =?utf-8?B?N2N2ejlyTks2ZFpoOUNzNzZoc3doaFFKajM1WVNCcW9XS05Ob2lwWFg1VHJa?= =?utf-8?B?YnlMS09SdklkTlg2Z3c5aDd5MlhWM1VOa3VMamdSYzZoSWhOa3k4akR4cDZL?= =?utf-8?B?ekpLdXdZUzc3ZzdlZzdmYzFyem95R2FCeGtzT3p6M3JkUEpmWHVja3liaHh6?= =?utf-8?B?N1RMYmU2Vjl4blVSTDJaNTVpVU5hVnpTQkxGS0dHTklKM2pPQnNVcEdBNXMv?= =?utf-8?B?Ukk3SitZdXBPTjdwWXNOSzNrdmU2VkFQRVBWUzhjczY2M05qNjZqUkwxYUYz?= =?utf-8?B?NVIyMVFMb0FybEJ4ZVVrVjRTWTZRUGRJZHdWcklxR0lnMlhFb1BXR0JDQXo2?= =?utf-8?B?L0xiT0xidWlyaTdUZGR3VmJBMnp0M2t6QURadFVNdytIK1RJNWFNb3J5bWNX?= =?utf-8?B?c2tLT014VmRobGxjaUtoa0VUWWJRQ1NNSkFuYUgyZVcxNW1FeENpcytjZU5S?= =?utf-8?B?cTg1bUpkamZVWEllM2dKbEJpRHRtQXdXT3BqVHg1V2FIVU5PeGFvdjlQcW9v?= =?utf-8?B?RlA5YTRmRHVlN2N0empIRS9Jb2MwMFp5cGc3LzIrVVN2eEVkY1c5Y0FxRlVu?= =?utf-8?B?NVJ5bFZ6R0kyT0ZzdWlLMmJEZmVPZWo1cXBZWjc3YjhSM05DUlh5UG9XU0xS?= =?utf-8?B?Nk5TMnBiUUdueDlVK2d3cEJxZm5EOWQ2Nkw0anF1M3lEVWowTmppRUdmTCtK?= =?utf-8?B?N3dKcUZnSnVENUVwVmlKZkIwMDJFZmhhRDZFV3BVaXV4QUxMbzRmem5HUDZt?= =?utf-8?B?VzlOTS80R0lyNjFad2thcWhua0VVMlRXT1RLY0RCQjBPanZhazFyYmFsYlg4?= =?utf-8?B?QnZ3R094amFtQzJoTnJuckkrTHdRM1UyREhCdy9DbitFakpuK0V0eXJrMG1F?= =?utf-8?B?MVlZYnBZYmdhZmNpeHlmcGE4NTYwd3g2MU55enNDOEllbEVFa1ZkRVR6MTc5?= =?utf-8?B?UDJkR3QvVnR2bm9tOWZyQlB3L2FQTmRENU14N2xSNjl5MzBDWWNseGtZSXFU?= =?utf-8?B?Z05UQmRrV04zZHdxMTUwOU5UbUFoMTdxUGVDZTBnN3diUzFtaG9zVklHQnAw?= =?utf-8?B?WEw0OVdDb3pPZU03WGZpQlNuRG1SeExPNjczNngySDcyNUtmWGpJQ2xZaGIy?= =?utf-8?B?M21uOHBDMCt3UkduTThoT3VRQVlycWFLMTVCRnhwOHduTFZwUDArYThCdFpQ?= =?utf-8?B?d2NReGk4OW5pR0cycnREeTI2VENMVmZma25NUEFnUkFVQjhzUHl5UTFhOEZr?= =?utf-8?B?UEphR29iYkU4c0trc2NmQ0ZyYUR3VHRoc3AwemlhVE5LNTl4b2c4YlJmWExr?= =?utf-8?B?NzEvWWhkYTI3b0w4M3VUaFRVN0ZuZ1JudXN3NVdoQ3ViUlg5Ty9SWmJPT2tq?= =?utf-8?Q?PQ6EgteCGNEXmsRok2HDfZfpO?= X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 6a87671b-7754-43f7-5467-08ddf5ecea71 X-MS-Exchange-CrossTenant-AuthSource: PAXPR04MB8459.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Sep 2025 13:20:05.2577 (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: P4kPr5r5KqFn+x3FTYaJbzDP/ymCSLBPFjY7hYUhsfv4x/t/sG0r5Z7sDGePB4VFyp3PRTmRAQVCr4E4fQbL/g== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB9PR04MB9751 Replace manual rproc_add() and cleanup logic with devm_rproc_add(), which ties the remoteproc lifecycle to the device's lifecycle. This simplifies error handling and ensures proper cleanup. With no need to invoke rproc_del(), the remove() ops could be removed. No functional changes. Signed-off-by: Peng Fan Reviewed-by: Daniel Baluta Reviewed-by: Frank Li --- drivers/remoteproc/imx_rproc.c | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/drivers/remoteproc/imx_rproc.c b/drivers/remoteproc/imx_rproc.c index a53ff186d218f54123e1ce740b0277a6fe95a902..694fbbb2f34061de22a3a815f8a= 6114159585f9e 100644 --- a/drivers/remoteproc/imx_rproc.c +++ b/drivers/remoteproc/imx_rproc.c @@ -1149,20 +1149,13 @@ static int imx_rproc_probe(struct platform_device *= pdev) return dev_err_probe(dev, ret, "Failed to add devm disable pm action\n"= ); } =20 - ret =3D rproc_add(rproc); + ret =3D devm_rproc_add(dev, rproc); if (ret) return dev_err_probe(dev, ret, "rproc_add failed\n"); =20 return 0; } =20 -static void imx_rproc_remove(struct platform_device *pdev) -{ - struct rproc *rproc =3D platform_get_drvdata(pdev); - - rproc_del(rproc); -} - static const struct imx_rproc_plat_ops imx_rproc_ops_arm_smc =3D { .start =3D imx_rproc_arm_smc_start, .stop =3D imx_rproc_arm_smc_stop, @@ -1288,7 +1281,6 @@ MODULE_DEVICE_TABLE(of, imx_rproc_of_match); =20 static struct platform_driver imx_rproc_driver =3D { .probe =3D imx_rproc_probe, - .remove =3D imx_rproc_remove, .driver =3D { .name =3D "imx-rproc", .of_match_table =3D imx_rproc_of_match, --=20 2.37.1