From nobody Sat Jul 25 01:35:10 2026 Received: from mail-pj1-f43.google.com (mail-pj1-f43.google.com [209.85.216.43]) (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 CB03E171AF for ; Tue, 21 Jul 2026 01:02:19 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.43 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784595741; cv=none; b=daFuhRsgpgAVwS81fUzGOMHBtsKEbL/Z610YXR8KI3oavxiKoxNKa30gdTy1eUDoNhe+ILaHuxrN+wgA1dXPIHdAZzIZ6OYQr3uSSnRGrbUNNBCP3A5onjA3/AjcpgPm+gfyyacOiOrx9Kgfe/eO0jGn0F8ONKgT/ouF/vHMTcE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784595741; c=relaxed/simple; bh=Vp7TwwIkC1ySw6IlyKHz6XxaiF7cHfZjYC3myrXyjNE=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=Pi+26T9TSCeR+4vKBKKstRa2dfwqXpEcDezQj9koE/kJ+aZ1W6webq9rlqh7uuQYzEkLDfrnW4QOZlOANYoJFr6jH6g1liwrTOmyX20ML/hildR4N9Ft6osTi3GhwZYDCXek/6GtAV0x7bcWe03Uuqavl3UKXvZG7KQOy8LcrHQ= 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=J9GHb4G8; arc=none smtp.client-ip=209.85.216.43 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="J9GHb4G8" Received: by mail-pj1-f43.google.com with SMTP id 98e67ed59e1d1-38e3617ba36so5116554a91.3 for ; Mon, 20 Jul 2026 18:02:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1784595739; x=1785200539; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to:content-type; bh=Xi5tnkVz+PURPr/ufl5NUD3RR317TnWsCpk6GKHXUdE=; b=J9GHb4G8GRpk7cugvA0P0BM04BJnEGjhd2EkDrtROxC5CnC0YNSA3d8RMdjmMIq/YY kgcLwroXwM/RhZun6FfFfHP2ZxUNeE6eGBpj5s0BWJfuzPych7TjwRo1gn9pDhEPezdl erEyMyQZRJTSNJS+oB7/SiMso9JFzOoWYhFeWRngsjaGZ2W1ep+qHeze3lHSwZmNIjfw qO+/ST8oEBRp4eAGBBijq8VPGr9cLPHjo8fExRFuQ8eNqiTFG9bZVEO4vgqvGoEDImwQ no7h5eI/+9iA736IjeLFwh+uuZg5bzCn7hoIxEC9AERodBUlDsli7f1YJEGR+AAcNWZJ 9GdA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1784595739; x=1785200539; h=content-transfer-encoding:mime-version: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=Xi5tnkVz+PURPr/ufl5NUD3RR317TnWsCpk6GKHXUdE=; b=fP33EwsLR/JiPwSsCsUivGvPXc1sSBHxSz7sukBDRWG2e6+xut9Qio0qRbCPGVYufC AYVpSsBn3DBh/OIkiYG3D4AtMvnjmb3QStKvdxMyPpj2J1k8RmfIDvNcBCs1f5MXiUZY jhzxrtAm2Ee1VvsSSseutPay9Qgt0Lmo75ox5z4yJ0VnqPIy31U6RVv2TdiyhRcDPX3H aG104zSUx/hcdQLTEtNItsWGK11F0rqP86gNSC1vRO1TT6zh93Y9v4W6w/cMDj0NsgId T0rISjP5OuEZUN3VakDIn37We0rp+uIWF7kgQltxycvpvh69m/6sDEVEdkBZ7YAYEX/G xItw== X-Forwarded-Encrypted: i=1; AHgh+RojbuB/yegH0Zo0vXuwI+FSp+STx3iu/vQzmM6m1zkrb6cbOkcZDX5j39An1HJrcHN6NPq4DF+1rAlKCNw=@vger.kernel.org X-Gm-Message-State: AOJu0YyNOBhZ+uLyDW05pjrLqiEWv9scOYy1bpt/YH3nCz1sIzXoF7Sr zR/9YE6qDgoilIAou3nhFlhM2oNeKRNf/Ee0oxgOTHjnFOIizUfyNlUjARfTvw== X-Gm-Gg: AR+sD12z8r4YN5dn0lgvbiXBUGiNiUMgFTqdv9418CFJIB8xDrzkcmqKjvkNQcJZTwA Gf1NZBAykXUHguxhVZeRyfnpul6O1qn967MGX4A18N9TXgYqVh3lYLNTQ06I5EUGpmuaO09UDFf Gh50veRZYgtS7fRvK0bPcLfoLLs5pm9YqIntKaR3MQ1bxSok+RvXYSRiOCe8J0Yh2SP/hanM0XS hRRJ24KjpmQqqhD32u1loA5bYEWd+VoKEG3cV82rUXHvnE21ysg8CmTpaj/9CAuyISlMHZuWYcZ IQpBNxaAHmw4hJjZNlGrM0rvvCMbkHNezs5yK10y4UoRgNbr/MDK2klKgXoa23OqWc7Bj0+0RKY qmnCbl/c8rnWEiat8LtryW6nhW017JQ6e/RX/yPQnNOTf7dYSBTX7wDEd6UmCvI604MHCOZG/PQ a0aWAwf2gwPvr4MLJhJnF96gzlSRC8tmXT8cDsibnGx1tlCMyeeyT0fYT23kXjVhCXxvsyn9B8+ WUTB3j6Ged4IvT0GtDJlmyvVumgzA6ZidvbDypmuDjS/m/LVJFMRa8= X-Received: by 2002:a17:90b:3c52:b0:37c:18e0:90dc with SMTP id 98e67ed59e1d1-38e4b431315mr17031556a91.16.1784595739137; Mon, 20 Jul 2026 18:02:19 -0700 (PDT) Received: from ryzen.lan ([2601:644:8000:7a86::e35]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-38e60bc83f6sm1032383a91.3.2026.07.20.18.02.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Jul 2026 18:02:18 -0700 (PDT) From: Rosen Penev To: linux-spi@vger.kernel.org Cc: Mark Brown , linux-kernel@vger.kernel.org (open list) Subject: [PATCHv2] spi: ppc4xx: devm-ify probe and drop manual resource management Date: Mon, 20 Jul 2026 18:02:17 -0700 Message-ID: <20260721010217.3385364-1-rosenp@gmail.com> X-Mailer: git-send-email 2.55.0 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Replace open-coded resource handling with devm helpers: - spi_alloc_host -> devm_spi_alloc_host - of_address_to_resource + ioremap + request_mem_region -> devm_platform_ioremap_resource - request_irq -> devm_request_irq - remove now-unused mapbase/mapsize fields from struct ppc4xx_spi - move of_node_put(opbnp) earlier to simplify error paths - delete the entire error-unwinding goto chain Move devm_platform_ioremap_resource() and platform_get_irq() up in order to avoid doing work if -EPROBE_DEFER is returned. Sanity check for devm_platform_ioremap_resource removed as it's unnecessary. Assisted-by: opencode:big-pickle Signed-off-by: Rosen Penev --- v2: mention Sanity check removal. drivers/spi/spi-ppc4xx.c | 107 ++++++++++----------------------------- 1 file changed, 27 insertions(+), 80 deletions(-) diff --git a/drivers/spi/spi-ppc4xx.c b/drivers/spi/spi-ppc4xx.c index 46ac58dfb3fc..7823b3814a17 100644 --- a/drivers/spi/spi-ppc4xx.c +++ b/drivers/spi/spi-ppc4xx.c @@ -112,8 +112,6 @@ struct ppc4xx_spi { struct spi_bitbang bitbang; struct completion done; =20 - u64 mapbase; - u64 mapsize; int irqnum; /* need this to set the SPI clock */ unsigned int opb_freq; @@ -337,14 +335,24 @@ static int spi_ppc4xx_of_probe(struct platform_device= *op) struct ppc4xx_spi *hw; struct spi_controller *host; struct spi_bitbang *bbp; - struct resource resource; struct device_node *np =3D op->dev.of_node; struct device *dev =3D &op->dev; struct device_node *opbnp; int ret; - const unsigned int *clk; + unsigned int opb_freq; + void __iomem *regs; + int irqnum; + + regs =3D devm_platform_ioremap_resource(op, 0); + if (IS_ERR(regs)) + return PTR_ERR(regs); =20 - host =3D spi_alloc_host(dev, sizeof(*hw)); + /* Request IRQ */ + irqnum =3D platform_get_irq(op, 0); + if (irqnum < 0) + return irqnum; + + host =3D devm_spi_alloc_host(dev, sizeof(*hw)); if (host =3D=3D NULL) return -ENOMEM; host->dev.of_node =3D np; @@ -379,88 +387,31 @@ static int spi_ppc4xx_of_probe(struct platform_device= *op) opbnp =3D of_find_compatible_node(NULL, NULL, "ibm,opb"); if (opbnp =3D=3D NULL) { dev_err(dev, "OPB: cannot find node\n"); - ret =3D -ENODEV; - goto free_host; + return -ENODEV; } /* Get the clock (Hz) for the OPB */ - clk =3D of_get_property(opbnp, "clock-frequency", NULL); - if (clk =3D=3D NULL) { - dev_err(dev, "OPB: no clock-frequency property set\n"); - of_node_put(opbnp); - ret =3D -ENODEV; - goto free_host; - } - hw->opb_freq =3D *clk; - hw->opb_freq >>=3D 2; + ret =3D of_property_read_u32(opbnp, "clock-frequency", &opb_freq); of_node_put(opbnp); - - ret =3D of_address_to_resource(np, 0, &resource); - if (ret) { - dev_err(dev, "error while parsing device node resource\n"); - goto free_host; - } - hw->mapbase =3D resource.start; - hw->mapsize =3D resource_size(&resource); - - /* Sanity check */ - if (hw->mapsize < sizeof(struct spi_ppc4xx_regs)) { - dev_err(dev, "too small to map registers\n"); - ret =3D -EINVAL; - goto free_host; - } - - /* Request IRQ */ - ret =3D platform_get_irq(op, 0); - if (ret < 0) - goto free_host; - hw->irqnum =3D ret; - - ret =3D request_irq(hw->irqnum, spi_ppc4xx_int, - 0, "spi_ppc4xx_of", (void *)hw); - if (ret) { - dev_err(dev, "unable to allocate interrupt\n"); - goto free_host; - } - - if (!request_mem_region(hw->mapbase, hw->mapsize, DRIVER_NAME)) { - dev_err(dev, "resource unavailable\n"); - ret =3D -EBUSY; - goto request_mem_error; + if (ret) + dev_err(dev, "OPB: no clock-frequency property set\n"); + return -ENODEV; } =20 - hw->regs =3D ioremap(hw->mapbase, sizeof(struct spi_ppc4xx_regs)); + hw->opb_freq =3D opb_freq; + hw->opb_freq >>=3D 2; + hw->regs =3D regs; + hw->irqnum =3D irqnum; =20 - if (!hw->regs) { - dev_err(dev, "unable to memory map registers\n"); - ret =3D -ENXIO; - goto map_io_error; - } + ret =3D devm_request_irq(&op->dev, hw->irqnum, spi_ppc4xx_int, + 0, "spi_ppc4xx_of", hw); + if (ret) + return ret; =20 spi_ppc4xx_enable(hw); =20 /* Finally register our spi controller */ dev->dma_mask =3D 0; - ret =3D spi_bitbang_start(bbp); - if (ret) { - dev_err(dev, "failed to register SPI host\n"); - goto unmap_regs; - } - - dev_info(dev, "driver initialized\n"); - - return 0; - -unmap_regs: - iounmap(hw->regs); -map_io_error: - release_mem_region(hw->mapbase, hw->mapsize); -request_mem_error: - free_irq(hw->irqnum, hw); -free_host: - spi_controller_put(host); - - dev_err(dev, "initialization failed\n"); - return ret; + return spi_bitbang_start(bbp); } =20 static void spi_ppc4xx_of_remove(struct platform_device *op) @@ -469,10 +420,6 @@ static void spi_ppc4xx_of_remove(struct platform_devic= e *op) struct ppc4xx_spi *hw =3D spi_controller_get_devdata(host); =20 spi_bitbang_stop(&hw->bitbang); - release_mem_region(hw->mapbase, hw->mapsize); - free_irq(hw->irqnum, hw); - iounmap(hw->regs); - spi_controller_put(host); } =20 static const struct of_device_id spi_ppc4xx_of_match[] =3D { --=20 2.55.0