From patchwork Wed Apr 23 06:11:38 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bough Chen X-Patchwork-Id: 884283 Received: from DB3PR0202CU003.outbound.protection.outlook.com (mail-northeuropeazon11011067.outbound.protection.outlook.com [52.101.65.67]) (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 0F4EF266592; Wed, 23 Apr 2025 06:10:31 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.65.67 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745388633; cv=fail; b=fkAc7CYIg0xBp3h9+N3k0JNTjBMItGaxdCKv4m3jGsY1AqZm3lbkjpxrsAob2Otpn/cpORYlQytPnWhvo2yKx/mU97UkpuHT2HJe7EgxlwBkhSYBDICz76Z+Rpe67+99MyHl+EamQj+1qtOsw/RX11ce/Evx7l9z3EB7QCoYCz0= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745388633; c=relaxed/simple; bh=R+E0blCnr84VOgWVUzaNmlI5G0tHD3+mnj0wlyBAGLc=; h=From:Date:Subject:Content-Type:Message-Id:References:In-Reply-To: To:Cc:MIME-Version; b=b9/7yS6Q3YuAQN4colG8FcUG9R50uhintfZn/ZUNxTNn3SCWYjCe0QlMWmPHe3yIvISiWBl/ETT8gXUBDV/hyvYp+h3Vz+9WiJUdlfsje0dnusdwmcPmMNweMGkex1tKF9mH93QO9KbFqNjjGJFT7/GvgpZeGv8gd5Gud1E12zs= 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=P9agtV0X; arc=fail smtp.client-ip=52.101.65.67 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="P9agtV0X" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=fa/t43VL5ad01SkXpKzwxi/tgKGHYtR3zHREALLui495Owpa/72uVhSqXDIQDiu6kw0AdMN9+oL5hbNaQlNu9FFdvahMQUFsvEwAWrcfacke9lUmcd5F9OHwJeVFMwXdSY3XL4XW1lAGuRBRFCusbMtg4eSFdFJwvJuKUduNYe5Lr0oeGkHvzSDquntHVx6M0kNPkvMRn1T0dSVJLFm/DCA5I076MYzZAMMV9jVvMqzWRvIrRR5hCh8EGeL/gQFcIePMDhINT8WxQ6K5EssYDRArjqphBjW5CuOhFS43GOOOPPs7E9t7rLCMPJyhJgmxIHC0a+UoDwjPZp/anFLPPw== 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=rkoc45T7BYUh7B6StD6VS++pbiV1SAITGBvZZWupjxI=; b=Y02S8rlBWBWd96JNvkoWJWtkEdKZMHmyH/xAaK13cS3T/oon19+KVhuh8T6nMiZHEktCAEpYB/ul1QiR37lL3tBIEUEUQFZmi1f5PGQjO5buEt98AXv1HuXz4J/6s/KTNPExtG7gCLrxwqp1OowzDxIbIg0sHLghvDW6b0x7HAQdiXCnZcbZ+YuB2pLiZu8JNpdKLVa8Rg+M7MpP2AaG9CiyziosjDyez5ktp2ypl4EhjKCZAdvl5dtHVd60QmPYryWbUF8Ysq8JchZxwdtewoXwf51QpLPSD0Ty+O0CeJyklRe6xiTCwQwVeDyuwaf/gVadBlXTapoBMRtU/+DIgQ== 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=rkoc45T7BYUh7B6StD6VS++pbiV1SAITGBvZZWupjxI=; b=P9agtV0XxQ9S5sKMD8qLqLze43aAhSNVtmp/+uCgFbJqs9gt3ZRY9LmWd2nJd5I6Xrxmlb6l2GT51zKfmOjqrPQsWVQYKOggiNXW9H6y15s2A+uh8UbnGJ16xjQ57nGOBmj5veqm+t0LuW9Ut3kaCegMBRO8GM2h5yLE/x6lMlzqWNe750N9K+o7UPbT4XkXa3xSwcMd3OoPg/IOfd/jFV+75yOn1RdMBnpnD7VVUI4ENsZ4YG7YBMOfRhtDkMzq9X2NCkQBXJTFwuOj4UFf4ucLW0HDO51m1d4uzD7177ftM/UGct3RdG26fsbkNTx9m1WDNwbc91p76tLQCEk/BQ== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nxp.com; Received: from DU0PR04MB9496.eurprd04.prod.outlook.com (2603:10a6:10:32d::19) by PAXPR04MB8734.eurprd04.prod.outlook.com (2603:10a6:102:21e::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8655.35; Wed, 23 Apr 2025 06:10:28 +0000 Received: from DU0PR04MB9496.eurprd04.prod.outlook.com ([fe80::4fa3:7420:14ed:5334]) by DU0PR04MB9496.eurprd04.prod.outlook.com ([fe80::4fa3:7420:14ed:5334%5]) with mapi id 15.20.8655.033; Wed, 23 Apr 2025 06:10:27 +0000 From: Haibo Chen Date: Wed, 23 Apr 2025 14:11:38 +0800 Subject: [PATCH v1 1/5] spi: spi-nxp-fspi: remove the goto in probe Message-Id: <20250423-flexspipatch-v1-1-292e530509d3@nxp.com> References: <20250423-flexspipatch-v1-0-292e530509d3@nxp.com> In-Reply-To: <20250423-flexspipatch-v1-0-292e530509d3@nxp.com> To: Haibo Chen , Han Xu , Yogesh Gaur , Mark Brown Cc: linux-spi@vger.kernel.org, imx@lists.linux.dev, linux-kernel@vger.kernel.org X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1745388747; l=4520; i=haibo.chen@nxp.com; s=20250421; h=from:subject:message-id; bh=R+E0blCnr84VOgWVUzaNmlI5G0tHD3+mnj0wlyBAGLc=; b=QD7wQJRRqPHqXnIMDoMZ+QFi5bqroDqpQ1Li+UzTf+Mpxvr+07BEzhaadK9WMKOVz3iKk7++T NBNxO8+sPpDBoXtSXvvyXP6K4faAXp0wFMcwHnLBrMm6/EI/Z6Hb3sd X-Developer-Key: i=haibo.chen@nxp.com; a=ed25519; pk=HR9LLTuVOg3BUNeAf4/FNOIkMaZvuwVJdNrGpvKDKaI= X-ClientProxiedBy: SI2PR04CA0007.apcprd04.prod.outlook.com (2603:1096:4:197::19) To DU0PR04MB9496.eurprd04.prod.outlook.com (2603:10a6:10:32d::19) Precedence: bulk X-Mailing-List: linux-spi@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DU0PR04MB9496:EE_|PAXPR04MB8734:EE_ X-MS-Office365-Filtering-Correlation-Id: 975c4043-8f28-4678-8658-08dd822d8b19 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|52116014|376014|1800799024|366016|38350700014; X-Microsoft-Antispam-Message-Info: =?utf-8?q?m0gRnfccbwnwFdWi6GQxbjgBQItqY36?= =?utf-8?q?AqMzZGofqYtk2FKHk6pRMet9GcQH+U+8z5ZCWTwm2h8efDls13za5P5sAfTuyn2vc?= =?utf-8?q?t0P0rcsUwtmAiyW2+dw88Au8Qe8od/bFAZDH3ponejDYgQerCvrohiKp7IgUbqElj?= =?utf-8?q?GaqNofUNlKm6aT/7e8FYlDsrddylX9cteGdOvtKkrFfw30eRCvIPhH6Jmu3ky9aGl?= =?utf-8?q?UhbC+faoRuErmwLtsCmKL044Y36WyvTaRu3z17xMXeLdnui8sY/3ahh4XQKytFQKE?= =?utf-8?q?qdOumu9cuNva/K5hL5OxKIIN9Mx8YP+KPgeOxxxAlKhxXZiR56xOkzfZPSXqQnDrh?= =?utf-8?q?IeMRcKfZ32oWGdu2N6p56kwyqkrAaymwBbOt0jJiyREJCIYC3yLevIs3MH6MByBxV?= =?utf-8?q?KDOjsyrWn8AVd13tJn4TBIAazziF5SBK6uXub/nts670nA8OtADJv20+umPzeFfXz?= =?utf-8?q?zRbvMyGi3MtnPoZuqwLbr/JJ84wCiK/6//DvXR6swnNw4uUCsKlgy+uLvDRlhGBx6?= =?utf-8?q?ZnufSDS/o7dgp5TJ0adEZ0f23H2975p62YOE/iajpAurKjURdqyhyrjH3MBnYFYKm?= =?utf-8?q?l4FZEXPY4iHqTOzF/9yjGxwnOVLyp7enh/4EOf+rLORCResxQlcP7gDMhYjTaQrro?= =?utf-8?q?emUnBLxxJvz0ecG5mixSfRppcoGkn/kcaD3h89V7bT2le49DT5T7iKsGswk1CzNPf?= =?utf-8?q?9Xa5WJ+bYdcqaHz3sFtqXlXUINZP3ph/QkZdlUcHt/COiSz1SLCfMrtdy0OpSVcGs?= =?utf-8?q?awxYOXfiiF0SAG6Tn3EZr8r/dow05FxQVwmwADqyU4SkWFUgmQ2FBXu8JE40clCBF?= =?utf-8?q?wgAG7NWQ3IM3MDvubYH1IrUic2xxwCR2PnZMFw9y0CVkb6/Hjv0P20X7ujxzf/2dd?= =?utf-8?q?MnCjqBZq89Kt/72zU3MnIQAnIgZJcOJu3HeZQUJMJVcVxj2SL6+CH2r+cXnRUvJtb?= =?utf-8?q?1r+yTPQKNSwNVVr4iC3II7qkkHUnDURbMk0PBb34P4W0HbVqcCjhR3r2dwG7V/ZVO?= =?utf-8?q?bD2iCGAkwPDh4XjhzNz1pCJLV1KYZwVuupqGJ8HovUWau1sY/dkaCOqvbEIzNPaBj?= =?utf-8?q?ZXfLkjD7PP7l7bYgZUNbCe9Q6qDI/FskfhyUMQc3vK3sN22t7VgA2m3E+vfieElBX?= =?utf-8?q?0nBrcRfegf5Hc39tOxvuhXlw9TJk1w42kabPwjGEKtw75D1I7hhNJB9oIsNzIjPkY?= =?utf-8?q?Lr8X+4KLyC5wlTWD4YzNCVYNnDoHRq9H5NQy7f63uhyccCoSryHlZ4yWKdcRkXoGF?= =?utf-8?q?N+Uc9ICbq9fHR4oOtBeKUvj7wVXgxpYrTVleT+qW1KWwpg8z+RcNEHEL8q3dGTZ82?= =?utf-8?q?+ggn21cf4f37Kp23Ohu7327ZC1AuDtCwfg1O10FiLaKlV473fEPyblqjG0IJ+aZyO?= =?utf-8?q?gsh/H2AgI0sAEARbn/C3HXa1/R/+l79kk0q/yMoXvOmvVwbgcXn/II=3D?= X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DU0PR04MB9496.eurprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230040)(52116014)(376014)(1800799024)(366016)(38350700014); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?M/RBQHndMXgU5ae0i4U9DAvhqkfT?= =?utf-8?q?U3zuajaFQw6y2pwgyXEDRDV2Onm4st8RewDkjr/N9a2cbQ3+JXiEByp6RLxAxtBHw?= =?utf-8?q?HfZKMQsQC1cXiRBigsyp6mzSVRVBteavVbgdGhWRID454QxM7rXuEuLpsKcbN73wt?= =?utf-8?q?RuQfWw7A2FjnE8LmdqNczzADc8YqTgsWYu/5PXKd+1TQyakScekpbTuJZsTji/h/0?= =?utf-8?q?rpRXue8now2vy6h+iXBrOZZ0Vuz9WLIrXOAHvrsJEijIPRPNlUd1Mxf3trT8wrhXG?= =?utf-8?q?o4lnAUXQjWIyxSb3zQL5OxrpFqL4wreGx6ak73OxY9wmbMI1T3pjE+irpjzXWivtU?= =?utf-8?q?a1/qFhl3WoWQgGDDtXtfHfwQO/3a1gHHvzm5MNr511OLroVp6DX4oxhgnAyVA/Mep?= =?utf-8?q?UooSYchs/vfLAB/XgFw+rqCOi2N5j00LDWjradRgdpbr1kibsSVbnMKQAqVX533on?= =?utf-8?q?kt+fC1qEtlAOGGwVIcScPm56S4xvRkO9WPV41FY2vbGcjfPCVRwveWFZiNugLicFk?= =?utf-8?q?qGDfJUkAx6Q+FY+8TXhrcSNpCuAdmOtQS6vcl50HIqQtiYAWAOV97PuccOKojus+0?= =?utf-8?q?o86bJR7peY3svqEK4odFGzlVWGHLaRJTR2AJZFt3n8fW4+qLb4jwY4vMJvEr6sDu7?= =?utf-8?q?h5O9LTmVdsG6DSPH0sqbW2gasHkgW2Xobekabl0hqAItNjLfICxRZL6MUe0kWbJbg?= =?utf-8?q?cbgB3ySTKXgiN7FPrUNwLYiWdFlA/guNngpZfRuNvcKwvJZ5qIwuYMqxz3FfsHddn?= =?utf-8?q?H+bsX1zoD80GdXM9mp65ee5PPnbesQvAmdd7R9biCpaO9u8Lm+WTlm9k6IYXBMiir?= =?utf-8?q?sFNhT0JPF3T82RTf1LE33ytYYk1hDVd7b0+/Cz8xvVXcwgV8kFFCpejpCurgzdMZ1?= =?utf-8?q?85j1MTw8QPNz67+nCtPiQZXZPWNUsbWj0y+ZPxSOdHzWf9dAG5DPQjjvOldoxzfcv?= =?utf-8?q?kidNU5TFyVBHby04BJ5K86RhejTP17CV1wW7J/LvXMg/i3xdNTf5UafV+eNqzGcjr?= =?utf-8?q?zOENt3NKM8a3cjfhTRbFfoKWrSI9HkRwRuNuoHY3CiD43E6Rs1Yuib6q/XQGv1/ct?= =?utf-8?q?yfNF3gjTuHMAUx5wyadz5+7CeFRiicoKcysSqrM3pVR7KCEweDpGUN3tltqQ+swyC?= =?utf-8?q?bo1U5VKTTgl2yEwY2SqSnvA8bd+r9X8raH4FojIxpbkRfQax0+leyEAqWRr/lKVoT?= =?utf-8?q?AEXjuf3ZMqIRRmXOI4c/SLQCF2g73NZwBlHV18zhsL+u61ZCJlenQuE5Rlxg6I8Wn?= =?utf-8?q?psIrx5kjFFJP6z68uy+PvODk3P6QsPQCcUPxnxW87SszQwrRIsWd3Pclab823Cz5t?= =?utf-8?q?MBNupNe06KO75nB8vounDHomZvns3BhLvPa29iHLmNwfpKJuBOum+CDm0og4mJQXe?= =?utf-8?q?dlkuXyxzyRyH9wa50gkd6ysW285r8+S7nljR29QIybNU2XHfqfN5rq+YaQ1seDaad?= =?utf-8?q?7Td7ndAUf+R7V8fOVIGUUe07cdDA1c9yuxLwgRiXW6HG4dgBlWVPc6JMZPpgEym6A?= =?utf-8?q?APGqCabkjg1D?= X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 975c4043-8f28-4678-8658-08dd822d8b19 X-MS-Exchange-CrossTenant-AuthSource: DU0PR04MB9496.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Apr 2025 06:10:27.8040 (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: KpAkhPblBrz494UB9Vz/BdHcbGXn4c9cRt1X0+++of8oDstkPBsIhy9d9ROAlKWvkzSStKBfeQWG15p7FD6sDw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PAXPR04MB8734 Remove all the goto in probe to simplify the driver. Signed-off-by: Haibo Chen --- drivers/spi/spi-nxp-fspi.c | 87 ++++++++++++++-------------------------------- 1 file changed, 27 insertions(+), 60 deletions(-) diff --git a/drivers/spi/spi-nxp-fspi.c b/drivers/spi/spi-nxp-fspi.c index bad6b30bab0ecb90d0aaf603b6de5bc834d19de6..00da184be88a026bf562c9808e18e2335a0959e9 100644 --- a/drivers/spi/spi-nxp-fspi.c +++ b/drivers/spi/spi-nxp-fspi.c @@ -1161,10 +1161,10 @@ static int nxp_fspi_probe(struct platform_device *pdev) struct device_node *np = dev->of_node; struct resource *res; struct nxp_fspi *f; - int ret; + int ret, irq; u32 reg; - ctlr = spi_alloc_host(&pdev->dev, sizeof(*f)); + ctlr = devm_spi_alloc_host(&pdev->dev, sizeof(*f)); if (!ctlr) return -ENOMEM; @@ -1174,10 +1174,8 @@ static int nxp_fspi_probe(struct platform_device *pdev) f = spi_controller_get_devdata(ctlr); f->dev = dev; f->devtype_data = (struct nxp_fspi_devtype_data *)device_get_match_data(dev); - if (!f->devtype_data) { - ret = -ENODEV; - goto err_put_ctrl; - } + if (!f->devtype_data) + return -ENODEV; platform_set_drvdata(pdev, f); @@ -1186,11 +1184,8 @@ static int nxp_fspi_probe(struct platform_device *pdev) f->iobase = devm_platform_ioremap_resource(pdev, 0); else f->iobase = devm_platform_ioremap_resource_byname(pdev, "fspi_base"); - - if (IS_ERR(f->iobase)) { - ret = PTR_ERR(f->iobase); - goto err_put_ctrl; - } + if (IS_ERR(f->iobase)) + return PTR_ERR(f->iobase); /* find the resources - controller memory mapped space */ if (is_acpi_node(dev_fwnode(f->dev))) @@ -1198,11 +1193,8 @@ static int nxp_fspi_probe(struct platform_device *pdev) else res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "fspi_mmap"); - - if (!res) { - ret = -ENODEV; - goto err_put_ctrl; - } + if (!res) + return -ENODEV; /* assign memory mapped starting address and mapped size. */ f->memmap_phy = res->start; @@ -1211,69 +1203,46 @@ static int nxp_fspi_probe(struct platform_device *pdev) /* find the clocks */ if (dev_of_node(&pdev->dev)) { f->clk_en = devm_clk_get(dev, "fspi_en"); - if (IS_ERR(f->clk_en)) { - ret = PTR_ERR(f->clk_en); - goto err_put_ctrl; - } + if (IS_ERR(f->clk_en)) + return PTR_ERR(f->clk_en); f->clk = devm_clk_get(dev, "fspi"); - if (IS_ERR(f->clk)) { - ret = PTR_ERR(f->clk); - goto err_put_ctrl; - } - - ret = nxp_fspi_clk_prep_enable(f); - if (ret) { - dev_err(dev, "can not enable the clock\n"); - goto err_put_ctrl; - } + if (IS_ERR(f->clk)) + return PTR_ERR(f->clk); } + /* find the irq */ + irq = platform_get_irq(pdev, 0); + if (irq < 0) + return dev_err_probe(dev, irq, "Failed to get irq source"); + + ret = nxp_fspi_clk_prep_enable(f); + if (ret) + return dev_err_probe(dev, ret, "Can't enable the clock\n"); + /* Clear potential interrupts */ reg = fspi_readl(f, f->iobase + FSPI_INTR); if (reg) fspi_writel(f, reg, f->iobase + FSPI_INTR); - /* find the irq */ - ret = platform_get_irq(pdev, 0); - if (ret < 0) - goto err_disable_clk; + nxp_fspi_default_setup(f); - ret = devm_request_irq(dev, ret, + ret = devm_request_irq(dev, irq, nxp_fspi_irq_handler, 0, pdev->name, f); if (ret) { - dev_err(dev, "failed to request irq: %d\n", ret); - goto err_disable_clk; + nxp_fspi_clk_disable_unprep(f); + return dev_err_probe(dev, ret, "Failed to request irq\n"); } - mutex_init(&f->lock); + devm_mutex_init(dev, &f->lock); ctlr->bus_num = -1; ctlr->num_chipselect = NXP_FSPI_MAX_CHIPSELECT; ctlr->mem_ops = &nxp_fspi_mem_ops; ctlr->mem_caps = &nxp_fspi_mem_caps; - - nxp_fspi_default_setup(f); - ctlr->dev.of_node = np; - ret = devm_spi_register_controller(&pdev->dev, ctlr); - if (ret) - goto err_destroy_mutex; - - return 0; - -err_destroy_mutex: - mutex_destroy(&f->lock); - -err_disable_clk: - nxp_fspi_clk_disable_unprep(f); - -err_put_ctrl: - spi_controller_put(ctlr); - - dev_err(dev, "NXP FSPI probe failed\n"); - return ret; + return devm_spi_register_controller(&pdev->dev, ctlr); } static void nxp_fspi_remove(struct platform_device *pdev) @@ -1285,8 +1254,6 @@ static void nxp_fspi_remove(struct platform_device *pdev) nxp_fspi_clk_disable_unprep(f); - mutex_destroy(&f->lock); - if (f->ahb_addr) iounmap(f->ahb_addr); }