From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pl1-f182.google.com (mail-pl1-f182.google.com [209.85.214.182]) (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 0086E471413 for ; Tue, 21 Jul 2026 20:24:55 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.182 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784665498; cv=none; b=iZBjDr+m7rv+ex0iPIhfa8qc1t3LHNXQpbYRHGi8bJKnVluxcZI8iyS74ia06/FrGmysvaQm8DVZWDDj7M39g/lskL9ndJCZy8sCkig5Lspi5uA2Rjv0DZnd1qWBsHwK54t5fKxLENQ/U6+OFGehzchjB16NqVX+AWIIaI5VmaQ= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784665498; c=relaxed/simple; bh=oKXulHAtbzSjf/zEyAIzjrgzy4Ezq47fpmacO7kY5S0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=mfRaCrUaT39EWu302R6QK1Tx/2myZXhWWbeDGqE4S6cJaX3UZcbjfS1MIj8OThGHe4c43l7ImofHQvf/wLF/GQhx3Ur8sjDNfMzt1U33Wf0Ea6Fr5tT/9Ybg2E9pGZM+1vwkZZCyOLLsARCGfNMDY6EeIneVeOtDktmYu5hQOz8= 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=c+YQFxaK; arc=none smtp.client-ip=209.85.214.182 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="c+YQFxaK" Received: by mail-pl1-f182.google.com with SMTP id d9443c01a7336-2ceed7018c8so56109315ad.1 for ; Tue, 21 Jul 2026 13:24:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1784665495; x=1785270295; 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:content-type; bh=Ow9qfKseG+t/wFd5V7pacYkajGvFci3yu5h8kwX78OM=; b=c+YQFxaK1Q11K5GUlwSqLkK0f7GpJzjaCHNxkA8duk2qV2Rl5kBQ7korOVFgH/XRgN TJAf4uNNHY8NmujWF/CcKCEd2SJF+WJAmGVoRo0PDMrS/tceK0w+aDYxVJqOMsWesMf2 w8EQcbglEKhyl0P5CeYLNKJW2ES1X7rIPob9RZ/nJNPgHkm441bIJP61stIR9sRIadDE 31bZ3cUfj2mLz6/wd9N3We7vGzk3LNphhTK5KP5d6vgnU/LxWev4v+fZXG4U89pFluZG 9uDmB/j3Spg7dBjVhaXC/em1wtw8nGvYm0OJ17oO1WyQzG/D2LVPPUOnCVQX/YLdxBxM TJ3Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1784665495; x=1785270295; 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:content-type; bh=Ow9qfKseG+t/wFd5V7pacYkajGvFci3yu5h8kwX78OM=; b=BGi5g2Ao/sxb8OuV8v2KOSeN2krFrs6nKJPogo7skLf87zIo2uVap4/c3s+UPJR2YC YcSRfFTGZQr4nT6TH/bfFbXnREqXDSzRkjGK+ToCyk1HHONitbctREXjCjoCSPGXNymX h1r5V0nwNiNy/N3aTTkm8PtQybD7YW1JIaS6v7viAA/pk8rfaIVuvnrT2eY4mWjeBOwj 8mk+C3E9Uyh9TX8K19Z8GhgCKz3DiF6p2x37rt7YI/HAeuc8Ke5v5JwizsWVLFfewniw d1EQpXcVuU9V2IdH2b4+yWt9Mut89DuTrlA2yT74r6E0TgdG0HnGztq21BfduGLuHFGo A+UQ== X-Gm-Message-State: AOJu0YwXSw04rq/HrFJNVThEU3CyyKYCGi11Ra6t5KFLvMjdIYzwiSfg osrWDlGMqqwPFxgZJ1mMhM6hz65x4DH3ZNEdHHNqoAXbVsP7sYTFd9Fglx0Bog== X-Gm-Gg: AR+sD10p4rpewg7MiHpM39NYnlyZEdqnvFG5+R1I46kDCd857MSQWmaL1P29/bBaaRe PVv9sPNBsEB5kdRwKvaf1fSCzOTvruE5Tra0ptHcZ2Nlm0JHWfPFbWxTEhqhxRl5CHjFOb/VYjY AcRUAJp5dARbIMbeNJFPDFbOuAs1Au2v5NZ0r6xlntMqrN3wBjvyDGJiiFiWL42VktBTtw/f16I MLPGgnvJNLe7DUCcUXoaIZHVn9CqmMUApPE9tx6IrhiJfloG+jE9DIweNqmlayZmFesqCi7Kvqi 8Q1lS/2ftIXcktqJg2wtBuy8NXv1465dyP1KzsGVnWKBngm/5AvSWa705mARyG8fj1Xc8UnStzu cGtKrYWHV2fB8rqLBp3idwjg8THCdPV2Pm1uUnBu4WmwOQE+qXhHqTms3xLAhZ2hnwQPnhSP/XT awJNH1Juu0N+JvfovXR2XWcdo5sucBX7LKZP6zm5dDWF81sfDeLvZNeclQJVrZaPXUuUAnKZIH3 /vGXz77+Kq2odC/4B2OwPE54b828Y/MOlPCziNj0+ARiOlixM9kVcw= X-Received: by 2002:a17:902:f686:b0:2ca:281:27fd with SMTP id d9443c01a7336-2cf3499772bmr215041825ad.25.1784665495233; Tue, 21 Jul 2026 13:24:55 -0700 (PDT) Received: from ryzen.lan ([2601:644:8000:7a86::e34]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2cf8f2e7a83sm2592285ad.42.2026.07.21.13.24.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Jul 2026 13:24:54 -0700 (PDT) From: Rosen Penev To: linux-kernel@vger.kernel.org Cc: Krzysztof Kozlowski Subject: [PATCHv2 3/4] memory: fsl_ifc: Use devm_request_irq and simplify remove Date: Tue, 21 Jul 2026 13:24:48 -0700 Message-ID: <20260721202450.485171-4-rosenp@gmail.com> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260721202450.485171-1-rosenp@gmail.com> References: <20260721202450.485171-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. Remove dev_err calls on failure as devm_request_irq() already does this. Don't bother using the irq variables in the struct. They were only used to free the irqs in _remove. Assisted-by: opencode:big-pickle Signed-off-by: Rosen Penev --- drivers/memory/fsl_ifc.c | 47 ++++++++++------------------------------ 1 file changed, 12 insertions(+), 35 deletions(-) diff --git a/drivers/memory/fsl_ifc.c b/drivers/memory/fsl_ifc.c index 7e6800fc8480..7fea6a356b55 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,8 +248,6 @@ static int fsl_ifc_ctrl_probe(struct platform_device *dev) addr += PGOFFSET_4K; fsl_ifc_ctrl_dev->rregs = addr; - fsl_ifc_ctrl_dev->irq = irq; - fsl_ifc_ctrl_dev->dev = &dev->dev; ret = fsl_ifc_ctrl_init(fsl_ifc_ctrl_dev); @@ -263,38 +256,22 @@ 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); - if (ret != 0) { - dev_err(&dev->dev, "failed to install irq (%d)\n", - fsl_ifc_ctrl_dev->irq); - goto err_free_irq; - } + ret = devm_request_irq(&dev->dev, irq, + fsl_ifc_ctrl_irq, IRQF_SHARED, + "fsl-ifc", fsl_ifc_ctrl_dev); + if (ret) + return ret; - fsl_ifc_ctrl_dev->nand_irq = nand_irq; - 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); - if (ret != 0) { - dev_err(&dev->dev, "failed to install irq (%d)\n", - fsl_ifc_ctrl_dev->nand_irq); - goto err_free_irq; - } + if (nand_irq > 0) { + ret = devm_request_irq(&dev->dev, + nand_irq, fsl_ifc_nand_irq, 0, + "fsl-ifc-nand", fsl_ifc_ctrl_dev); + if (ret) + 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.55.0