lkml.org 
[lkml]   [2021]   [Jul]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.12 355/700] drm/ast: Fix missing conversions to managed API
    Date
    From: Takashi Iwai <tiwai@suse.de>

    [ 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 | 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.30.2


    \
     
     \ /
      Last update: 2021-07-12 09:50    [W:5.023 / U:0.000 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site