On Thu, Jun 11, 2020 at 02:04:03PM +0200, Thomas Zimmermann wrote:
> Hi
>
> Am 15.04.20 um 09:40 schrieb Daniel Vetter:
> > Allows us to remove a bit of cleanup code.
> >
> > Signed-off-by: Daniel Vetter <daniel.vetter@xxxxxxxxx>
> > Cc: Dave Airlie <airlied@xxxxxxxxxx>
> > Cc: Thomas Zimmermann <tzimmermann@xxxxxxx>
> > Cc: Gerd Hoffmann <kraxel@xxxxxxxxxx>
> > Cc: Daniel Vetter <daniel.vetter@xxxxxxxx>
> > Cc: Emil Velikov <emil.velikov@xxxxxxxxxxxxx>
> > Cc: "Noralf Trønnes" <noralf@xxxxxxxxxxx>
> > Cc: Sam Ravnborg <sam@xxxxxxxxxxxx>
> > Cc: "Christian König" <christian.koenig@xxxxxxx>
> > Cc: "Y.C. Chen" <yc_chen@xxxxxxxxxxxxxx>
>
> Reviewed-by: Thomas Zimmermann <tzimmermann@xxxxxxx>
>
> Thanks for answering my questions. Sorry for never getting back to it.
Nw, patch applied now, thanks for your review.
-Daniel
>
> Best regards
> Thomas
>
> > ---
> > drivers/gpu/drm/ast/ast_drv.c | 10 +++-------
> > drivers/gpu/drm/ast/ast_main.c | 3 ---
> > 2 files changed, 3 insertions(+), 10 deletions(-)
> >
> > diff --git a/drivers/gpu/drm/ast/ast_drv.c b/drivers/gpu/drm/ast/ast_drv.c
> > index b7ba22dddcad..48a9cc4e080a 100644
> > --- a/drivers/gpu/drm/ast/ast_drv.c
> > +++ b/drivers/gpu/drm/ast/ast_drv.c
> > @@ -91,15 +91,13 @@ static int ast_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
> >
> > ast_kick_out_firmware_fb(pdev);
> >
> > - ret = pci_enable_device(pdev);
> > + ret = pcim_enable_device(pdev);
> > if (ret)
> > return ret;
> >
> > dev = drm_dev_alloc(&driver, &pdev->dev);
> > - if (IS_ERR(dev)) {
> > - ret = PTR_ERR(dev);
> > - goto err_pci_disable_device;
> > - }
> > + if (IS_ERR(dev))
> > + return PTR_ERR(dev);
> >
> > dev->pdev = pdev;
> > pci_set_drvdata(pdev, dev);
> > @@ -120,8 +118,6 @@ static int ast_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
> > ast_driver_unload(dev);
> > err_drm_dev_put:
> > drm_dev_put(dev);
> > -err_pci_disable_device:
> > - pci_disable_device(pdev);
> > return ret;
> >
> > }
> > diff --git a/drivers/gpu/drm/ast/ast_main.c b/drivers/gpu/drm/ast/ast_main.c
> > index e5398e3dabe7..1b35728ad871 100644
> > --- a/drivers/gpu/drm/ast/ast_main.c
> > +++ b/drivers/gpu/drm/ast/ast_main.c
> > @@ -531,8 +531,5 @@ void ast_driver_unload(struct drm_device *dev)
> > drm_mode_config_cleanup(dev);
> >
> > ast_mm_fini(ast);
> > - if (ast->ioregs != ast->regs + AST_IO_MM_OFFSET)
> > - pci_iounmap(dev->pdev, ast->ioregs);
> > - pci_iounmap(dev->pdev, ast->regs);
> > kfree(ast);
> > }
> >
>
> --
> 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
>
--
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
_______________________________________________
dri-devel mailing list
dri-devel@xxxxxxxxxxxxxxxxxxxxx
https://lists.freedesktop.org/mailman/listinfo/dri-devel
