[PATCH] drm/ast: Fix missing conversions to managed API

[PATCH] drm/ast: Fix missing conversions to managed API

[Takashi Iwai]

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>
---
 drivers/gpu/drm/ast/ast_main.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/gpu/drm/ast/ast_main.c b/drivers/gpu/drm/ast/ast_main.c
index 0ac3c2039c4b..c29cc7f19863 100644
--- a/drivers/gpu/drm/ast/ast_main.c
+++ b/drivers/gpu/drm/ast/ast_main.c
@@ -413,7 +413,7 @@ struct ast_private *ast_device_create(const struct drm_driver *drv,
 
 	pci_set_drvdata(pdev, dev);
 
-	ast->regs = pci_iomap(pdev, 1, 0);
+	ast->regs = pcim_iomap(pdev, 1, 0);
 	if (!ast->regs)
 		return ERR_PTR(-EIO);
 
@@ -429,7 +429,7 @@ struct ast_private *ast_device_create(const struct drm_driver *drv,
 
 	/* "map" IO regs if the above hasn't done so already */
 	if (!ast->ioregs) {
-		ast->ioregs = pci_iomap(pdev, 2, 0);
+		ast->ioregs = pcim_iomap(pdev, 2, 0);
 		if (!ast->ioregs)
 			return ERR_PTR(-EIO);
 	}
-- 
2.26.2

_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

Re: [PATCH] drm/ast: Fix missing conversions to managed API

[Thomas Zimmermann]

[-- Attachment #1.1.1: Type: text/plain, Size: 1659 bytes --]



Am 21.04.21 um 19:04 schrieb Takashi Iwai:
> 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>

Added to drm-misc-next. Thanks, Takashi.

> ---
>   drivers/gpu/drm/ast/ast_main.c | 4 ++--
>   1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/gpu/drm/ast/ast_main.c b/drivers/gpu/drm/ast/ast_main.c
> index 0ac3c2039c4b..c29cc7f19863 100644
> --- a/drivers/gpu/drm/ast/ast_main.c
> +++ b/drivers/gpu/drm/ast/ast_main.c
> @@ -413,7 +413,7 @@ struct ast_private *ast_device_create(const struct drm_driver *drv,
>   
>   	pci_set_drvdata(pdev, dev);
>   
> -	ast->regs = pci_iomap(pdev, 1, 0);
> +	ast->regs = pcim_iomap(pdev, 1, 0);
>   	if (!ast->regs)
>   		return ERR_PTR(-EIO);
>   
> @@ -429,7 +429,7 @@ struct ast_private *ast_device_create(const struct drm_driver *drv,
>   
>   	/* "map" IO regs if the above hasn't done so already */
>   	if (!ast->ioregs) {
> -		ast->ioregs = pci_iomap(pdev, 2, 0);
> +		ast->ioregs = pcim_iomap(pdev, 2, 0);
>   		if (!ast->ioregs)
>   			return ERR_PTR(-EIO);
>   	}
> 

-- 
Thomas Zimmermann
Graphics Driver Developer
SUSE Software Solutions Germany GmbH
Maxfeldstr. 5, 90409 Nürnberg, Germany
(HRB 36809, AG Nürnberg)
Geschäftsführer: Felix Imendörffer


[-- Attachment #1.2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 840 bytes --]

[-- Attachment #2: Type: text/plain, Size: 160 bytes --]

_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel