From: Rosen Penev Date: Wed, 3 Jun 2026 19:24:15 +0000 (-0700) Subject: Input: apbps2 - simplify resource mapping and IRQ retrieval X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=391a47efbb31c48c839d3efde7756e0a00bf11f4;p=thirdparty%2Flinux.git Input: apbps2 - simplify resource mapping and IRQ retrieval Simplify resource mapping by using devm_platform_ioremap_resource() instead of the longer devm_platform_get_and_ioremap_resource() helper as the last argument is NULL. Additionally, use platform_get_irq() to retrieve the interrupt instead of irq_of_parse_and_map() and propagate its error code on failure. irq_of_parse_and_map() requires irq_dispose_mapping, which is missing. Assisted-by: Antigravity:Gemini-3.5-Flash Signed-off-by: Rosen Penev Link: https://patch.msgid.link/20260603192415.6679-1-rosenp@gmail.com Signed-off-by: Dmitry Torokhov --- diff --git a/drivers/input/serio/apbps2.c b/drivers/input/serio/apbps2.c index 0aa4ab00af35..5f21acdd4113 100644 --- a/drivers/input/serio/apbps2.c +++ b/drivers/input/serio/apbps2.c @@ -140,7 +140,7 @@ static int apbps2_of_probe(struct platform_device *ofdev) } /* Find device address */ - priv->regs = devm_platform_get_and_ioremap_resource(ofdev, 0, NULL); + priv->regs = devm_platform_ioremap_resource(ofdev, 0); if (IS_ERR(priv->regs)) return PTR_ERR(priv->regs); @@ -148,7 +148,10 @@ static int apbps2_of_probe(struct platform_device *ofdev) iowrite32be(0, &priv->regs->ctrl); /* IRQ */ - irq = irq_of_parse_and_map(ofdev->dev.of_node, 0); + irq = platform_get_irq(ofdev, 0); + if (irq < 0) + return irq; + err = devm_request_irq(&ofdev->dev, irq, apbps2_isr, IRQF_SHARED, "apbps2", priv); if (err) {