mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Alex Williamson <alex.williamson@redhat.com>
To: airlied@linux.ie, dri-devel@lists.freedesktop.org
Cc: alex.williamson@redhat.com, linux-kernel@vger.kernel.org
Subject: [PATCH 1/2] vga_switcheroo: Remove unbalanced pci_enable_device
Date: Sun, 01 May 2011 18:49:33 -0600	[thread overview]
Message-ID: <20110502004928.2307.25274.stgit@ul30vt.home> (raw)
In-Reply-To: <20110502004806.2307.34136.stgit@ul30vt.home>

This is unbalanced and probably more fitting for the client
to take care of.  Remove it.

Signed-off-by: Alex Williamson <alex.williamson@redhat.com>
---

 drivers/gpu/vga/vga_switcheroo.c |    6 ------
 1 files changed, 0 insertions(+), 6 deletions(-)

diff --git a/drivers/gpu/vga/vga_switcheroo.c b/drivers/gpu/vga/vga_switcheroo.c
index e01cacb..f0f244d 100644
--- a/drivers/gpu/vga/vga_switcheroo.c
+++ b/drivers/gpu/vga/vga_switcheroo.c
@@ -215,7 +215,6 @@ static int vga_switchoff(struct vga_switcheroo_client *client)
 /* stage one happens before delay */
 static int vga_switchto_stage1(struct vga_switcheroo_client *new_client)
 {
-	int ret;
 	int i;
 	struct vga_switcheroo_client *active = NULL;
 
@@ -231,11 +230,6 @@ static int vga_switchto_stage1(struct vga_switcheroo_client *new_client)
 	if (!active)
 		return 0;
 
-	/* power up the first device */
-	ret = pci_enable_device(new_client->pdev);
-	if (ret)
-		return ret;
-
 	if (new_client->pwr_state == VGA_SWITCHEROO_OFF)
 		vga_switchon(new_client);
 


  reply	other threads:[~2011-05-02  0:50 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-05-02  0:49 [PATCH 0/2] vga switcheroo: Prevent nouveau irq handler from kill the system Alex Williamson
2011-05-02  0:49 ` Alex Williamson [this message]
2011-05-04  3:49   ` [PATCH 1/2] vga_switcheroo: Remove unbalanced pci_enable_device Dave Airlie
2011-05-02  0:49 ` [PATCH 2/2] drm/nouveau: Check that the device is enabled before processing interrupt Alex Williamson
2011-05-04  3:50   ` Dave Airlie
2011-05-04  4:18     ` Alex Williamson
2011-05-04  4:22       ` Dave Airlie
2011-05-04  4:47         ` Alex Williamson
2011-05-04  4:55           ` Dave Airlie

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=20110502004928.2307.25274.stgit@ul30vt.home \
    --to=alex.williamson@redhat.com \
    --cc=airlied@linux.ie \
    --cc=dri-devel@lists.freedesktop.org \
    --cc=linux-kernel@vger.kernel.org \
    /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

all inboxes | Powered by JetHome®