From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pl1-f177.google.com (mail-pl1-f177.google.com [209.85.214.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 27EF73B7760 for ; Thu, 4 Jun 2026 04:29:18 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.177 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780547359; cv=none; b=FKXhMyvmHcef/GP/tqO+0L7QYcu8voH+OTzGjTju5uo1FuClTxlGz9l0b9DjFw14X8mH7FJLJBvkfV4OMLryrnCYdKMyu51IzSxoaxNXFJM/qdGWkl4502JI/UeJwFYaH7J4yVHaM+5OyG2tHZzf1Un8qEl6vLOXMefk97oha7E= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780547359; c=relaxed/simple; bh=3QG50mKUybp0M/gLZUv5A1nr2l2ynMZPACTJEqlzhE4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Op+sJJJluFCiCmK9F1sBlLNlIfGpRiogLXCrV40tunWJIQa1UQeD3wt34JeDyuRxZzadOUmZ/DqUm08SLZiDBq3qLL+IwmBMTcxXGK8CGOlFKfU7vQUnJ8c1qTTHbE+e6/p8sXXimGePoEo2AMqP7pPlCPicFxey3tB+fp6kT1c= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=IdEL90ru; arc=none smtp.client-ip=209.85.214.177 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="IdEL90ru" Received: by mail-pl1-f177.google.com with SMTP id d9443c01a7336-2bf30d530bdso2816605ad.3 for ; Wed, 03 Jun 2026 21:29:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1780547357; x=1781152157; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=5bxlyHXP2YGQWnwGWhxEiCqmK+gSoW8Nvex6UeFT3fs=; b=IdEL90ruaum1r4zMNPyvEWGHmTVNliuniklXEOlgrbLCUUBLOUzreliqBhoQbtqcS6 4U6QiKTaAVbYMk2dKadMjBx1cP1cOuG8oOTrfzrbimAATQ7EafCxh/IHkeUvQdgwVaex lgblkOYrjPHOfN20EwlY3uhLlwq1gEaztkkfMFsHm5Pay2Yr3U89UnSFWH0ee2EAyXGN 5dMwaXqma1K/yDmqX350bYpAyZRxRMogMcYOIZ7+Z6ykjGLd+Z4o1rhd3XETV/Xo/RnW 472f04a3MttreCBN9jZYTGhgKqkVyvt9ifral9N9C3Ln/3BjX8fHP74+xvyBzwLnb5jd J4wQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1780547357; x=1781152157; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=5bxlyHXP2YGQWnwGWhxEiCqmK+gSoW8Nvex6UeFT3fs=; b=P9aVnYau/Laidd7rZZHbHwWeEQk8AIkivsT1ceiE/1TFZnGB9Fbk5JY1Z9ygBUOYOG sAHbgi77E4p4HLY4ol5fF0tc46jUdpFC+J0faUCcjB+psw5gcptiR66mlKhy5s+aLCkN H/nwGmlPuJyY12e3GDZOnh8BDyfzqkJneET04l/IN+RLJG3vSkFccBginCQ2JZo2oCgC 5w0bhEHCZQMNc4ayeXpKBcF6+wTpsqGsdkUGhID7tHO5qG34CvguJrUISrQB2AqrUZR0 mPQSGG2xSk4Pvtg4LBWbuMnzaA76QtviLasIqyUOnopNfot0KbviNzIazQYZOrae3ZX9 uZzw== X-Gm-Message-State: AOJu0YwwwasEuiUczcSbdXWEOXoXuH+qywn31iDL4W1g5eZmw/OEMGrA RW3uOG/1ciyZJXC7z+2RQoybOfY+2RRML4dK0+ls/3gODUx9M0G6ANl2bK3poc1F X-Gm-Gg: Acq92OEviWLSK/8jEK52JHmHGkpGIgpfeg2bYuYeJQ3OlsY7UtRESJt3Wkljcli1V0m aPUVYqFWyQJbDhGMioticQ5QogCKLS1XvvyxdKgT/NQv0rASYn7nbQp6/9rXQK9dHDOnhNtLpWo XnOvXkhu+LiUiLGz0TuEFPhxPDCkn2eESGPdsFayu93c18LxlXwVqWg4L/FBKHlFTMB7c8/sf9l //hMyrW9TeHnj3D3Q3PaXQdSwrxHtmTjJ91w3rBJxMo0lVspTQIVEKaqBi5eoRmAuc53+S0uBCJ gx8gaf+qA54pGTGLFZw7v4ilIxs5sdJgpST+IB9Qn8CuvC7/AbG3AQQBunkfh4mu2fTA+er/o7F SnQaW/Cr1DjdagSZuNyNIqxyeW7BrdLHl//W/e0SIUZ2mYAKjbKd4ZIBuaZvNS74yEypHlHmBKd XZ2uI+g1boL2K25uh0tfgr/5HWga0z+qPyqESjLjjS1Y+BP/UlOupzZnsWSSpt6hEhdAv4jSa5V 1UMhE9ft/2UW0ORJ+/T639ENZaYmMg9LjG5bv3EwokpdzmMrjMMrli4 X-Received: by 2002:a17:903:8ce:b0:2b7:abc0:3bd7 with SMTP id d9443c01a7336-2c163a33d0dmr66205635ad.9.1780547357505; Wed, 03 Jun 2026 21:29:17 -0700 (PDT) Received: from ryzen ([2601:644:8000:5b5d:7285:c2ff:fe45:8a32]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2c166396fa9sm41006575ad.66.2026.06.03.21.29.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 03 Jun 2026 21:29:16 -0700 (PDT) From: Rosen Penev To: linux-kernel@vger.kernel.org Cc: Krzysztof Kozlowski Subject: [PATCH 3/3] memory: fsl_ifc: Use devm_request_irq and simplify remove Date: Wed, 3 Jun 2026 21:28:56 -0700 Message-ID: <20260604042856.90859-4-rosenp@gmail.com> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260604042856.90859-1-rosenp@gmail.com> References: <20260604042856.90859-1-rosenp@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Switch from request_irq to devm_request_irq, eliminating the error path labels and free_irq calls in remove(). Since both IRQs are now devm-managed, the remove function only needs of_platform_depopulate to tear down child devices before devm cleanup fires. Assisted-by: opencode:big-pickle Signed-off-by: Rosen Penev --- drivers/memory/fsl_ifc.c | 33 ++++++++++----------------------- 1 file changed, 10 insertions(+), 23 deletions(-) diff --git a/drivers/memory/fsl_ifc.c b/drivers/memory/fsl_ifc.c index effeae0bdacc..6be09a902443 100644 --- a/drivers/memory/fsl_ifc.c +++ b/drivers/memory/fsl_ifc.c @@ -86,12 +86,7 @@ static int fsl_ifc_ctrl_init(struct fsl_ifc_ctrl *ctrl) static void fsl_ifc_ctrl_remove(struct platform_device *dev) { - struct fsl_ifc_ctrl *ctrl = dev_get_drvdata(&dev->dev); - of_platform_depopulate(&dev->dev); - if (ctrl->nand_irq > 0) - free_irq(ctrl->nand_irq, ctrl); - free_irq(ctrl->irq, ctrl); } /* @@ -253,39 +248,31 @@ static int fsl_ifc_ctrl_probe(struct platform_device *dev) init_waitqueue_head(&fsl_ifc_ctrl_dev->nand_wait); - ret = request_irq(fsl_ifc_ctrl_dev->irq, fsl_ifc_ctrl_irq, IRQF_SHARED, - "fsl-ifc", fsl_ifc_ctrl_dev); + ret = devm_request_irq(&dev->dev, fsl_ifc_ctrl_dev->irq, + fsl_ifc_ctrl_irq, IRQF_SHARED, + "fsl-ifc", fsl_ifc_ctrl_dev); if (ret != 0) { dev_err(&dev->dev, "failed to install irq (%d)\n", fsl_ifc_ctrl_dev->irq); - goto err_free_irq; + return ret; } /* get the nand machine irq */ fsl_ifc_ctrl_dev->nand_irq = platform_get_irq_optional(dev, 1); if (fsl_ifc_ctrl_dev->nand_irq > 0) { - ret = request_irq(fsl_ifc_ctrl_dev->nand_irq, fsl_ifc_nand_irq, - 0, "fsl-ifc-nand", fsl_ifc_ctrl_dev); + ret = devm_request_irq(&dev->dev, + fsl_ifc_ctrl_dev->nand_irq, + fsl_ifc_nand_irq, 0, + "fsl-ifc-nand", fsl_ifc_ctrl_dev); if (ret != 0) { dev_err(&dev->dev, "failed to install irq (%d)\n", fsl_ifc_ctrl_dev->nand_irq); - goto err_free_irq; + return ret; } } /* legacy dts may still use "simple-bus" compatible */ - ret = of_platform_default_populate(dev->dev.of_node, NULL, &dev->dev); - if (ret) - goto err_free_nandirq; - - return 0; - -err_free_nandirq: - if (fsl_ifc_ctrl_dev->nand_irq > 0) - free_irq(fsl_ifc_ctrl_dev->nand_irq, fsl_ifc_ctrl_dev); -err_free_irq: - free_irq(fsl_ifc_ctrl_dev->irq, fsl_ifc_ctrl_dev); - return ret; + return of_platform_default_populate(dev->dev.of_node, NULL, &dev->dev); } static const struct of_device_id fsl_ifc_match[] = { -- 2.54.0