Blob Blame History Raw
From 9ea172a9a3f4a7c5e876469509fc18ddefc7d49d Mon Sep 17 00:00:00 2001
From: Takashi Iwai <tiwai@suse.de>
Date: Wed, 21 Apr 2021 19:04:58 +0200
Subject: drm/ast: Fix missing conversions to managed API
Git-commit: 9ea172a9a3f4a7c5e876469509fc18ddefc7d49d
Patch-mainline: v5.14-rc1
References: git-fixes

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: Patrik Jakobsson <pjakobsson@suse.de>
---
 drivers/gpu/drm/ast/ast_main.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- a/drivers/gpu/drm/ast/ast_main.c
+++ b/drivers/gpu/drm/ast/ast_main.c
@@ -391,7 +391,7 @@ int ast_driver_load(struct drm_device *d
 	dev->dev_private = ast;
 	ast->dev = dev;
 
-	ast->regs = pci_iomap(dev->pdev, 1, 0);
+	ast->regs = pcim_iomap(dev->pdev, 1, 0);
 	if (!ast->regs) {
 		ret = -EIO;
 		goto out_free;
@@ -409,7 +409,7 @@ int ast_driver_load(struct drm_device *d
 
 	/* "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(dev->pdev, 2, 0);
 		if (!ast->ioregs) {
 			ret = -EIO;
 			goto out_free;