diff mbox series

[2/2] drm/ast: Request PCI BAR with devres

Message ID 20240807083018.8734-4-pstanner@redhat.com (mailing list archive)
State New, archived
Headers show
Series [1/2] PCI: Deprecate pcim_iomap_regions() in favor of pcim_iomap_region() | expand

Commit Message

Philipp Stanner Aug. 7, 2024, 8:30 a.m. UTC
ast currently ioremaps two PCI BARs using pcim_iomap(). It does not
perform a request on the regions, however, which would make the driver a
bit more robust.

PCI now offers pcim_iomap_region(), a managed function which both
requests and ioremaps a BAR.

Replace pcim_iomap() with pcim_iomap_region().

Suggested-by: Thomas Zimmermann <tzimmermann@suse.de>
Signed-off-by: Philipp Stanner <pstanner@redhat.com>
---
 drivers/gpu/drm/ast/ast_drv.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

Comments

Thomas Zimmermann Aug. 7, 2024, 8:59 a.m. UTC | #1
Am 07.08.24 um 10:30 schrieb Philipp Stanner:
> ast currently ioremaps two PCI BARs using pcim_iomap(). It does not
> perform a request on the regions, however, which would make the driver a
> bit more robust.
>
> PCI now offers pcim_iomap_region(), a managed function which both
> requests and ioremaps a BAR.
>
> Replace pcim_iomap() with pcim_iomap_region().
>
> Suggested-by: Thomas Zimmermann <tzimmermann@suse.de>
> Signed-off-by: Philipp Stanner <pstanner@redhat.com>

Reviewed-by: Thomas Zimmermann <tzimmermann@suse.de>

> ---
>   drivers/gpu/drm/ast/ast_drv.c | 12 ++++++------
>   1 file changed, 6 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/gpu/drm/ast/ast_drv.c b/drivers/gpu/drm/ast/ast_drv.c
> index aae019e79bda..1fadaadfbe39 100644
> --- a/drivers/gpu/drm/ast/ast_drv.c
> +++ b/drivers/gpu/drm/ast/ast_drv.c
> @@ -287,9 +287,9 @@ static int ast_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
>   	if (ret)
>   		return ret;
>   
> -	regs = pcim_iomap(pdev, 1, 0);
> -	if (!regs)
> -		return -EIO;
> +	regs = pcim_iomap_region(pdev, 1, "ast");
> +	if (IS_ERR(regs))
> +		return PTR_ERR(regs);
>   
>   	if (pdev->revision >= 0x40) {
>   		/*
> @@ -311,9 +311,9 @@ static int ast_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
>   
>   		if (len < AST_IO_MM_LENGTH)
>   			return -EIO;
> -		ioregs = pcim_iomap(pdev, 2, 0);
> -		if (!ioregs)
> -			return -EIO;
> +		ioregs = pcim_iomap_region(pdev, 2, "ast");
> +		if (IS_ERR(ioregs))
> +			return PTR_ERR(ioregs);
>   	} else {
>   		/*
>   		 * Anything else is best effort.
diff mbox series

Patch

diff --git a/drivers/gpu/drm/ast/ast_drv.c b/drivers/gpu/drm/ast/ast_drv.c
index aae019e79bda..1fadaadfbe39 100644
--- a/drivers/gpu/drm/ast/ast_drv.c
+++ b/drivers/gpu/drm/ast/ast_drv.c
@@ -287,9 +287,9 @@  static int ast_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
 	if (ret)
 		return ret;
 
-	regs = pcim_iomap(pdev, 1, 0);
-	if (!regs)
-		return -EIO;
+	regs = pcim_iomap_region(pdev, 1, "ast");
+	if (IS_ERR(regs))
+		return PTR_ERR(regs);
 
 	if (pdev->revision >= 0x40) {
 		/*
@@ -311,9 +311,9 @@  static int ast_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
 
 		if (len < AST_IO_MM_LENGTH)
 			return -EIO;
-		ioregs = pcim_iomap(pdev, 2, 0);
-		if (!ioregs)
-			return -EIO;
+		ioregs = pcim_iomap_region(pdev, 2, "ast");
+		if (IS_ERR(ioregs))
+			return PTR_ERR(ioregs);
 	} else {
 		/*
 		 * Anything else is best effort.