From nobody Sun Feb 8 21:26:39 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id A91EDC6FD1D for ; Mon, 20 Mar 2023 16:46:24 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232094AbjCTQqW (ORCPT ); Mon, 20 Mar 2023 12:46:22 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40658 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233433AbjCTQpX (ORCPT ); Mon, 20 Mar 2023 12:45:23 -0400 Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-he1eur04on2082.outbound.protection.outlook.com [40.107.7.82]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4AE1CEC55; Mon, 20 Mar 2023 09:40:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=AN3bWLtCVGMiXcwRS7J8a7/wnGcWFUpmh/Y7IfQDu2EBL6MQWO57gF8pXC5N03FwoxVKwIcMGaaqbQx0Y4WqoMrHPf19hAxaE0uC/86GB0AQtOF8+iHQxNuuF5nf4AT2pbscNbz8oVWlgQHGs7NoGpIpOmEFHSw6Dri9usfQMD0wbCytn9HAnCjcqp47817IOyTM6POZj6j4TY4bPoPD/VS225g8J13e9QnaIe1713QgrS0bJSkSK1Of29I5ePtG+IEaXfZRzxeDXHSwOYDY4I6BzRlQi2Vm8oufFZ9mHezui0PweAmAV0wH9VodUC4oURcEyG1B3D/hacUK8+gfGQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; 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=xNDPnp+blOHO2CqkrXX1ETmJ7PEE6MQf90eOmcm6Ma4=; b=GJZORVRv28ZkmcPz5DcNhVFqzI7+zv1zLTUs55g5Qfp16ZE2C8/urvc5DE1XQdLgWnQZEJzpVi9vGRSXXDt7JofcvWw+9KCHCXkZPioICgmCURTPwan91Xos44/jYHU2H6KEhhuPoG7coHjMUEIStpaOONysmHw9GOnooY0SRa728yl8txo/7eIh0JLtt9NaMYwp9ZLpvE7I405WuvbFVcCG00ET5JH8WDXCxLxEQQ5NaMAiiWd5PpLOVM8ZVCoJcWHSBtLFZN17lflks36p9PumE1Az69FYcHI8iog3ZVNR+swVWrRwKStFdnKY6RlwszOSNjwuXcMoGkIm0C2xAQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=suse.com; dmarc=pass action=none header.from=suse.com; dkim=pass header.d=suse.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=xNDPnp+blOHO2CqkrXX1ETmJ7PEE6MQf90eOmcm6Ma4=; b=qSFJNTuY8IVQKJnkEigR6W4I8wcNcGat6dmNI6ln1PQ21fCcAS8riLiKq7c8w+kRQY8E9fNEzH++EGgJHNetQeOTOJl+ZixJqt5YgmwDCUqW1Nny5QwMGe/0eK5u9hUEbs78hKEN+ljvdh5+XCQmsOXURzKPpVL8UcgFd/W3xlwdQHVdqjvf7pFwnA8Nft5j///KCOcF9Ls/hdmOnE2WZbtomQf+VFyiJJLs+dUgULkHnPLp8k9HTWPrzmlXV/t8PEkNI2Ib9M2IQLmbFFY+cRRzqkKXdsR3pCXFDsuWpkQURHbtjuDw0hFdVK0WjZqYql8aUeUNH5wolht06m/+fQ== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=suse.com; Received: from VI1PR0402MB3439.eurprd04.prod.outlook.com (2603:10a6:803:4::13) by DU0PR04MB9274.eurprd04.prod.outlook.com (2603:10a6:10:355::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6178.37; Mon, 20 Mar 2023 16:39:07 +0000 Received: from VI1PR0402MB3439.eurprd04.prod.outlook.com ([fe80::6802:b2c3:5f12:8f9f]) by VI1PR0402MB3439.eurprd04.prod.outlook.com ([fe80::6802:b2c3:5f12:8f9f%2]) with mapi id 15.20.6178.037; Mon, 20 Mar 2023 16:39:07 +0000 From: Chester Lin To: Linus Walleij , Andy Shevchenko Cc: Chester Lin , NXP S32 Linux Team , linux-gpio@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Ghennadi Procopciuc , Andrei Stefanescu , Radu Pirea , =?UTF-8?q?Andreas=20F=C3=A4rber?= , Matthias Brugger Subject: [PATCH v2 1/4] pinctrl: s32: use of_device_get_match_data() to get device data Date: Tue, 21 Mar 2023 00:38:20 +0800 Message-Id: <20230320163823.886-2-clin@suse.com> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20230320163823.886-1-clin@suse.com> References: <20230320163823.886-1-clin@suse.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: TYCPR01CA0050.jpnprd01.prod.outlook.com (2603:1096:405:2::14) To VI1PR0402MB3439.eurprd04.prod.outlook.com (2603:10a6:803:4::13) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: VI1PR0402MB3439:EE_|DU0PR04MB9274:EE_ X-MS-Office365-Filtering-Correlation-Id: a8ab178a-63f5-4bd9-2068-08db29619fd2 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: loWJfdi0DxhATunVst+npiXBcWlAOvxnMIdxf1D5Gt8JmeF6/hPLI3mbGdYQF/4Z3V4QyzIW0UUdpwCC9G+2/t0+kUCV1+PHcS1xmLPylpKq6pjI6kTj46QV4uDMlBXoGq4hLVqVuvMUDxhwJWXUtbqz0LnIgpYHvhjbinr5DdUch8uSLzSFoiqNe7zXeyVuWjE5SfO4qW6qG4uHqRYK3NEAbzJDsh/UlPAQEoiXbwuyKXLJwOQqWTr80VGYvlcMX0ZKRyrVdK2jkZXZsxoM3X6kL8ic/5xaeJJTTD/gvF8atNpaDvrv7sa2cjj8FZhhA7XYKdJnVUS4LtBrhENaFfDwKhrz2FNe7FDeNyKr32Hp9WAufLALVbeyqK8iSqqi5uhUNWPi7nJk6JvNUAXl5NiZE8j5DXUpzYOziUKyZIJ+tJbI4M+0JPW5vtSiGoNlyx/t408OcY+Z+ZYR0d+pXh4D0ikC1s1ORxSoFQdgjef9wMjn2Ci4ak80pHMwHZjWNHaw6AFdYK7xXaiM2prBH4hpVGZgu/rZ1gANR0Tg2PRT4+QrFP+xdgxvjFnHYL3U1NAqt6HISNLWYq4HOtDSmv6UZgdMBk//9ueb2UbdlIFwbIeo6vXSTiW9Bw6wGcXDxcEaeidulzknCXdF2qyZmg== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:VI1PR0402MB3439.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230025)(366004)(396003)(136003)(346002)(39860400002)(376002)(451199018)(8936002)(5660300002)(7416002)(86362001)(38100700002)(2906002)(36756003)(4326008)(6486002)(83380400001)(478600001)(6666004)(107886003)(41300700001)(2616005)(186003)(1076003)(6512007)(26005)(6506007)(54906003)(110136005)(316002)(8676002)(66556008)(66476007)(66946007);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?19uaPTxzlFkp2VJICwi0UwBVxzqN3PL5aV699mibvARgrA50q0y9lCVa0oNe?= =?us-ascii?Q?7ZFMo2PzH97f/OmrwOGlOncvtUa5d4gGErYqaSqF4X7YXO492Lci524abfQ7?= =?us-ascii?Q?aZ01gQwE7Tld3EY/g6jUWEOd+JPgNMB7FJIVNxelTPPGe4y7EZpQX0I48aen?= =?us-ascii?Q?8jE9WRi9QHhOH7+x8j36/k3iQke+xBxjjFYwcAJqMlniKKdXadg0tmvi9vbM?= =?us-ascii?Q?ra/+CIbhG1y/4FZtbjm6QghoGESuIK3gCRNOrzjHGmGQQ8NJx6vQYoMe+Yir?= =?us-ascii?Q?5VmCNcvE3gFhRCuPbUNjKvjkvEL4ErV3nRspCIWuJLY+MJcyP8LPGC52ea1n?= =?us-ascii?Q?s4q3K3nnNxuary+/cKof1qFMcHcHbU+JYQ2+vwUj9twDgdK2BFJyUXaD7Zn0?= =?us-ascii?Q?kKly5qKNlEroFDQss/4kDKKZzdxZIWs1naBWQqyoZbMMcCmtx0KxWaCvqXch?= =?us-ascii?Q?bn0hUDcPtCW8EXUmfZB+ClbremGdrvRfg5qHyHgm+9CDrvLWFQHZ46Sp6vl2?= =?us-ascii?Q?dfWGU0ErnQG/n03PNfx71VgenLjNnGKxA169RW7cKMo3/wZiLBNb7hZ+Y+6V?= =?us-ascii?Q?28TKMFZ61z0eWYZT+gfKpzxqrIXFP4L7WYWPKf91E/HNzMjohOdhyVrtkDUm?= =?us-ascii?Q?XRtZmfxAGHSimz2OVxGHgEt00q90dIEsBuic//2pzFMsLuY8pu/KQD8THflJ?= =?us-ascii?Q?+WFaGbQ8BTqo9SWjpDjFr2h1+20LgyBtYSfCHw2zfh+uROXBoJJ6feLrpcTH?= =?us-ascii?Q?xRddGAkfp2G50Wm103mvOjki6WCtR8BZT0foAtRHcGIsGXPub2vzB7dM0zUD?= =?us-ascii?Q?atbDmo9KP6EfQTefk96P5tzEFySay/r7gIgZHvewiSZIKwn8+xryYm2YeKbi?= =?us-ascii?Q?Bm36IX09WuPtMQKPNC6U2Q9Mg3E6VdutlSx8KA0XY6jmLB5zrgAQ2+wkSuK8?= =?us-ascii?Q?0XVojCu/E6bkIb/XyptW9oRYCFj/me5gQj60KUfw9aKe8EILSyO3Ba368V2b?= =?us-ascii?Q?gYxaa5DI8rax10WpbzJxTsXLPZ1XE3SRnd7Cl6ec9v6lXzQj9Fgazf5EA61v?= =?us-ascii?Q?H4H52cvvux36il4cPkLVmMGlIZrwQLAcAT49bTv2i8rVgWSErFQIiUjBidby?= =?us-ascii?Q?YpP/PhEUxoMr1iPtiNCz7lnAI0g60gfDxFSwGZl/n2MSmLLK8SCCjlm34qG0?= =?us-ascii?Q?1pPQEfcCy4B/cr233onDCll6bGSoqwzuGry+S2rZIkutXB35zRDzBN4qOUpt?= =?us-ascii?Q?ckOgKb6Co+e4vy9SnPwXPlWIY2kq3ThaM2m9J5NAVjup0rdXGhcqJkvp7xrN?= =?us-ascii?Q?xvdPTqcY3hArd99hFZemc6PHMyHWv4pIGcdPNwEam7dePMCrxRpjwbTv2MbA?= =?us-ascii?Q?/hYjmYWdVJiOVpxmx7+ZRCz6zUPg4HU4Dj2OzvkrzJuSz2xPNzrysxjGTSim?= =?us-ascii?Q?V4zJDASyVTCJxS9BeqO7EBaWeNkNAkJBWXYasmq6K0VF+z4qTESRo+9tA6Z9?= =?us-ascii?Q?mx14bzUPZ5f8unKnMKek7j82cK98SQf58j21VYtj2JAvkupkYQmHX/lxiUxL?= =?us-ascii?Q?QE2wINbj0mqOrlIj9UM=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: a8ab178a-63f5-4bd9-2068-08db29619fd2 X-MS-Exchange-CrossTenant-AuthSource: VI1PR0402MB3439.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Mar 2023 16:39:07.7034 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: f7a17af6-1c5c-4a36-aa8b-f5be247aa4ba X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: XaD9q6/jRJY7FGwKlThgp4MmxyN6xFEREXDcZlGYo055mcd1wvIMxIFjX7MHXlga X-MS-Exchange-Transport-CrossTenantHeadersStamped: DU0PR04MB9274 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Instead of relying on of_match_device(), using of_device_get_match_data() can simplify implementation and avoid code duplication. Signed-off-by: Chester Lin Suggested-by? --- (An initial version since v2) drivers/pinctrl/nxp/pinctrl-s32g2.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/drivers/pinctrl/nxp/pinctrl-s32g2.c b/drivers/pinctrl/nxp/pinc= trl-s32g2.c index 5028f4adc389..f99f88615ef6 100644 --- a/drivers/pinctrl/nxp/pinctrl-s32g2.c +++ b/drivers/pinctrl/nxp/pinctrl-s32g2.c @@ -740,14 +740,12 @@ MODULE_DEVICE_TABLE(of, s32_pinctrl_of_match); =20 static int s32g_pinctrl_probe(struct platform_device *pdev) { - const struct of_device_id *of_id =3D - of_match_device(s32_pinctrl_of_match, &pdev->dev); + struct s32_pinctrl_soc_info *soc_info; =20 - if (!of_id) - return -ENODEV; + soc_info =3D (struct s32_pinctrl_soc_info *) + of_device_get_match_data(&pdev->dev); =20 - return s32_pinctrl_probe - (pdev, (struct s32_pinctrl_soc_info *) of_id->data); + return s32_pinctrl_probe(pdev, soc_info); } =20 static const struct dev_pm_ops s32g_pinctrl_pm_ops =3D { --=20 2.37.3 From nobody Sun Feb 8 21:26:39 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2D23DC6FD1D for ; Mon, 20 Mar 2023 16:46:03 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232396AbjCTQqB (ORCPT ); Mon, 20 Mar 2023 12:46:01 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42160 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233255AbjCTQpK (ORCPT ); Mon, 20 Mar 2023 12:45:10 -0400 Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05on2086.outbound.protection.outlook.com [40.107.21.86]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1467C14237; Mon, 20 Mar 2023 09:39:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=fBFUU2JPiGaFa+SlrwNffh0Idv0EoYWB0Wd1epWWgdP6k1fb99Hx8VNeWAZFxpVlLRU1HeaqypNLwnHnLUmAqLqlHorn9fziuitSEBwbzRCyucq5j+JWjM8HG8JyeGnu9gSkNh13GmyAowrxpEpGDYjNJCmPft+1IOO/CTnuSRbKaLJj4x9uGJFU6+8LOhZRJfsI7hS5VLsoebLM9eB31fBreLQQ13wH9m4SyYZj9xZ4chvynHOu67i04rYu/EHPfdhLugGEVpaVUY1oDvNV8LwHObCXQ5yz39VHWnLx2dDqXVWYVlRKRnPXOewY+hXDS6MGDkkiP9aO0owpdLHqXw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; 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=m6XFF4HqWe/7xjL1xMujk9Z0saez063aTDC2xCGJWcw=; b=QY0+Uap6BijAr5OFs2NTYVeYmIPHWgRDeBg/TaVpPilKTak5OARmnJtxHF988jE4/uhB1zYVC9eMGDah3PlQ6cSvOFrNJv+QVGS6jRcV/S4kJ+rOofg68MXFDA4Oytux39MzolvBg1c3WP+/81z5J9QtuVl49SRDXmSwoUW2bIp6PKtznkJcSbvdynTX14zF741zwLmUWtb22nsgyJFpefHOCWJ+G7kQTcYdzc7igDiqhQFYh0tROybRLuAGWhtmpSbQaVEqOk0aDNBfwO9ghZr97/Mpc0avVJ2IlGg3C7w1eZaOkwp4DCFaSVXMGQUDOEnNSi6aGspWXL6KkezRSQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=suse.com; dmarc=pass action=none header.from=suse.com; dkim=pass header.d=suse.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=m6XFF4HqWe/7xjL1xMujk9Z0saez063aTDC2xCGJWcw=; b=oj7jjfnlZnSFF+FeoqfIjhggSkFgniAx7kUv/lwE5fJ4SrNvU7lIlBJsHvnxOJBasFU1/FdIMIfqXANsxDcKYaJ+/EgjexZ2LTqXje4aTrAEyiivElMEy41TS+pci9kGqzFx1V25hPwFmibP9OLgGBhF1P2C0ZILkk9vLv1lT9drr4Et1yCgbg8VD13pLtcGipmt2z54N9IAyTy4vGasN74tuQsTa/VrrWvuPQ1qD37xGNoquu/CUjpsWHiX2RY3EcTY2Pk107qRCuGoMSNtSLpizgSxoNW5APqK5qpwPYLCUCaBeAKWkeLyyeX9y9p7mAlMaoPIRpiwb/d+Tq/qXA== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=suse.com; Received: from VI1PR0402MB3439.eurprd04.prod.outlook.com (2603:10a6:803:4::13) by DU0PR04MB9274.eurprd04.prod.outlook.com (2603:10a6:10:355::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6178.37; Mon, 20 Mar 2023 16:39:32 +0000 Received: from VI1PR0402MB3439.eurprd04.prod.outlook.com ([fe80::6802:b2c3:5f12:8f9f]) by VI1PR0402MB3439.eurprd04.prod.outlook.com ([fe80::6802:b2c3:5f12:8f9f%2]) with mapi id 15.20.6178.037; Mon, 20 Mar 2023 16:39:32 +0000 From: Chester Lin To: Linus Walleij , Andy Shevchenko Cc: Chester Lin , NXP S32 Linux Team , linux-gpio@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Ghennadi Procopciuc , Andrei Stefanescu , Radu Pirea , =?UTF-8?q?Andreas=20F=C3=A4rber?= , Matthias Brugger Subject: [PATCH v2 2/4] pinctrl: s32: refine error/return/config checks and simplify driver codes Date: Tue, 21 Mar 2023 00:38:21 +0800 Message-Id: <20230320163823.886-3-clin@suse.com> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20230320163823.886-1-clin@suse.com> References: <20230320163823.886-1-clin@suse.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: TYCP286CA0150.JPNP286.PROD.OUTLOOK.COM (2603:1096:400:31b::17) To VI1PR0402MB3439.eurprd04.prod.outlook.com (2603:10a6:803:4::13) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: VI1PR0402MB3439:EE_|DU0PR04MB9274:EE_ X-MS-Office365-Filtering-Correlation-Id: d292625f-c580-4748-6f14-08db2961aee3 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: ra2BkvKV+NiSU1mNDy8ao5MG/Bzy5dS9KstUSMfm53BU6QuEjJaT1ZnUwFxg1OPBMjKlW0anp7gsL6hjTY+DenBkJFW8f/FcawmY+8RQFwSRaEjhEhql/jW6kMi9VIKIoY4/yAYa5IX8H26NXVr8SI5Db+pvdMyQX1cCF9fAaPaWpXX6vTU/Ujv6lSWI1MLY19ChMR5ZQJEznntuB3t8A4mirzZVl0DUkoSDqSsdgjj5skZP1Uahi83ES3ROUwznL5no/J9lCIqo+8hSPP1JeuBS2ccBZNSUQM0fMdAMErzDrcH87ktZXfs5ey9yWFMePHLuuhI6BEGKaRnDYvf20P7pCECes4rx5NlemSNYyuGJo/4UetO8S4ci7XlgBaZ7+Von9doF0YaNJUVGfClBG3PfEF13AfZrceJr2gbGvykHL9M/TQu/q2Fcxano8Hzq7iwIiO4GUV4mRvRe/Khlc524RDZGKWd0KVGs63QfdAeeElyo66x/L27UwQJsNiUkg6IaRsREQoPMH9hJzpkiKZWtSbGQtTJKL0VQmy+pX3/zmOvdy05rFG9vuvUw8Z8i3r4L+Kv4jdFshUjp49bVIYRkCh9wufXrY9ycza2V/0Vy04dvqRVM8QS5Jue91qoS8YWwkxNVn/tGzCwPuGuu9A== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:VI1PR0402MB3439.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230025)(366004)(396003)(136003)(346002)(39860400002)(376002)(451199018)(8936002)(5660300002)(30864003)(7416002)(86362001)(38100700002)(2906002)(36756003)(4326008)(6486002)(83380400001)(478600001)(6666004)(107886003)(41300700001)(2616005)(186003)(1076003)(6512007)(26005)(6506007)(54906003)(110136005)(316002)(8676002)(66556008)(66476007)(66946007);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?zpCmj0r3ZVzDbbYbiw9eyofIwm+2EKKwxCR1yVI6I36OwNUATGjM8q8pM7Mq?= =?us-ascii?Q?Iev8hpsByw6XbRYSg4rILyGVM03YVYk+oGkkue0if4vaK67JNrYuXZoMZzPz?= =?us-ascii?Q?x+3Ye7gCkumsJteWADtF8qkx7ayuC0Rm+AH07mHn1/W9FZS0NpUEaKcUmrDm?= =?us-ascii?Q?Fp9Ah8zUdPvLm+tdEHA0JbrxCBlQsX7y0xbDUm7/u+2ZnZBDfaRNB1ozVq9k?= =?us-ascii?Q?p9TdGCfUWhi14Go9eTmuipm0FYpL6OBZIx2dbR+bV469zL/ECpr7sDgqdGDk?= =?us-ascii?Q?WzNxHMcxF5itblFfRgQlRHB6sVfzy5wvLLN4ZIEHjqv4YJDCXrDYljF/F+LP?= =?us-ascii?Q?olDrhJEvziEiJhhmwh45ncxZmbX/bVI8838FxEP0MdZ1zM6lwOynDaMDQNUx?= =?us-ascii?Q?2Oasoe025ckk7dFXW+v2umVyvJ09/qJ/eyiJKq6nRlLDoBVs9eG2yoCYAWAc?= =?us-ascii?Q?1eqaSA1wpbvvF3HexQXPuokjY4YAk6IAOZK56mAsJgJT+R1+NIehQTxONzIa?= =?us-ascii?Q?y3hMTA9qYPBSyOh+m1WG0yV1bDW3qSkIH3Ufmot8YbFuhXC2lBdbWSKVrt0c?= =?us-ascii?Q?4iCBnpseKqZl6r2Juh8FeLDb4N+OwVH2ITDW6LfF3mIFUreJfxthpP8v5UxI?= =?us-ascii?Q?/3hucO72P+iWUylZDjXLwKAyE80RFBlVjhOP4YNLxIgiTXxZ78yNM1/JonPe?= =?us-ascii?Q?wqKtypd/vOqRvvlB85p6Sw8riQO5kF98hbq5nc5QKUXqLkZvb3i7YYkI33ve?= =?us-ascii?Q?oGC5mZcF9k50jFj7xVSCUBG3KrI2Q1LDqgSmP/h89sxMJs8lUeR8N3dbTnjg?= =?us-ascii?Q?pRPIrca16TMW82hAhTBYOGM8bp6icd4UF/vHzOm2JN5IE+bD7ZwB5VdoFNZ7?= =?us-ascii?Q?ITX+nvKDoP81CKSx2ISruyc7Jy3ebghogdZvRBpATG7jfAwse6dXbb0exZXD?= =?us-ascii?Q?G579RstU8KpQaTFSM0A31Vj2+YSF67lK+ZKihIE8HzdEgViAxD2ktg7zIBWC?= =?us-ascii?Q?YuRwbiDgNpaiD/uCF1CxMq3Lxzv21hdvnFaBvV9D25wvBZ1549PmkRlja2JN?= =?us-ascii?Q?dySqc9iNmKHNlS3g0fWfgmfrH0G4vnIQdoDlw5PYcD49D1Bob0g4vJMbHDuk?= =?us-ascii?Q?RrntpHDXo2VWzYNenIFR9ZwLceW7vNcEqxe7W16FJfDqQ8vXISdsflOukYET?= =?us-ascii?Q?jStkv/Nh6+1SQu306XNT2Iom7eYVwx5s1Bz75Aay97OqPaSnjiJKDPSd5Ssx?= =?us-ascii?Q?LuCmfFYl/p/jECi4T58Yl1p1V3oV/PbZUHrUsY0HDkvtoRLyhhcdVGwnQqvL?= =?us-ascii?Q?id/Iol9dsjmtz76a3zshggNUk6fqo15b2LYyDYuKDFtYvUbjs86TsyO+q50y?= =?us-ascii?Q?LOB+ScCQ8+KWxOydmdv+Q6knzrrXImxI+9ZiuO/kd9Kuf5KMy7cvdPDFrswZ?= =?us-ascii?Q?CnZmTXjyQv9Ev5fTd1RDTMlXdGlS5kS6GQ0+yoloKWSs+N6DFZaHeG3M4czv?= =?us-ascii?Q?GSN1p3Y4l1Qnjlbo4qngQyGR7nS2TRrsP4yrg69fLVrZ6Jwz3MSptbCpL8tu?= =?us-ascii?Q?n1fxLXVbvUstcTJJ6I8=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: d292625f-c580-4748-6f14-08db2961aee3 X-MS-Exchange-CrossTenant-AuthSource: VI1PR0402MB3439.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Mar 2023 16:39:32.7170 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: f7a17af6-1c5c-4a36-aa8b-f5be247aa4ba X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: klKHDpaVJKYnc/Vf83pakGtfdrk7rMEXRQ34HTBun9yHq/ykwAZsJGPND7CXFCra X-MS-Exchange-Transport-CrossTenantHeadersStamped: DU0PR04MB9274 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Improve error/return code handlings and config checks in order to have better reliability and simplify driver codes such as removing/changing improper macros, blanks, print formats and helper calls. Signed-off-by: Chester Lin Reviewed-by: Andy Shevchenko --- Changes in v2: - Enhance sizeof() arguments. - Fix blanks and remove unnecessary parentheses. - Move s32g_pinctrl_probe() changes to the patch [1/4]. drivers/pinctrl/nxp/pinctrl-s32cc.c | 141 +++++++++++++++------------- drivers/pinctrl/nxp/pinctrl-s32g2.c | 4 +- 2 files changed, 76 insertions(+), 69 deletions(-) diff --git a/drivers/pinctrl/nxp/pinctrl-s32cc.c b/drivers/pinctrl/nxp/pinc= trl-s32cc.c index e1da332433a3..f698e1a240ef 100644 --- a/drivers/pinctrl/nxp/pinctrl-s32cc.c +++ b/drivers/pinctrl/nxp/pinctrl-s32cc.c @@ -28,7 +28,8 @@ #include "../pinctrl-utils.h" #include "pinctrl-s32.h" =20 -#define S32_PIN_ID_MASK GENMASK(31, 4) +#define S32_PIN_ID_SHIFT 4 +#define S32_PIN_ID_MASK GENMASK(31, S32_PIN_ID_SHIFT) =20 #define S32_MSCR_SSS_MASK GENMASK(2, 0) #define S32_MSCR_PUS BIT(12) @@ -46,7 +47,7 @@ static struct regmap_config s32_regmap_config =3D { =20 static u32 get_pin_no(u32 pinmux) { - return (pinmux & S32_PIN_ID_MASK) >> __ffs(S32_PIN_ID_MASK); + return (pinmux & S32_PIN_ID_MASK) >> S32_PIN_ID_SHIFT; } =20 static u32 get_pin_func(u32 pinmux) @@ -108,7 +109,7 @@ s32_get_region(struct pinctrl_dev *pctldev, unsigned in= t pin) unsigned int mem_regions =3D ipctl->info->mem_regions; unsigned int i; =20 - for (i =3D 0; i < mem_regions; ++i) { + for (i =3D 0; i < mem_regions; i++) { pin_range =3D ipctl->regions[i].pin_range; if (pin >=3D pin_range->start && pin <=3D pin_range->end) return &ipctl->regions[i]; @@ -224,8 +225,7 @@ static int s32_dt_group_node_to_map(struct pinctrl_dev = *pctldev, =20 n_pins =3D of_property_count_elems_of_size(np, "pinmux", sizeof(u32)); if (n_pins < 0) { - dev_warn(dev, "Unable to find 'pinmux' property in node %s.\n", - np->name); + dev_warn(dev, "Can't find 'pinmux' property in node %pOFn\n", np); } else if (!n_pins) { return -EINVAL; } @@ -317,20 +317,25 @@ static int s32_pmx_set(struct pinctrl_dev *pctldev, u= nsigned int selector, info->functions[selector].name, grp->name); =20 /* Check beforehand so we don't have a partial config. */ - for (i =3D 0; i < grp->npins; ++i) { + for (i =3D 0; i < grp->npins; i++) { if (s32_check_pin(pctldev, grp->pin_ids[i]) !=3D 0) { - dev_err(info->dev, "invalid pin: %d in group: %d\n", + dev_err(info->dev, "invalid pin: %u in group: %u\n", grp->pin_ids[i], group); return -EINVAL; } } =20 - for (i =3D 0, ret =3D 0; i < grp->npins && !ret; ++i) { + for (i =3D 0, ret =3D 0; i < grp->npins && !ret; i++) { ret =3D s32_regmap_update(pctldev, grp->pin_ids[i], S32_MSCR_SSS_MASK, grp->pin_sss[i]); + if (ret) { + dev_err(info->dev, "Failed to set pin %u\n", + grp->pin_ids[i]); + return ret; + } } =20 - return ret; + return 0; } =20 static int s32_pmx_get_funcs_count(struct pinctrl_dev *pctldev) @@ -375,8 +380,8 @@ static int s32_pmx_gpio_request_enable(struct pinctrl_d= ev *pctldev, int ret; =20 ret =3D s32_regmap_read(pctldev, offset, &config); - if (ret !=3D 0) - return -EINVAL; + if (ret) + return ret; =20 /* Save current configuration */ gpio_pin =3D kmalloc(sizeof(*gpio_pin), GFP_KERNEL); @@ -387,7 +392,7 @@ static int s32_pmx_gpio_request_enable(struct pinctrl_d= ev *pctldev, gpio_pin->config =3D config; =20 spin_lock_irqsave(&ipctl->gpio_configs_lock, flags); - list_add(&(gpio_pin->list), &(ipctl->gpio_configs)); + list_add(&gpio_pin->list, &ipctl->gpio_configs); spin_unlock_irqrestore(&ipctl->gpio_configs_lock, flags); =20 /* GPIO pin means SSS =3D 0 */ @@ -401,23 +406,20 @@ static void s32_pmx_gpio_disable_free(struct pinctrl_= dev *pctldev, unsigned int offset) { struct s32_pinctrl *ipctl =3D pinctrl_dev_get_drvdata(pctldev); - struct list_head *pos, *tmp; - struct gpio_pin_config *gpio_pin; + struct gpio_pin_config *gpio_pin, *tmp; unsigned long flags; int ret; =20 spin_lock_irqsave(&ipctl->gpio_configs_lock, flags); =20 - list_for_each_safe(pos, tmp, &ipctl->gpio_configs) { - gpio_pin =3D list_entry(pos, struct gpio_pin_config, list); - + list_for_each_entry_safe(gpio_pin, tmp, &ipctl->gpio_configs, list) { if (gpio_pin->pin_id =3D=3D offset) { ret =3D s32_regmap_write(pctldev, gpio_pin->pin_id, gpio_pin->config); if (ret !=3D 0) goto unlock; =20 - list_del(pos); + list_del(&gpio_pin->list); kfree(gpio_pin); break; } @@ -461,7 +463,8 @@ static const int support_slew[] =3D {208, -1, -1, -1, 1= 66, 150, 133, 83}; =20 static int s32_get_slew_regval(int arg) { - int i; + unsigned int i; + /* Translate a real slew rate (MHz) to a register value */ for (i =3D 0; i < ARRAY_SIZE(support_slew); i++) { if (arg =3D=3D support_slew[i]) @@ -542,10 +545,11 @@ static int s32_pinconf_mscr_update(struct pinctrl_dev= *pctldev, unsigned int config =3D 0, mask =3D 0; int i, ret; =20 - if (s32_check_pin(pctldev, pin_id) !=3D 0) - return -EINVAL; + ret =3D s32_check_pin(pctldev, pin_id); + if (ret) + return ret; =20 - dev_dbg(ipctl->dev, "pinconf set pin %s with %d configs\n", + dev_dbg(ipctl->dev, "pinconf set pin %s with %u configs\n", pin_get_name(pctldev, pin_id), num_configs); =20 for (i =3D 0; i < num_configs; i++) { @@ -559,11 +563,9 @@ static int s32_pinconf_mscr_update(struct pinctrl_dev = *pctldev, if (!config && !mask) return 0; =20 - ret =3D s32_regmap_update(pctldev, pin_id, mask, config); + dev_dbg(ipctl->dev, "update: pin %u cfg 0x%x\n", pin_id, config); =20 - dev_dbg(ipctl->dev, "update: pin %d cfg 0x%x\n", pin_id, config); - - return ret; + return s32_regmap_update(pctldev, pin_id, mask, config); } =20 static int s32_pinconf_get(struct pinctrl_dev *pctldev, @@ -604,10 +606,13 @@ static void s32_pinconf_dbg_show(struct pinctrl_dev *= pctldev, struct seq_file *s, unsigned int pin_id) { unsigned int config; - int ret =3D s32_regmap_read(pctldev, pin_id, &config); + int ret; =20 - if (!ret) - seq_printf(s, "0x%x", config); + ret =3D s32_regmap_read(pctldev, pin_id, &config); + if (ret) + return; + + seq_printf(s, "0x%x", config); } =20 static void s32_pinconf_group_dbg_show(struct pinctrl_dev *pctldev, @@ -710,7 +715,7 @@ int s32_pinctrl_resume(struct device *dev) } #endif =20 -static void s32_pinctrl_parse_groups(struct device_node *np, +static int s32_pinctrl_parse_groups(struct device_node *np, struct s32_pin_group *grp, struct s32_pinctrl_soc_info *info) { @@ -722,21 +727,20 @@ static void s32_pinctrl_parse_groups(struct device_no= de *np, =20 dev =3D info->dev; =20 - dev_dbg(dev, "group: %s\n", np->name); + dev_dbg(dev, "group: %pOFn\n", np); =20 /* Initialise group */ grp->name =3D np->name; =20 npins =3D of_property_count_elems_of_size(np, "pinmux", sizeof(u32)); - if (npins < 0) { dev_err(dev, "Failed to read 'pinmux' property in node %s.\n", - np->name); - return; + grp->name); + return -EINVAL; } if (!npins) { - dev_err(dev, "The group %s has no pins.\n", np->name); - return; + dev_err(dev, "The group %s has no pins.\n", grp->name); + return -EINVAL; } =20 grp->npins =3D npins; @@ -745,12 +749,8 @@ static void s32_pinctrl_parse_groups(struct device_nod= e *np, sizeof(unsigned int), GFP_KERNEL); grp->pin_sss =3D devm_kcalloc(info->dev, grp->npins, sizeof(unsigned int), GFP_KERNEL); - - if (!grp->pin_ids || !grp->pin_sss) { - dev_err(dev, "Failed to allocate memory for the group %s.\n", - np->name); - return; - } + if (!grp->pin_ids || !grp->pin_sss) + return -ENOMEM; =20 i =3D 0; of_property_for_each_u32(np, "pinmux", prop, p, pinmux) { @@ -761,9 +761,11 @@ static void s32_pinctrl_parse_groups(struct device_nod= e *np, grp->pin_ids[i], grp->pin_sss[i]); i++; } + + return 0; } =20 -static void s32_pinctrl_parse_functions(struct device_node *np, +static int s32_pinctrl_parse_functions(struct device_node *np, struct s32_pinctrl_soc_info *info, u32 index) { @@ -771,8 +773,9 @@ static void s32_pinctrl_parse_functions(struct device_n= ode *np, struct s32_pmx_func *func; struct s32_pin_group *grp; u32 i =3D 0; + int ret =3D 0; =20 - dev_dbg(info->dev, "parse function(%d): %s\n", index, np->name); + dev_dbg(info->dev, "parse function(%u): %pOFn\n", index, np); =20 func =3D &info->functions[index]; =20 @@ -780,18 +783,24 @@ static void s32_pinctrl_parse_functions(struct device= _node *np, func->name =3D np->name; func->num_groups =3D of_get_child_count(np); if (func->num_groups =3D=3D 0) { - dev_err(info->dev, "no groups defined in %s\n", np->full_name); - return; + dev_err(info->dev, "no groups defined in %pOF\n", np); + return -EINVAL; } - func->groups =3D devm_kzalloc(info->dev, - func->num_groups * sizeof(char *), GFP_KERNEL); + func->groups =3D devm_kcalloc(info->dev, func->num_groups, + sizeof(*func->groups), GFP_KERNEL); + if (!func->groups) + return -ENOMEM; =20 for_each_child_of_node(np, child) { func->groups[i] =3D child->name; grp =3D &info->groups[info->grp_index++]; - s32_pinctrl_parse_groups(child, grp, info); + ret =3D s32_pinctrl_parse_groups(child, grp, info); + if (ret) + return ret; i++; } + + return 0; } =20 static int s32_pinctrl_probe_dt(struct platform_device *pdev, @@ -804,6 +813,7 @@ static int s32_pinctrl_probe_dt(struct platform_device = *pdev, struct regmap *map; void __iomem *base; int mem_regions =3D info->mem_regions; + int ret; u32 nfuncs =3D 0; u32 i =3D 0; =20 @@ -815,13 +825,12 @@ static int s32_pinctrl_probe_dt(struct platform_devic= e *pdev, return -EINVAL; } =20 - ipctl->regions =3D devm_kzalloc(&pdev->dev, - mem_regions * sizeof(*(ipctl->regions)), - GFP_KERNEL); + ipctl->regions =3D devm_kcalloc(&pdev->dev, mem_regions, + sizeof(*ipctl->regions), GFP_KERNEL); if (!ipctl->regions) return -ENOMEM; =20 - for (i =3D 0; i < mem_regions; ++i) { + for (i =3D 0; i < mem_regions; i++) { base =3D devm_platform_get_and_ioremap_resource(pdev, i, &res); if (IS_ERR(base)) return PTR_ERR(base); @@ -851,24 +860,26 @@ static int s32_pinctrl_probe_dt(struct platform_devic= e *pdev, } =20 info->nfunctions =3D nfuncs; - info->functions =3D devm_kzalloc(&pdev->dev, - nfuncs * sizeof(struct s32_pmx_func), - GFP_KERNEL); + info->functions =3D devm_kcalloc(&pdev->dev, nfuncs, + sizeof(*info->functions), GFP_KERNEL); if (!info->functions) return -ENOMEM; =20 info->ngroups =3D 0; for_each_child_of_node(np, child) info->ngroups +=3D of_get_child_count(child); - info->groups =3D devm_kzalloc(&pdev->dev, - info->ngroups * sizeof(struct s32_pin_group), - GFP_KERNEL); + + info->groups =3D devm_kcalloc(&pdev->dev, info->ngroups, + sizeof(*info->groups), GFP_KERNEL); if (!info->groups) return -ENOMEM; =20 i =3D 0; - for_each_child_of_node(np, child) - s32_pinctrl_parse_functions(child, info, i++); + for_each_child_of_node(np, child) { + ret =3D s32_pinctrl_parse_functions(child, info, i++); + if (ret) + return ret; + } =20 return 0; } @@ -923,11 +934,9 @@ int s32_pinctrl_probe(struct platform_device *pdev, =20 ipctl->pctl =3D devm_pinctrl_register(&pdev->dev, s32_pinctrl_desc, ipctl); - - if (IS_ERR(ipctl->pctl)) { - dev_err(&pdev->dev, "could not register s32 pinctrl driver\n"); - return PTR_ERR(ipctl->pctl); - } + if (IS_ERR(ipctl->pctl)) + return dev_err_probe(&pdev->dev, PTR_ERR(ipctl->pctl), + "could not register s32 pinctrl driver\n"); =20 #ifdef CONFIG_PM_SLEEP saved_context =3D &ipctl->saved_context; diff --git a/drivers/pinctrl/nxp/pinctrl-s32g2.c b/drivers/pinctrl/nxp/pinc= trl-s32g2.c index f99f88615ef6..9f521312f768 100644 --- a/drivers/pinctrl/nxp/pinctrl-s32g2.c +++ b/drivers/pinctrl/nxp/pinctrl-s32g2.c @@ -755,14 +755,12 @@ static const struct dev_pm_ops s32g_pinctrl_pm_ops = =3D { static struct platform_driver s32g_pinctrl_driver =3D { .driver =3D { .name =3D "s32g-siul2-pinctrl", - .owner =3D THIS_MODULE, .of_match_table =3D s32_pinctrl_of_match, - .pm =3D &s32g_pinctrl_pm_ops, + .pm =3D pm_sleep_ptr(&s32g_pinctrl_pm_ops), .suppress_bind_attrs =3D true, }, .probe =3D s32g_pinctrl_probe, }; - builtin_platform_driver(s32g_pinctrl_driver); =20 MODULE_AUTHOR("Matthew Nunez "); --=20 2.37.3 From nobody Sun Feb 8 21:26:39 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 15AA9C7618D for ; Mon, 20 Mar 2023 16:46:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231984AbjCTQqz (ORCPT ); Mon, 20 Mar 2023 12:46:55 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37274 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231833AbjCTQpe (ORCPT ); Mon, 20 Mar 2023 12:45:34 -0400 Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05on2086.outbound.protection.outlook.com [40.107.21.86]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4B34833461; Mon, 20 Mar 2023 09:40:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=YMVkbd01A7yrnkSV0srQ7zXFx1OkOzHCS1+1l1irwB53BoYdXAZSvML96O0pssiiIZu4iNYv7n+i0YyDDMhVtG5LbcEtap8jQeKT8f8tCaLXsfp/XE1eVntT15YG7/zNa1iHYiBZDWOFGEna8kIq/MnT3hhn1wmOqiaGObpjd24Mhzw1G/5f/JmZ2mv/k5sgy7LIlI97MtCUZ3VL6UeYl7dxWvYoCiyM1bnPizd8H18MEX2ExxI8EwPZpfn+y8fwSrZG12JT8tfJNqGbJ9Y61OyBGfPutCMLzDM7/HtHW6doEdiu2agVZ97ycKaYtUgL9Ii7dzb2p9I5YmYwzoEcyA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; 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=mQu3jYKokEz7tGJfJMQP/VuspHARz/h6PMLM5pn2zdY=; b=AL5XuwcVUMS3zq7hFNG/1adWJFJmRUL1mcxFPYSfTcKTIIF8b08NhgsAgY/1z/cXJ0T5i6EoNT4MIyBSTYqkTrNU7Y+V7YFHCRkBDW73aq9sVFHwvDRY8XJKeCqIIJISxoU9IvYVN8Zx8m9wP3hOiK0Y81YnZmb56hzA7BveULYdIwctJEwetFXU/wVGikroTLS975hZSEFFZta9QZwK1iU+kbMkDhuk+/hpvreirg6OYWEdawK/mqBnMxDBDL2MCc/5eeLn0/o5eT0JaMdP1HQWfpMgIwSs46LvDweT10UvSjfqwM0P12nUf0tj1abyBmGBrCRQ0WZPC4EZxHeuyA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=suse.com; dmarc=pass action=none header.from=suse.com; dkim=pass header.d=suse.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=mQu3jYKokEz7tGJfJMQP/VuspHARz/h6PMLM5pn2zdY=; b=3PTRK1W6czKXuYSBjLYqakcpyjvL9Bh5hKLrJhoAr4tTaASxB7p+YoH0IzQZLlIgd4XBiLJhoJWCd6OuHF0MYVB8+2BiLtG5QOAkiLvP3j2Pwkw0g5/1jMKzFImkH6M4HPlSpbxR55dVHkjZH9PDeO0VEbzj02BnKJoaLXbaSoARtvBDHPdqNB38YhCYVsHrzKlOw/OxuSpqtPYGschKyvmt5nTQFdAF14e/WFOGMUn6aL+e+u8kMUOalYuWQDygUh6I2jRkSOMyptWkUoV3GpAzyIOXRNkV/x/7zJwOpbX/81tRVt8iEiIlyKM54uKYH95KBr0o+MJIoLYxg14PKw== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=suse.com; Received: from VI1PR0402MB3439.eurprd04.prod.outlook.com (2603:10a6:803:4::13) by DU0PR04MB9274.eurprd04.prod.outlook.com (2603:10a6:10:355::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6178.37; Mon, 20 Mar 2023 16:39:42 +0000 Received: from VI1PR0402MB3439.eurprd04.prod.outlook.com ([fe80::6802:b2c3:5f12:8f9f]) by VI1PR0402MB3439.eurprd04.prod.outlook.com ([fe80::6802:b2c3:5f12:8f9f%2]) with mapi id 15.20.6178.037; Mon, 20 Mar 2023 16:39:42 +0000 From: Chester Lin To: Linus Walleij , Andy Shevchenko Cc: Chester Lin , NXP S32 Linux Team , linux-gpio@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Ghennadi Procopciuc , Andrei Stefanescu , Radu Pirea , =?UTF-8?q?Andreas=20F=C3=A4rber?= , Matthias Brugger Subject: [PATCH v2 3/4] pinctrl: s32cc: refactor pin config parsing Date: Tue, 21 Mar 2023 00:38:22 +0800 Message-Id: <20230320163823.886-4-clin@suse.com> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20230320163823.886-1-clin@suse.com> References: <20230320163823.886-1-clin@suse.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: TYCP286CA0177.JPNP286.PROD.OUTLOOK.COM (2603:1096:400:3c6::20) To VI1PR0402MB3439.eurprd04.prod.outlook.com (2603:10a6:803:4::13) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: VI1PR0402MB3439:EE_|DU0PR04MB9274:EE_ X-MS-Office365-Filtering-Correlation-Id: 8cd42464-8a6f-4b44-9591-08db2961b4bc X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 3lyTXE+FH2n9QUP82u9GcI1f5p9MvOE3wswwtfq786He9MoH7612KGR0MfVjDJ8feWGNDkGlQf38SZ/u8qJoNWfrWO+ac/XU64dOYKTDz0HoFfvRWMo2FKWjJOfI2SPniUyGgyvL3hP5/yI0AHPH3hF2bL07huIVhDtdFF8DdlBDTjztckJJDad/AKV+glA7cDcvVXrqMNbDHFU1q2nEaCC9vW7rtKcK3Xm/lhrvbFkKtVyEP9/3Bve1nPdiLfA2zNcuRAv/X1ylOY+YGmy3L1ZzshTgS6MHvgljAbeQrRMxNGQOOAqG2brX2ZrRTnX+8+hHUWR2itJbRmRrUpiR1Jv/cjJcwEijeRFOaCAltpRrFSkM8Yvj+AWzQ/xQ2lDtbmKYyBDOCjcd9VMsSjFMdMpGNG/MB5qc5NYMXeHSkoWVi58GwTobeA9lW4aXzRNyuPGbKjQKx02glIqfcbbZ/4U4Z01lWK25S+j+OXeI5KEGHWTvtr8YW71BLCYkWeXkDoUwH6WC/rXA1aRbT+4B418Q6oJSdvlbeFQaTwqzRmhq3dqVi9BJWLrayfwvAuvm+sl6hkOcuXbfll2VVr488BxbHV5HIfCcBSiVYDOkHtxuZz/zPYVr3bpm1zAum/XdWNiv6ziBwOVQHBaeT8bNBQ== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:VI1PR0402MB3439.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230025)(366004)(396003)(136003)(346002)(39860400002)(376002)(451199018)(8936002)(5660300002)(7416002)(86362001)(38100700002)(2906002)(36756003)(4326008)(6486002)(83380400001)(478600001)(6666004)(107886003)(41300700001)(2616005)(186003)(1076003)(6512007)(26005)(6506007)(54906003)(110136005)(316002)(8676002)(66556008)(66476007)(66946007);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?r1Mf4mcY8YpmZPtVsYhFrEr1nTO0weweuB0NhtDCNFlwlTZqKx8noDAfDXYx?= =?us-ascii?Q?HIW76gC3uL5+ViIwwUe3fiUxk/iJ5scjYprjpFVJTwtw/Mo6Lw8wl+b9tYcT?= =?us-ascii?Q?rf4LNSkhzTNKmgBMLAjkaCFzFBR0bJPC4uNo6gKdJl3P3gvPghmsHueNAQAw?= =?us-ascii?Q?AzVj4BLcPmB9haYg2TeyR+ZPtxpusy73WhV61EMJsi9r8vShK0ZZRN10kFrz?= =?us-ascii?Q?ErvzxZuY7UDvZFaPPpfPy7iJV3mNp1MeucOsOSNgRq92c2r9WGsT4UB+JWx0?= =?us-ascii?Q?m1oyuKyUjxIhDzrbdPoYMMS4ucMjHj5/AbUMmcbmggnyf4WskdO9ZlP9NA8C?= =?us-ascii?Q?jdzLfEovcq83JoM1v4hJk8UrY19+O1186FE46Rg367n5X+rwT+4+NYuMNlL4?= =?us-ascii?Q?c/FMhV/TpockRRB06hslX/FQOops+uZ14dKdgPmnhxztMG08+JKnJPB8IP0M?= =?us-ascii?Q?yUBiTzp8ITQQ8fcGeX+vGnGVxSavd89xAfiaSTixgkAZVcQPQORpV44B+7at?= =?us-ascii?Q?e8DCyRW8Y8fZHYHdvj05orD75OmnO2QNk+WRP1Irj2UjZ/5oINUKsK6Y6QRZ?= =?us-ascii?Q?l5hx+HP0nMEQ+djWVMJU0fhjHZ5ms3y/BP6P6CtFxEWFsaDxhmLIFJmtU8x2?= =?us-ascii?Q?d9LPR3DDtZjlrEKGpL5EZlwzGsC3WRUr8kUFB17BtsnQL+9UwVA8KhI2NhTx?= =?us-ascii?Q?PlxhtjZqL6tMnXIyawNjWPds7YZgz5j3qc1ReTIeeJd5yF8YNLXwivMEW8DM?= =?us-ascii?Q?Nxp2cGLH9pJwk1EaeBSdbDClxVORm5P0ks5gXUUgbikm47I17P5z0vvjKQ6R?= =?us-ascii?Q?Eb0TM+zAjHzP677RoABYD5BL8FrQjZPmZFAydmXvpr5K0vnA05fRN5UnxNjT?= =?us-ascii?Q?zycuudFLM/02rIZSzsrP6DG9qE3jk9OtW30PoAg85V+Yn2QhjGf291JuS7p+?= =?us-ascii?Q?uW/XqUJ3cW/+bqPwnjfK+iAik11/9/PkYeSXLCviq0eC+Ml5cqDsfYXJNZjJ?= =?us-ascii?Q?o6/rQGbBRo5PHOO405JRyAo0AtUXtu1mOXiiu0qxAaPUyA/vWYUPIINtuDMK?= =?us-ascii?Q?GYpMCmf6yg52tq9a0RL36kowS08WKaKvhN/U6nWULEojWXko/R34lj6BAoZ9?= =?us-ascii?Q?RHB3KZgIMp9JhBa9m3r8t6MksMMP5D8i+SyTJg1St2mVEx2Fd096Rbod6ulT?= =?us-ascii?Q?4g7LLENn9OA8EZBktaN8+UcXiM6z28s4s1rvrxLL7DKau1RICi4n3Z7CgwAF?= =?us-ascii?Q?mc4TUZzWLw3QbTLHWG9+7ei/LXAR4ZPCWFnxoxQMiFs5g0inahFoH1ueBfsD?= =?us-ascii?Q?JYW8sLEX3lITm5/cLWUSTws0sQsBTpK87ImfsN2ObF473Z/eycrFdW2Z9JFF?= =?us-ascii?Q?N/P9TAHxXlB9lGv2Pgr+oNhRXazpWlZMe+dvN/NM0RND1lmnsfEZfCYtU6pg?= =?us-ascii?Q?M3i3UeLZ0CVvo9GsPoPJ+xOWrdN8RZvCtw61xi2xBQYKNuaG+5fEOckpOIY3?= =?us-ascii?Q?y9f0k5fCROfWncPMUSWX1E+cI+Bg1Wv5xelZNtuK+hwYmkEfJO3Hre1k+H07?= =?us-ascii?Q?8YyaYTVTE6xO34pI8aQ=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 8cd42464-8a6f-4b44-9591-08db2961b4bc X-MS-Exchange-CrossTenant-AuthSource: VI1PR0402MB3439.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Mar 2023 16:39:42.6068 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: f7a17af6-1c5c-4a36-aa8b-f5be247aa4ba X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: ucLPWKFTubXFKqgGksMpp8H7Di+4QgFrKfTDOpigk+d1mzpPlkzc+nQBVv3T/Aw1 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DU0PR04MB9274 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Move common codes into smaller inline functions and remove some argument handlings that are not actually used by either S32 MSCR register or generic config params. Signed-off-by: Chester Lin --- Changes in v2: - Drop unnecessary marcos and s32_pin_config() implemented in v1 and set/cl= ear mask/config values transparently. - Put pull-function related cases together in s32_pin_set_pull(). drivers/pinctrl/nxp/pinctrl-s32cc.c | 62 +++++++++++++++++------------ 1 file changed, 36 insertions(+), 26 deletions(-) diff --git a/drivers/pinctrl/nxp/pinctrl-s32cc.c b/drivers/pinctrl/nxp/pinc= trl-s32cc.c index f698e1a240ef..cb8a0844c0fa 100644 --- a/drivers/pinctrl/nxp/pinctrl-s32cc.c +++ b/drivers/pinctrl/nxp/pinctrl-s32cc.c @@ -474,11 +474,38 @@ static int s32_get_slew_regval(int arg) return -EINVAL; } =20 -static int s32_get_pin_conf(enum pin_config_param param, u32 arg, - unsigned int *mask, unsigned int *config) +static inline void s32_pin_set_pull(enum pin_config_param param, + unsigned int *mask, unsigned int *config) { + switch (param) { + case PIN_CONFIG_BIAS_DISABLE: + case PIN_CONFIG_BIAS_HIGH_IMPEDANCE: + *config &=3D ~(S32_MSCR_PUS | S32_MSCR_PUE); + break; + case PIN_CONFIG_BIAS_PULL_UP: + *config |=3D S32_MSCR_PUS | S32_MSCR_PUE; + break; + case PIN_CONFIG_BIAS_PULL_DOWN: + *config &=3D ~S32_MSCR_PUS; + *config |=3D S32_MSCR_PUE; + break; + default: + return; + } + + *mask |=3D S32_MSCR_PUS | S32_MSCR_PUE; +} + +static int s32_parse_pincfg(unsigned long pincfg, unsigned int *mask, + unsigned int *config) +{ + enum pin_config_param param; + u32 arg; int ret; =20 + param =3D pinconf_to_config_param(pincfg); + arg =3D pinconf_to_config_argument(pincfg); + switch (param) { /* All pins are persistent over suspend */ case PIN_CONFIG_PERSIST_STATE: @@ -488,17 +515,11 @@ static int s32_get_pin_conf(enum pin_config_param par= am, u32 arg, *mask |=3D S32_MSCR_ODE; break; case PIN_CONFIG_OUTPUT_ENABLE: - if (arg) - *config |=3D S32_MSCR_OBE; - else - *config &=3D ~S32_MSCR_OBE; + *config |=3D S32_MSCR_OBE; *mask |=3D S32_MSCR_OBE; break; case PIN_CONFIG_INPUT_ENABLE: - if (arg) - *config |=3D S32_MSCR_IBE; - else - *config &=3D ~S32_MSCR_IBE; + *config |=3D S32_MSCR_IBE; *mask |=3D S32_MSCR_IBE; break; case PIN_CONFIG_SLEW_RATE: @@ -509,25 +530,16 @@ static int s32_get_pin_conf(enum pin_config_param par= am, u32 arg, *mask |=3D S32_MSCR_SRE(~0); break; case PIN_CONFIG_BIAS_PULL_UP: - if (arg) - *config |=3D S32_MSCR_PUS; - else - *config &=3D ~S32_MSCR_PUS; - fallthrough; case PIN_CONFIG_BIAS_PULL_DOWN: - if (arg) - *config |=3D S32_MSCR_PUE; - else - *config &=3D ~S32_MSCR_PUE; - *mask |=3D S32_MSCR_PUE | S32_MSCR_PUS; + s32_pin_set_pull(param, mask, config); break; case PIN_CONFIG_BIAS_HIGH_IMPEDANCE: *config &=3D ~(S32_MSCR_ODE | S32_MSCR_OBE | S32_MSCR_IBE); *mask |=3D S32_MSCR_ODE | S32_MSCR_OBE | S32_MSCR_IBE; - fallthrough; + s32_pin_set_pull(param, mask, config); + break; case PIN_CONFIG_BIAS_DISABLE: - *config &=3D ~(S32_MSCR_PUS | S32_MSCR_PUE); - *mask |=3D S32_MSCR_PUS | S32_MSCR_PUE; + s32_pin_set_pull(param, mask, config); break; default: return -EOPNOTSUPP; @@ -553,9 +565,7 @@ static int s32_pinconf_mscr_update(struct pinctrl_dev *= pctldev, pin_get_name(pctldev, pin_id), num_configs); =20 for (i =3D 0; i < num_configs; i++) { - ret =3D s32_get_pin_conf(pinconf_to_config_param(configs[i]), - pinconf_to_config_argument(configs[i]), - &mask, &config); + ret =3D s32_parse_pincfg(configs[i], &mask, &config); if (ret) return ret; } --=20 2.37.3 From nobody Sun Feb 8 21:26:39 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 262DCC7618D for ; Mon, 20 Mar 2023 16:47:28 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231873AbjCTQr0 (ORCPT ); Mon, 20 Mar 2023 12:47:26 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37250 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232376AbjCTQqk (ORCPT ); Mon, 20 Mar 2023 12:46:40 -0400 Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-he1eur04on2082.outbound.protection.outlook.com [40.107.7.82]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DEC3634312; Mon, 20 Mar 2023 09:40:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=k0GX2W9OBshiJ9S3fwrAXKPE27hYuBNth5MIuLdEIzbQH0iywAduTmiC9sPyozk0D0Xmr7JGwHmywHd3CI+l27NgmqZBi4pm+43PW7fGfscQ7CtE6FAZaL5N6PsIAbMdsaPjV4LWDzP1hLwbUTYzwWqycO2huBVUD56P1NUrtBna5tIa477vVUq2j8NOolyvR3BwQzWvcc4rOFh7FDcK1VSuZ2Xfmwu5KIzTJzLhXXzgq+z2ma5mg1m4x7hOapmS8EuM3QDrv7cmMR1qEXefyHkTGVO1k7NC8cFGQzn5uQLuFF2VOh2fyNHBDrFdTwLwfL0IqxKUFIdFQSijbF6cgw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; 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=atEW99XphxxL5vQX+WSYX8HvoXtoyRlQitZt2ZVpS8o=; b=QWjo8tWI94a+1+5TTMFOAwm2Y4RNxT48bCy4Ui3xRNsn+k1W9yRjX77E0zY/t3BeBa10V0L+QwaVp47EhdmjzFS8o69AEOts6PnVEY5QAyqSvGGZk5nE8KoUyzGDF3RgAsfhXkBkbm63jYTaHU91lWT/SgZ76qZl9E9FiR/ITN3gFH96YZx8zKYLZ8OIRWTcEXA6WCjTENXh82+E337UOaDkg+JRMs5CPUrikKlctzvNwcN9UnhuqoLD0CCOKVC/PKFcZKqZ0Ko3knaIUsNGPexNoCwOB3dNsk8FBBbXeIpzfwD06GczRqcxslu0eZFYG0S1eN/VgjUOasgndCiW4Q== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=suse.com; dmarc=pass action=none header.from=suse.com; dkim=pass header.d=suse.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=atEW99XphxxL5vQX+WSYX8HvoXtoyRlQitZt2ZVpS8o=; b=e9WBtq/Tv33XYgJZbfOEAvv4HuHfvslrPcZAqQ0uZNicxx9+M2toW+7ZFFXpEKVGewGVqzyKtAzPZlKr5OwiwaMvEgNSfRIoXT7VZ7JqGzS/DwG0jZkwpld/ttZefZ+LKvJZ1vD0aTguRkHpKlXtugJlxpVCjT0Mu7ypopNql9YIuDcypsJj8dtpIhZrCUBugVWdF2zzIf1BDdj3lbczky0u/2AY7PUbU1YPBtlhHB9AI0PKMCXUKy66r2Mkhhg38jHR4A062BKk+P5XcrAxgJXEAR/5eVWcT0mw18vUDUPsDWxSZCE+QfQpnw1GmmYtxeCaIDwpYpRP0r2TNjcYiA== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=suse.com; Received: from VI1PR0402MB3439.eurprd04.prod.outlook.com (2603:10a6:803:4::13) by DU0PR04MB9274.eurprd04.prod.outlook.com (2603:10a6:10:355::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6178.37; Mon, 20 Mar 2023 16:39:52 +0000 Received: from VI1PR0402MB3439.eurprd04.prod.outlook.com ([fe80::6802:b2c3:5f12:8f9f]) by VI1PR0402MB3439.eurprd04.prod.outlook.com ([fe80::6802:b2c3:5f12:8f9f%2]) with mapi id 15.20.6178.037; Mon, 20 Mar 2023 16:39:52 +0000 From: Chester Lin To: Linus Walleij , Andy Shevchenko Cc: Chester Lin , NXP S32 Linux Team , linux-gpio@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Ghennadi Procopciuc , Andrei Stefanescu , Radu Pirea , =?UTF-8?q?Andreas=20F=C3=A4rber?= , Matthias Brugger Subject: [PATCH v2 4/4] pinctrl: s32cc: embed generic struct pingroup and pinfunction Date: Tue, 21 Mar 2023 00:38:23 +0800 Message-Id: <20230320163823.886-5-clin@suse.com> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20230320163823.886-1-clin@suse.com> References: <20230320163823.886-1-clin@suse.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: TYCP286CA0170.JPNP286.PROD.OUTLOOK.COM (2603:1096:400:3c6::11) To VI1PR0402MB3439.eurprd04.prod.outlook.com (2603:10a6:803:4::13) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: VI1PR0402MB3439:EE_|DU0PR04MB9274:EE_ X-MS-Office365-Filtering-Correlation-Id: f7f96ce3-b218-43ee-abc1-08db2961ba63 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 77FOf8IM0yiSvut8zmdQxGHN2j9Mx/Qox+rLB2GfOEovplZwBP9Hfnr/XAXrVKzSc8Ga0cqlyvG3Qr7hVohX8ybzS3Yvk2LQtSbbimX8JBMETj+hxzR0ipLSqODh254r8Zqb4Kh5YTnFRh+vkN7mGyeqZocWDT/ijpWXZawKjZWIM5AXBu5CJDqy2mlerCkgH42Cwh7mgM9xJ+cMxdlcoBjdeOLOA62s/kGOl4ib1p+N4j4vPF1uKw0DCbUImZG4GFm6RCwwzdm4hIVSKoeRdmKDAcKESMgQwvh/XK3OmUUTYzu2rE2ZOi1HUQ8zeGKwdLRBw6Gysx7tH5vZ7n188Tkdx46igLrTys0IyI7oUa3sIdIXJqht4Iuo3r78wRXuSDkFmLN/4XHkCL+NcV2gCesUheWlh7pHkjNwNM6RsBJYLkAWNAULtPUq5zNgBYtfpvjdRSjkw2/GMHUgdWSwAC+5WhUXl2ypqgJgDYgyfbLp8NW0dpj0EdBQjGgNc4e3tDaRtcBC3t6e/eJlDqfaExJ3QJyJLRHP901RkpvwBY1ASYCgGTYP+8BV6nepJ/IKPioMBsu6OblFmjadpO9+nKVegB3mQPjny6tB8Wt+fZlFwkfn4FeDNn/v2RGVOPAV1sMFpGMDL5ZbiPsY1CcQI0ZMqncqPB1Pseo4+IIVof1t5lkqSqNa+uxviPV+0nCp X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:VI1PR0402MB3439.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230025)(366004)(396003)(136003)(346002)(39860400002)(376002)(451199018)(8936002)(5660300002)(7416002)(86362001)(38100700002)(2906002)(36756003)(4326008)(6486002)(83380400001)(478600001)(6666004)(107886003)(41300700001)(2616005)(186003)(1076003)(6512007)(26005)(6506007)(54906003)(110136005)(316002)(8676002)(66556008)(66476007)(66946007)(41533002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?wjkYSf/hoCrvvwt9/spwqkRP7U4PAZgnoQZwrT8+Brb4DBc05mlKReWmxe7R?= =?us-ascii?Q?S7SDg4T/2UjgjnyvKShGlVxxdwrPpNFwAujSxUXWgTw/jKgB3rqj4b8uxzMO?= =?us-ascii?Q?AJQpV8xxBNtUE4S6xp2cQ/ACgffxp5+N5vMX1hLK+zISORJFAu8cQwoADbm+?= =?us-ascii?Q?Elqs+nv0RvQanIGTmn0JkR/ubM90lV8izN4yTc7w/veLumihkJk0MbHyh1ea?= =?us-ascii?Q?69NzP7GyRt955ZgALZMy5ptIeu+CthefuC0PqSLRteJU6DxkG38wZKIVd3Sc?= =?us-ascii?Q?ShhnpVJQH2y2D/ZARVRHaSqrQMJR5cNMsb+x8QTNJ2o1w0vjkXX44yqgM/U5?= =?us-ascii?Q?xjsuyC4WmD2A7KuDaqyJT4RE0q4vnJSnDnneA8WACnd07/eTPVLK4R9yka4G?= =?us-ascii?Q?oF8OZu3Sdv32tryGBqcKcAuVykkdBzYD0eeT5muDyE/bo/fJY7bLunDFXewl?= =?us-ascii?Q?Ujxy232i7gZdGQEV1kqoEpM5SbfgG/nzc27TZ+XenZDfUkv+u2QoRXnm/I2k?= =?us-ascii?Q?IH6EJMEhhtjlWtG5thyXoIg/6dnUEr2UX5wO6bzuDyqt6KEaQut6NaAaqjZ7?= =?us-ascii?Q?BvhQJBUt3uSSyuMJKnyuEKERTKYnfBlkSgEK56BB+NDNTMfk0C9CNdiP7o39?= =?us-ascii?Q?Rs/KDGKo/TzSdO/zdhQNm5gAOx5C1URsulyebpsOolFrASFn3oSt6ubuOXtz?= =?us-ascii?Q?MzYJ96BYks/VZwlLThTNEjzt/fgFXXfnw75wIMeJm1LPnHsbt9wGQN0kRwBn?= =?us-ascii?Q?THhFCIsKwbx1/jo89RgS1EnhWBxGdEi/Uokld3pq3IUAEGHLlJDGqfoSATmO?= =?us-ascii?Q?bjgj2NOmOUNCzZkvMnKnp/Q0riToVn1d04sLOJlKCpqhuirv0J7TjflchDXC?= =?us-ascii?Q?XZE/9CyqNWL7UindwpuT3rJNTVjlVy1vB/gwyv2dQmE8niMPJJvEJGxOfXcH?= =?us-ascii?Q?kNFCoUcx8e7FE63/WkV7gAnLOc+HAtRb5WObAh4HtZpf7StB/coMZxvCQh3o?= =?us-ascii?Q?ogdhmQAVyWdDrF+hRwEKvjwGECwbjWNTp5yfVZIWeKV322Sg22d6G24pqTNM?= =?us-ascii?Q?lAPZEr6wXt6fzeb84oQ65KhuEFlcZb+KXAyMFRozYGiZ46nLddhQMbQbs+WZ?= =?us-ascii?Q?8ZKg7gCXyRPE701UU9d4vGZamXwIj0ejU2Awzn7+aVfjGLN5qXD/LeV1+soT?= =?us-ascii?Q?cNu0/HmCMaBFbeXsDZljLzHC4bbAXey1x2vsumbskgnoiH14ycL43iqK39lS?= =?us-ascii?Q?gEOy7031UdAh5xnnhA8B9N3AHkFBFXyAh/sxC3LkOJwHZb7om8fiQZP7Nvd9?= =?us-ascii?Q?5sKxsjDY26WflTZsFASHUvpiTtjW+wkmQ7AeeLbSNFU73z4Tv6T7Apa8/4I3?= =?us-ascii?Q?x1OAdVyFdRZtFToh7bcGhvyfs8p4Eiindfq1v3NOigeL8pUHc5mcm1oywjW2?= =?us-ascii?Q?9/+kssytyI+8lFe8w9WowMcRXlTEQu54SHm5RDDSXLRymKEhGhaYWdl7pbSy?= =?us-ascii?Q?pMJ0ZRBJzmzx13alMCtVJfqcqj0yJ2Zbaw9hbOJNwOKNCjriwHpGjIFIwPsD?= =?us-ascii?Q?8aMCAUP/ijAsOO1mHS8=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: f7f96ce3-b218-43ee-abc1-08db2961ba63 X-MS-Exchange-CrossTenant-AuthSource: VI1PR0402MB3439.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Mar 2023 16:39:52.0436 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: f7a17af6-1c5c-4a36-aa8b-f5be247aa4ba X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: u1iXnwv0VGmODT/6D3YvSBfZo4hLUDGOZQXoaD9/pyFnttlljifflIXFcw8PKZ4e X-MS-Exchange-Transport-CrossTenantHeadersStamped: DU0PR04MB9274 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Use generic data structure to describe pin control functions and groups in S32 SoC family and drop duplicated struct members. Signed-off-by: Chester Lin Reviewed-by: Andy Shevchenko --- Changes in v2: - Simply use generic 'struct pinfunction' rather than having extra 'struct s32_pmx_func'. drivers/pinctrl/nxp/pinctrl-s32.h | 26 ++-------- drivers/pinctrl/nxp/pinctrl-s32cc.c | 76 +++++++++++++++-------------- 2 files changed, 45 insertions(+), 57 deletions(-) diff --git a/drivers/pinctrl/nxp/pinctrl-s32.h b/drivers/pinctrl/nxp/pinctr= l-s32.h index 545bf16b988d..2f7aecd462e4 100644 --- a/drivers/pinctrl/nxp/pinctrl-s32.h +++ b/drivers/pinctrl/nxp/pinctrl-s32.h @@ -15,31 +15,15 @@ struct platform_device; =20 /** * struct s32_pin_group - describes an S32 pin group - * @name: the name of this specific pin group - * @npins: the number of pins in this group array, i.e. the number of - * elements in pin_ids and pin_sss so we can iterate over that arr= ay - * @pin_ids: an array of pin IDs in this group - * @pin_sss: an array of source signal select configs paired with pin_ids + * @data: generic data describes group name, number of pins, and a pin arr= ay in + this group. + * @pin_sss: an array of source signal select configs paired with pin arra= y. */ struct s32_pin_group { - const char *name; - unsigned int npins; - unsigned int *pin_ids; + struct pingroup data; unsigned int *pin_sss; }; =20 -/** - * struct s32_pmx_func - describes S32 pinmux functions - * @name: the name of this specific function - * @groups: corresponding pin groups - * @num_groups: the number of groups - */ -struct s32_pmx_func { - const char *name; - const char **groups; - unsigned int num_groups; -}; - /** * struct s32_pin_range - pin ID range for each memory region. * @start: start pin ID @@ -56,7 +40,7 @@ struct s32_pinctrl_soc_info { unsigned int npins; struct s32_pin_group *groups; unsigned int ngroups; - struct s32_pmx_func *functions; + struct pinfunction *functions; unsigned int nfunctions; unsigned int grp_index; const struct s32_pin_range *mem_pin_ranges; diff --git a/drivers/pinctrl/nxp/pinctrl-s32cc.c b/drivers/pinctrl/nxp/pinc= trl-s32cc.c index cb8a0844c0fa..4ed0cc905232 100644 --- a/drivers/pinctrl/nxp/pinctrl-s32cc.c +++ b/drivers/pinctrl/nxp/pinctrl-s32cc.c @@ -188,7 +188,7 @@ static const char *s32_get_group_name(struct pinctrl_de= v *pctldev, struct s32_pinctrl *ipctl =3D pinctrl_dev_get_drvdata(pctldev); const struct s32_pinctrl_soc_info *info =3D ipctl->info; =20 - return info->groups[selector].name; + return info->groups[selector].data.name; } =20 static int s32_get_group_pins(struct pinctrl_dev *pctldev, @@ -198,8 +198,8 @@ static int s32_get_group_pins(struct pinctrl_dev *pctld= ev, struct s32_pinctrl *ipctl =3D pinctrl_dev_get_drvdata(pctldev); const struct s32_pinctrl_soc_info *info =3D ipctl->info; =20 - *pins =3D info->groups[selector].pin_ids; - *npins =3D info->groups[selector].npins; + *pins =3D info->groups[selector].data.pins; + *npins =3D info->groups[selector].data.npins; =20 return 0; } @@ -314,23 +314,23 @@ static int s32_pmx_set(struct pinctrl_dev *pctldev, u= nsigned int selector, grp =3D &info->groups[group]; =20 dev_dbg(ipctl->dev, "set mux for function %s group %s\n", - info->functions[selector].name, grp->name); + info->functions[selector].name, grp->data.name); =20 /* Check beforehand so we don't have a partial config. */ - for (i =3D 0; i < grp->npins; i++) { - if (s32_check_pin(pctldev, grp->pin_ids[i]) !=3D 0) { + for (i =3D 0; i < grp->data.npins; i++) { + if (s32_check_pin(pctldev, grp->data.pins[i]) !=3D 0) { dev_err(info->dev, "invalid pin: %u in group: %u\n", - grp->pin_ids[i], group); + grp->data.pins[i], group); return -EINVAL; } } =20 - for (i =3D 0, ret =3D 0; i < grp->npins && !ret; i++) { - ret =3D s32_regmap_update(pctldev, grp->pin_ids[i], + for (i =3D 0, ret =3D 0; i < grp->data.npins && !ret; i++) { + ret =3D s32_regmap_update(pctldev, grp->data.pins[i], S32_MSCR_SSS_MASK, grp->pin_sss[i]); if (ret) { dev_err(info->dev, "Failed to set pin %u\n", - grp->pin_ids[i]); + grp->data.pins[i]); return ret; } } @@ -364,7 +364,7 @@ static int s32_pmx_get_groups(struct pinctrl_dev *pctld= ev, const struct s32_pinctrl_soc_info *info =3D ipctl->info; =20 *groups =3D info->functions[selector].groups; - *num_groups =3D info->functions[selector].num_groups; + *num_groups =3D info->functions[selector].ngroups; =20 return 0; } @@ -602,8 +602,8 @@ static int s32_pconf_group_set(struct pinctrl_dev *pctl= dev, unsigned int selecto int i, ret; =20 grp =3D &info->groups[selector]; - for (i =3D 0; i < grp->npins; i++) { - ret =3D s32_pinconf_mscr_update(pctldev, grp->pin_ids[i], + for (i =3D 0; i < grp->data.npins; i++) { + ret =3D s32_pinconf_mscr_update(pctldev, grp->data.pins[i], configs, num_configs); if (ret) return ret; @@ -637,9 +637,9 @@ static void s32_pinconf_group_dbg_show(struct pinctrl_d= ev *pctldev, =20 seq_puts(s, "\n"); grp =3D &info->groups[selector]; - for (i =3D 0; i < grp->npins; i++) { - name =3D pin_get_name(pctldev, grp->pin_ids[i]); - ret =3D s32_regmap_read(pctldev, grp->pin_ids[i], &config); + for (i =3D 0; i < grp->data.npins; i++) { + name =3D pin_get_name(pctldev, grp->data.pins[i]); + ret =3D s32_regmap_read(pctldev, grp->data.pins[i], &config); if (ret) return; seq_printf(s, "%s: 0x%x\n", name, config); @@ -732,6 +732,7 @@ static int s32_pinctrl_parse_groups(struct device_node = *np, const __be32 *p; struct device *dev; struct property *prop; + unsigned int *pins, *sss; int i, npins; u32 pinmux; =20 @@ -740,38 +741,38 @@ static int s32_pinctrl_parse_groups(struct device_nod= e *np, dev_dbg(dev, "group: %pOFn\n", np); =20 /* Initialise group */ - grp->name =3D np->name; + grp->data.name =3D np->name; =20 npins =3D of_property_count_elems_of_size(np, "pinmux", sizeof(u32)); if (npins < 0) { dev_err(dev, "Failed to read 'pinmux' property in node %s.\n", - grp->name); + grp->data.name); return -EINVAL; } if (!npins) { - dev_err(dev, "The group %s has no pins.\n", grp->name); + dev_err(dev, "The group %s has no pins.\n", grp->data.name); return -EINVAL; } =20 - grp->npins =3D npins; + grp->data.npins =3D npins; =20 - grp->pin_ids =3D devm_kcalloc(info->dev, grp->npins, - sizeof(unsigned int), GFP_KERNEL); - grp->pin_sss =3D devm_kcalloc(info->dev, grp->npins, - sizeof(unsigned int), GFP_KERNEL); - if (!grp->pin_ids || !grp->pin_sss) + pins =3D devm_kcalloc(info->dev, npins, sizeof(*pins), GFP_KERNEL); + sss =3D devm_kcalloc(info->dev, npins, sizeof(*sss), GFP_KERNEL); + if (!pins || !sss) return -ENOMEM; =20 i =3D 0; of_property_for_each_u32(np, "pinmux", prop, p, pinmux) { - grp->pin_ids[i] =3D get_pin_no(pinmux); - grp->pin_sss[i] =3D get_pin_func(pinmux); + pins[i] =3D get_pin_no(pinmux); + sss[i] =3D get_pin_func(pinmux); =20 - dev_dbg(info->dev, "pin-id: 0x%x, sss: 0x%x", - grp->pin_ids[i], grp->pin_sss[i]); + dev_dbg(info->dev, "pin: 0x%x, sss: 0x%x", pins[i], sss[i]); i++; } =20 + grp->data.pins =3D pins; + grp->pin_sss =3D sss; + return 0; } =20 @@ -780,8 +781,9 @@ static int s32_pinctrl_parse_functions(struct device_no= de *np, u32 index) { struct device_node *child; - struct s32_pmx_func *func; + struct pinfunction *func; struct s32_pin_group *grp; + char **groups; u32 i =3D 0; int ret =3D 0; =20 @@ -791,18 +793,18 @@ static int s32_pinctrl_parse_functions(struct device_= node *np, =20 /* Initialise function */ func->name =3D np->name; - func->num_groups =3D of_get_child_count(np); - if (func->num_groups =3D=3D 0) { + func->ngroups =3D of_get_child_count(np); + if (func->ngroups =3D=3D 0) { dev_err(info->dev, "no groups defined in %pOF\n", np); return -EINVAL; } - func->groups =3D devm_kcalloc(info->dev, func->num_groups, - sizeof(*func->groups), GFP_KERNEL); - if (!func->groups) + groups =3D devm_kcalloc(info->dev, func->ngroups, + sizeof(*func->groups), GFP_KERNEL); + if (!groups) return -ENOMEM; =20 for_each_child_of_node(np, child) { - func->groups[i] =3D child->name; + groups[i] =3D (char *)child->name; grp =3D &info->groups[info->grp_index++]; ret =3D s32_pinctrl_parse_groups(child, grp, info); if (ret) @@ -810,6 +812,8 @@ static int s32_pinctrl_parse_functions(struct device_no= de *np, i++; } =20 + func->groups =3D (const char **)groups; + return 0; } =20 --=20 2.37.3