path: root/drivers/gpu/vga/vgaarb.c
diff options
authorAl Viro <viro@zeniv.linux.org.uk>2015-11-26 23:24:14 -0500
committerAl Viro <viro@zeniv.linux.org.uk>2015-12-06 21:17:17 -0500
commitdfbf53ed548e838ab933d1a7072ffc38cba3bae8 (patch)
tree1dbe865d4acf7444b04a99376cb445a52d4a9c41 /drivers/gpu/vga/vgaarb.c
parent03927c8acb63100046260711c06ba28b6b5936fb (diff)
vgaarb: remove bogus checks
neither ->release() nor ->poll() can be called unless ->open() has succeeded on the same struct file, so checking for "has open() failed" is pointless. What's more, ->poll() doesn't return -E... - it always returns a bitmap of POLL... values, so the dead code in that one had been actively bogus. Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'drivers/gpu/vga/vgaarb.c')
1 files changed, 0 insertions, 7 deletions
diff --git a/drivers/gpu/vga/vgaarb.c b/drivers/gpu/vga/vgaarb.c
index 3166e4bc4eb6..de083aade105 100644
--- a/drivers/gpu/vga/vgaarb.c
+++ b/drivers/gpu/vga/vgaarb.c
@@ -1161,12 +1161,8 @@ done:
static unsigned int vga_arb_fpoll(struct file *file, poll_table *wait)
- struct vga_arb_private *priv = file->private_data;
pr_debug("%s\n", __func__);
- if (priv == NULL)
- return -ENODEV;
poll_wait(file, &vga_wait_queue, wait);
return POLLIN;
@@ -1207,9 +1203,6 @@ static int vga_arb_release(struct inode *inode, struct file *file)
pr_debug("%s\n", __func__);
- if (priv == NULL)
- return -ENODEV;
spin_lock_irqsave(&vga_user_lock, flags);
for (i = 0; i < MAX_USER_CARDS; i++) {

Privacy Policy