From: Daniel Vetter <daniel@ffwll.ch>
To: Tian Tao <tiantao6@hisilicon.com>
Cc: tzimmermann@suse.de, airlied@linux.ie, dri-devel@lists.freedesktop.org
Subject: Re: [PATCH] drm/pci: Use pcim_enable_device()
Date: Thu, 7 Jan 2021 18:01:42 +0100 [thread overview]
Message-ID: <X/c+dp2HaVpe2QDI@phenom.ffwll.local> (raw)
In-Reply-To: <1609151996-52706-1-git-send-email-tiantao6@hisilicon.com>
On Mon, Dec 28, 2020 at 06:39:56PM +0800, Tian Tao wrote:
> Using the managed function simplifies the error handling. After
> unloading the driver, the PCI device should now get disabled as
> well.
>
> Signed-off-by: Tian Tao <tiantao6@hisilicon.com>
We cant do this in core code because it changes the order of how the
cleanup code is done. Also this is legacy code, pls don't touch that, not
worth the effort :-)
-Daniel
> ---
> drivers/gpu/drm/drm_pci.c | 3 +--
> 1 file changed, 1 insertion(+), 2 deletions(-)
>
> diff --git a/drivers/gpu/drm/drm_pci.c b/drivers/gpu/drm/drm_pci.c
> index 6dba4b8..0616172 100644
> --- a/drivers/gpu/drm/drm_pci.c
> +++ b/drivers/gpu/drm/drm_pci.c
> @@ -207,7 +207,7 @@ static int drm_get_pci_dev(struct pci_dev *pdev,
> if (IS_ERR(dev))
> return PTR_ERR(dev);
>
> - ret = pci_enable_device(pdev);
> + ret = pcim_enable_device(pdev);
> if (ret)
> goto err_free;
>
> @@ -234,7 +234,6 @@ static int drm_get_pci_dev(struct pci_dev *pdev,
>
> err_agp:
> drm_pci_agp_destroy(dev);
> - pci_disable_device(pdev);
> err_free:
> drm_dev_put(dev);
> return ret;
> --
> 2.7.4
>
--
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
prev parent reply other threads:[~2021-01-07 17:01 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-12-28 10:39 [PATCH] drm/pci: Use pcim_enable_device() Tian Tao
2021-01-07 17:01 ` Daniel Vetter [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=X/c+dp2HaVpe2QDI@phenom.ffwll.local \
--to=daniel@ffwll.ch \
--cc=airlied@linux.ie \
--cc=dri-devel@lists.freedesktop.org \
--cc=tiantao6@hisilicon.com \
--cc=tzimmermann@suse.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox