]> git.hungrycats.org Git - linux/commitdiff
EDAC/altera: Use parent device for devres in altr_portb_setup()
authorDinh Nguyen <dinguyen@kernel.org>
Wed, 17 Jun 2026 16:43:03 +0000 (11:43 -0500)
committerBorislav Petkov (AMD) <bp@alien8.de>
Tue, 8 Sep 2026 04:29:44 +0000 (21:29 -0700)
Anchor the devres group and the devm-managed IRQ requests in altr_portb_setup()
to the actual parent device (device->edac->dev) instead of the embedded struct
device inside the copied per-port altr_edac_device_dev.

This keeps devres_open_group(), devm_request_irq(), devres_remove_group() and
devres_release_group() all referring to the same long-lived device so the
group and the resources allocated inside it are torn down together.

Fixes: 911049845d70 ("EDAC, altera: Add Arria10 SD-MMC EDAC support")
Closes: https://sashiko.dev/#/patchset/20260503212558.2811480-1-dbgh9129%40gmail.com
Assisted-by: LLM
Signed-off-by: Dinh Nguyen <dinguyen@kernel.org>
Signed-off-by: Borislav Petkov (AMD) <bp@alien8.de>
Cc: stable@vger.kernel.org
Link: https://patch.msgid.link/20260617164303.585555-1-dinguyen@kernel.org
drivers/edac/altera_edac.c

index 1d1e2b5ca14c8c7c607fd1c86063cf36ea8a7b5e..68846f583eeefe15ca57a81e490a29207437a1ce 100644 (file)
@@ -1534,7 +1534,7 @@ static int altr_portb_setup(struct altr_edac_device_dev *device)
        altdev = dci->pvt_info;
        *altdev = *device;
 
-       if (!devres_open_group(&altdev->ddev, altr_portb_setup, GFP_KERNEL))
+       if (!devres_open_group(device->edac->dev, altr_portb_setup, GFP_KERNEL))
                return -ENOMEM;
 
        /* Update PortB specific values */
@@ -1562,7 +1562,7 @@ static int altr_portb_setup(struct altr_edac_device_dev *device)
                rc = -ENODEV;
                goto err_release_group_1;
        }
-       rc = devm_request_irq(&altdev->ddev, altdev->sb_irq,
+       rc = devm_request_irq(device->edac->dev, altdev->sb_irq,
                              prv->ecc_irq_handler, IRQF_TRIGGER_HIGH,
                              ecc_name, altdev);
        if (rc) {
@@ -1584,7 +1584,7 @@ static int altr_portb_setup(struct altr_edac_device_dev *device)
                        rc = -ENODEV;
                        goto err_release_group_1;
                }
-               rc = devm_request_irq(&altdev->ddev, altdev->db_irq,
+               rc = devm_request_irq(device->edac->dev, altdev->db_irq,
                                      prv->ecc_irq_handler, IRQF_TRIGGER_HIGH,
                                      ecc_name, altdev);
                if (rc) {
@@ -1604,13 +1604,13 @@ static int altr_portb_setup(struct altr_edac_device_dev *device)
 
        list_add(&altdev->next, &altdev->edac->a10_ecc_devices);
 
-       devres_remove_group(&altdev->ddev, altr_portb_setup);
+       devres_remove_group(device->edac->dev, altr_portb_setup);
 
        return 0;
 
 err_release_group_1:
        edac_device_free_ctl_info(dci);
-       devres_release_group(&altdev->ddev, altr_portb_setup);
+       devres_release_group(device->edac->dev, altr_portb_setup);
        edac_printk(KERN_ERR, EDAC_DEVICE,
                    "%s:Error setting up EDAC device: %d\n", ecc_name, rc);
        return rc;