From de73c17cc1f3128989273c3693a24205120aaa37 Mon Sep 17 00:00:00 2001
From: Igor Murzov <e-mail@date.by>
Date: Thu, 25 Oct 2012 13:09:01 +0000
Subject: [PATCH] --- yaml --- r: 345335 b: refs/heads/master c:
 9499c82da27cf4ce7e919fc26bd26187a71fe664 h: refs/heads/master i:   345333:
 c15940d679f9ca1612ff8da3de25f453632a162d   345331:
 7a5fb669461b169ecde4cfcc69de0b33e9c9b2b0   345327:
 ed083f872aee8d59e40221acec116162eda8a966 v: v3

---
 [refs]                                 | 2 +-
 trunk/drivers/gpu/vga/vga_switcheroo.c | 6 ------
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index c4eb667c29b6..134b73e2d8a6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 83ef7777aa5ffbf08a71e14f0a127de315293113
+refs/heads/master: 9499c82da27cf4ce7e919fc26bd26187a71fe664
diff --git a/trunk/drivers/gpu/vga/vga_switcheroo.c b/trunk/drivers/gpu/vga/vga_switcheroo.c
index e25cf31faab2..fa60add0ff63 100644
--- a/trunk/drivers/gpu/vga/vga_switcheroo.c
+++ b/trunk/drivers/gpu/vga/vga_switcheroo.c
@@ -18,7 +18,6 @@
  */
 
 #include <linux/module.h>
-#include <linux/dmi.h>
 #include <linux/seq_file.h>
 #include <linux/uaccess.h>
 #include <linux/fs.h>
@@ -376,7 +375,6 @@ vga_switcheroo_debugfs_write(struct file *filp, const char __user *ubuf,
 			     size_t cnt, loff_t *ppos)
 {
 	char usercmd[64];
-	const char *pdev_name;
 	int ret;
 	bool delay = false, can_switch;
 	bool just_mux = false;
@@ -468,7 +466,6 @@ vga_switcheroo_debugfs_write(struct file *filp, const char __user *ubuf,
 		goto out;
 
 	if (can_switch) {
-		pdev_name = pci_name(client->pdev);
 		ret = vga_switchto_stage1(client);
 		if (ret)
 			printk(KERN_ERR "vga_switcheroo: switching failed stage 1 %d\n", ret);
@@ -540,7 +537,6 @@ static int vga_switcheroo_debugfs_init(struct vgasr_priv *priv)
 int vga_switcheroo_process_delayed_switch(void)
 {
 	struct vga_switcheroo_client *client;
-	const char *pdev_name;
 	int ret;
 	int err = -EINVAL;
 
@@ -555,7 +551,6 @@ int vga_switcheroo_process_delayed_switch(void)
 	if (!client || !check_can_switch())
 		goto err;
 
-	pdev_name = pci_name(client->pdev);
 	ret = vga_switchto_stage2(client);
 	if (ret)
 		printk(KERN_ERR "vga_switcheroo: delayed switching failed stage 2 %d\n", ret);
@@ -567,4 +562,3 @@ int vga_switcheroo_process_delayed_switch(void)
 	return err;
 }
 EXPORT_SYMBOL(vga_switcheroo_process_delayed_switch);
-