drm/ast: Fix missing conversions to managed API
authorTakashi Iwai <tiwai@suse.de>
Wed, 21 Apr 2021 17:04:58 +0000 (19:04 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 14 Jul 2021 14:56:15 +0000 (16:56 +0200)
[ Upstream commit 9ea172a9a3f4a7c5e876469509fc18ddefc7d49d ]

The commit 7cbb93d89838 ("drm/ast: Use managed pci functions")
converted a few PCI accessors to the managed API and dropped the
manual pci_iounmap() calls, but it seems to have forgotten converting
pci_iomap() to the managed one.  It resulted in the leftover resources
after the driver unbind.  Let's fix them.

Fixes: 7cbb93d89838 ("drm/ast: Use managed pci functions")
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
Link: https://patchwork.freedesktop.org/patch/msgid/20210421170458.21178-1-tiwai@suse.de
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/gpu/drm/ast/ast_main.c

index 77066bca87939f180d80f4ae25571e1e269bbd88..ee82b2ddf93254f90d4cf7efe8392e18f4bfc83b 100644 (file)
@@ -409,7 +409,7 @@ struct ast_private *ast_device_create(struct drm_driver *drv,
        dev->pdev = pdev;
        pci_set_drvdata(pdev, dev);
 
-       ast->regs = pci_iomap(dev->pdev, 1, 0);
+       ast->regs = pcim_iomap(pdev, 1, 0);
        if (!ast->regs)
                return ERR_PTR(-EIO);
 
@@ -425,7 +425,7 @@ struct ast_private *ast_device_create(struct drm_driver *drv,
 
        /* "map" IO regs if the above hasn't done so already */
        if (!ast->ioregs) {
-               ast->ioregs = pci_iomap(dev->pdev, 2, 0);
+               ast->ioregs = pcim_iomap(pdev, 2, 0);
                if (!ast->ioregs)
                        return ERR_PTR(-EIO);
        }