From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pl1-f178.google.com (mail-pl1-f178.google.com [209.85.214.178]) (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 A57E9472531 for ; Tue, 21 Jul 2026 20:24:54 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.178 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784665495; cv=none; b=qdPPt2I2nb7k/cZDC01ZO+mhqGAXv7UoakNL/31/dB61n0RU6qavWMEayx3Re5LoI6yUvCC/K2fKHRo0K7FTk61eroQKhs0YuOFZfV9vDV9k2x180djApSwGNgVgfcWmLJyjyj80UMlDqEvDl9JB5icCNqN9+MgsQDNkEM0OV/w= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784665495; c=relaxed/simple; bh=duFD0QtN9U+ugN5BgCecC8CfNwJQAWw30nfZVU41cck=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=GaBMw8J1llb2+XCy/r2RKyZiPP8n33sDre9srdyU3TugO8604oQc/cwxJEZbCJoJ0Yuekz9vPlKft1adyyADajdPZmGsqAKxDct71YuYnIY5S78Xl7NMZLXhnWz62yAfALKRolb671xh2ybi11D8HdfbuDIQkD9rTJqMllFCBDI= 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=o7MOKgpO; arc=none smtp.client-ip=209.85.214.178 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="o7MOKgpO" Received: by mail-pl1-f178.google.com with SMTP id d9443c01a7336-2cea3004256so134545435ad.0 for ; Tue, 21 Jul 2026 13:24:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1784665494; x=1785270294; 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=evVhRMFgfak1ucgW244RBR/KV9APrutKlEbS++D55x4=; b=o7MOKgpOdHo1Qv7CrfQGvLXnqoTf1i3H21Xj3a7Z/YkGCviywS9ygQREQjKfhMPSD3 QUEp3IBwDtPcDUglJ5l0FEocw42PyPFIMi7kHSmPESeE4hwsnCLhEObbArztB5qLlnVw rysCwIytgNf5GCTP4bV8/PJY5jGPF/WRWSG68D9LMbUsWG5v4yfEShwS7a9iaAoWSXUH 8h2e8+vAhzX9tHV3W9jJgZUE5cTR7p4wETk5LwBAK4/xRhspFG1bTQbXIA9gQvt8A1wV uI3ZoxHSAmgN/aXmKzN/I1j4vNCGpzYlcFBOCJ45jiv3paEKVFKdWfi8k2qFIZJjPKOH bLYw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1784665494; x=1785270294; 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=evVhRMFgfak1ucgW244RBR/KV9APrutKlEbS++D55x4=; b=Q/XJsRB5F21VC8zrwBPuMVvOKCty/t4AtH3YeQqeuW4gN/ebZel4uSUxRNuJGpSHFb 7p3cNCUccCliVV1nTNmipKyNpMlpae/2eBxwcfRfp+bhWj3F3aK2+UYDPIeDcaV5upNq E0YGSSAmPyRfjPViR4ODEtkSmL58psRlCdHyxckVi/E9osJ/PvsI6N5s4I6B5V50SZXG qHbUnZWiiSLdSFLwSq7SofanWzeb1FkdBAYTboO9KrwGZZSMEpxF9giW4+SbN38+2KKg QCB31jKfNSV57HMiDoh8Ykj70+MdZHPJ2TeaizBnM5SLoNAv1h4ugkKD5ripUyJ6GPJG oADg== X-Gm-Message-State: AOJu0YwGEmpxHQRGDQPxrx2mvsF+proefdtP2x3ik3gdMuwwFj2ZMTRt gN15WMdViC5/trBUoGTQA3RADWh6jAPRylTc2kVzA0akusiDHSlmTQTnHkxvmg== X-Gm-Gg: AR+sD13YYrP9g1PjxfRXlapjeX/f4fgmda6i5d5fLRz/OHsSLzFmhD1shk5AkTZAS4e jdDfhRpDl/FDacolaFKsUHOn1UKG2I0w8zzYehfRKX7t0bJscQz5TeoR0iuBW8in/2A1KbnqLsu VIEg5L+MNc52ytimkQmCiCNTiCJk3eMSEGlVUAaLvyYdEgn0E7c3sdJy8lb/luz0w9q1K+OXI15 vzW2TypDLN/yWUTtbLJ6JcAkNHYPckVa1s7F+Yp6sMEBF43X7Q6kxoskwRIuzG8GKKbz3B/GQp6 TsQGXJNypFbEEGzB2vfZNiU0XND9BSn7+KvtMgKLy+SRSVI8odITHtmUki0NKw4kY0O+k0vyiJk RuTinx/OqS2vbVmBdTEUfwgHfOIcBQLT5aftDjZw147UNLbEE1lnDNGTKXh9WtQHNfsNQVJC/3p EBVURV5j1TUeyqA1MYiIyZl+DOHSLPqaq2EIbdmIFPtT6GnKMicCPFIEzL/eY7uw4IXmuSgPuzp vafPemdyLSm20hjXjbRqVXeOrYm1+ary4+Pm7yBJjuvGetKkM1cl0M= X-Received: by 2002:a17:902:e80e:b0:2cc:9179:32e with SMTP id d9443c01a7336-2cf3481bc46mr216259575ad.10.1784665494041; Tue, 21 Jul 2026 13:24:54 -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.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Jul 2026 13:24:53 -0700 (PDT) From: Rosen Penev To: linux-kernel@vger.kernel.org Cc: Krzysztof Kozlowski Subject: [PATCHv2 2/4] memory: fsl_ifc: Use devm_platform_ioremap_resource and fix error paths Date: Tue, 21 Jul 2026 13:24:47 -0700 Message-ID: <20260721202450.485171-3-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 Replace of_iomap() with devm_platform_ioremap_resource() for automatic resource management, eliminating manual iounmap in remove and error paths. devm_ioremap_resource() reserves the region and checks for overlaps, which is safe here since the IFC controller register space and child chip-select ranges are always at distinct addresses in all DTS files. As one of the errors is -EPROBE_DEFER, run it before anything else to avoid doing actual work in such a case. Assisted-by: opencode:big-pickle Signed-off-by: Rosen Penev --- drivers/memory/fsl_ifc.c | 23 +++++++++-------------- 1 file changed, 9 insertions(+), 14 deletions(-) diff --git a/drivers/memory/fsl_ifc.c b/drivers/memory/fsl_ifc.c index dce94d8b05b9..7e6800fc8480 100644 --- a/drivers/memory/fsl_ifc.c +++ b/drivers/memory/fsl_ifc.c @@ -92,10 +92,6 @@ static void fsl_ifc_ctrl_remove(struct platform_device *dev) if (ctrl->nand_irq > 0) free_irq(ctrl->nand_irq, ctrl); free_irq(ctrl->irq, ctrl); - - iounmap(ctrl->gregs); - - dev_set_drvdata(&dev->dev, NULL); } /* @@ -201,6 +197,7 @@ static int fsl_ifc_ctrl_probe(struct platform_device *dev) { int ret = 0; int version, banks; + void __iomem *gregs; void __iomem *addr; int nand_irq; int irq; @@ -217,6 +214,11 @@ static int fsl_ifc_ctrl_probe(struct platform_device *dev) if (nand_irq == -EPROBE_DEFER) return nand_irq; + /* IOMAP the entire IFC region */ + gregs = devm_platform_ioremap_resource(dev, 0); + if (IS_ERR(gregs)) + return PTR_ERR(gregs); + fsl_ifc_ctrl_dev = devm_kzalloc(&dev->dev, sizeof(*fsl_ifc_ctrl_dev), GFP_KERNEL); if (!fsl_ifc_ctrl_dev) @@ -224,12 +226,7 @@ static int fsl_ifc_ctrl_probe(struct platform_device *dev) dev_set_drvdata(&dev->dev, fsl_ifc_ctrl_dev); - /* IOMAP the entire IFC region */ - fsl_ifc_ctrl_dev->gregs = of_iomap(dev->dev.of_node, 0); - if (!fsl_ifc_ctrl_dev->gregs) { - dev_err(&dev->dev, "failed to get memory region\n"); - return -ENODEV; - } + fsl_ifc_ctrl_dev->gregs = gregs; if (of_property_read_bool(dev->dev.of_node, "little-endian")) { fsl_ifc_ctrl_dev->little_endian = true; @@ -262,7 +259,7 @@ static int fsl_ifc_ctrl_probe(struct platform_device *dev) ret = fsl_ifc_ctrl_init(fsl_ifc_ctrl_dev); if (ret < 0) - goto err; + return ret; init_waitqueue_head(&fsl_ifc_ctrl_dev->nand_wait); @@ -271,7 +268,7 @@ static int fsl_ifc_ctrl_probe(struct platform_device *dev) if (ret != 0) { dev_err(&dev->dev, "failed to install irq (%d)\n", fsl_ifc_ctrl_dev->irq); - goto err; + goto err_free_irq; } fsl_ifc_ctrl_dev->nand_irq = nand_irq; @@ -297,8 +294,6 @@ static int fsl_ifc_ctrl_probe(struct platform_device *dev) 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); -err: - iounmap(fsl_ifc_ctrl_dev->gregs); return ret; } -- 2.55.0