Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 345335
b: refs/heads/master
c: 9499c82
h: refs/heads/master
i:
  345333: c15940d
  345331: 7a5fb66
  345327: ed083f8
v: v3
  • Loading branch information
Igor Murzov authored and Dave Airlie committed Nov 20, 2012
1 parent 65fb933 commit de73c17
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 7 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 83ef7777aa5ffbf08a71e14f0a127de315293113
refs/heads/master: 9499c82da27cf4ce7e919fc26bd26187a71fe664
6 changes: 0 additions & 6 deletions trunk/drivers/gpu/vga/vga_switcheroo.c
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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);
Expand Down Expand Up @@ -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;

Expand All @@ -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);
Expand All @@ -567,4 +562,3 @@ int vga_switcheroo_process_delayed_switch(void)
return err;
}
EXPORT_SYMBOL(vga_switcheroo_process_delayed_switch);

0 comments on commit de73c17

Please sign in to comment.