linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] drm/radeon: Clean up code in radeon_pci_shutdown()
@ 2019-11-11 20:27 Kyle Mahlkuch
  2019-11-11 20:35 ` Alex Deucher
  0 siblings, 1 reply; 2+ messages in thread
From: Kyle Mahlkuch @ 2019-11-11 20:27 UTC (permalink / raw)
  Cc: alexander.deucher, christian.koenig, David1.Zhou, amd-gfx,
	linux-kernel, KyleMahlkuch

From: KyleMahlkuch <kmahlkuc@linux.vnet.ibm.com>

This fixes the formatting on one comment and consolidates the
pci_get_drvdata() into the radeon_suspend_kms().

Signed-off-by: Kyle Mahlkuch <kmahlkuc@linux.vnet.ibm.com>
---
 drivers/gpu/drm/radeon/radeon_drv.c | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/drivers/gpu/drm/radeon/radeon_drv.c b/drivers/gpu/drm/radeon/radeon_drv.c
index 4528f4d..357d29a 100644
--- a/drivers/gpu/drm/radeon/radeon_drv.c
+++ b/drivers/gpu/drm/radeon/radeon_drv.c
@@ -379,10 +379,6 @@ static int radeon_pci_probe(struct pci_dev *pdev,
 static void
 radeon_pci_shutdown(struct pci_dev *pdev)
 {
-#ifdef CONFIG_PPC64
-	struct drm_device *ddev = pci_get_drvdata(pdev);
-#endif
-
 	/* if we are running in a VM, make sure the device
 	 * torn down properly on reboot/shutdown
 	 */
@@ -390,13 +386,14 @@ static int radeon_pci_probe(struct pci_dev *pdev,
 		radeon_pci_remove(pdev);
 
 #ifdef CONFIG_PPC64
-	/* Some adapters need to be suspended before a
+	/*
+	 * Some adapters need to be suspended before a
 	 * shutdown occurs in order to prevent an error
 	 * during kexec.
 	 * Make this power specific becauase it breaks
 	 * some non-power boards.
 	 */
-	radeon_suspend_kms(ddev, true, true, false);
+	radeon_suspend_kms(pci_get_drvdata(pdev), true, true, false);
 #endif
 }
 
-- 
1.8.3.1


^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [PATCH] drm/radeon: Clean up code in radeon_pci_shutdown()
  2019-11-11 20:27 [PATCH] drm/radeon: Clean up code in radeon_pci_shutdown() Kyle Mahlkuch
@ 2019-11-11 20:35 ` Alex Deucher
  0 siblings, 0 replies; 2+ messages in thread
From: Alex Deucher @ 2019-11-11 20:35 UTC (permalink / raw)
  To: Kyle Mahlkuch
  Cc: Chunming Zhou, LKML, amd-gfx list, Deucher, Alexander, Christian Koenig

On Mon, Nov 11, 2019 at 3:29 PM Kyle Mahlkuch
<kmahlkuc@linux.vnet.ibm.com> wrote:
>
> From: KyleMahlkuch <kmahlkuc@linux.vnet.ibm.com>
>
> This fixes the formatting on one comment and consolidates the
> pci_get_drvdata() into the radeon_suspend_kms().
>
> Signed-off-by: Kyle Mahlkuch <kmahlkuc@linux.vnet.ibm.com>

Applied.  Thanks!

Alex

> ---
>  drivers/gpu/drm/radeon/radeon_drv.c | 9 +++------
>  1 file changed, 3 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/gpu/drm/radeon/radeon_drv.c b/drivers/gpu/drm/radeon/radeon_drv.c
> index 4528f4d..357d29a 100644
> --- a/drivers/gpu/drm/radeon/radeon_drv.c
> +++ b/drivers/gpu/drm/radeon/radeon_drv.c
> @@ -379,10 +379,6 @@ static int radeon_pci_probe(struct pci_dev *pdev,
>  static void
>  radeon_pci_shutdown(struct pci_dev *pdev)
>  {
> -#ifdef CONFIG_PPC64
> -       struct drm_device *ddev = pci_get_drvdata(pdev);
> -#endif
> -
>         /* if we are running in a VM, make sure the device
>          * torn down properly on reboot/shutdown
>          */
> @@ -390,13 +386,14 @@ static int radeon_pci_probe(struct pci_dev *pdev,
>                 radeon_pci_remove(pdev);
>
>  #ifdef CONFIG_PPC64
> -       /* Some adapters need to be suspended before a
> +       /*
> +        * Some adapters need to be suspended before a
>          * shutdown occurs in order to prevent an error
>          * during kexec.
>          * Make this power specific becauase it breaks
>          * some non-power boards.
>          */
> -       radeon_suspend_kms(ddev, true, true, false);
> +       radeon_suspend_kms(pci_get_drvdata(pdev), true, true, false);
>  #endif
>  }
>
> --
> 1.8.3.1
>
> _______________________________________________
> amd-gfx mailing list
> amd-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/amd-gfx

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2019-11-11 20:36 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-11-11 20:27 [PATCH] drm/radeon: Clean up code in radeon_pci_shutdown() Kyle Mahlkuch
2019-11-11 20:35 ` Alex Deucher

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).