Skip to content

Commit dc593fd

Browse files
committed
PCI/VGA: Remove empty vga_arb_device_card_gone()
vga_arb_device_card_gone() has always been empty. Remove it. Link: https://lore.kernel.org/r/20220224224753.297579-9-helgaas@kernel.org Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
1 parent 37114e4 commit dc593fd

1 file changed

Lines changed: 1 addition & 15 deletions

File tree

drivers/pci/vgaarb.c

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -123,8 +123,6 @@ static int vga_str_to_iostate(char *buf, int str_size, int *io_state)
123123
/* this is only used a cookie - it should not be dereferenced */
124124
static struct pci_dev *vga_default;
125125

126-
static void vga_arb_device_card_gone(struct pci_dev *pdev);
127-
128126
/* Find somebody in our list */
129127
static struct vga_device *vgadev_find(struct pci_dev *pdev)
130128
{
@@ -878,10 +876,6 @@ static bool vga_arbiter_del_pci_device(struct pci_dev *pdev)
878876
/* Remove entry from list */
879877
list_del(&vgadev->list);
880878
vga_count--;
881-
/* Notify userland driver that the device is gone so it discards
882-
* it's copies of the pci_dev pointer
883-
*/
884-
vga_arb_device_card_gone(pdev);
885879

886880
/* Wake up all possible waiters */
887881
wake_up_all(&vga_wait_queue);
@@ -1131,9 +1125,7 @@ static ssize_t vga_arb_read(struct file *file, char __user *buf,
11311125
if (lbuf == NULL)
11321126
return -ENOMEM;
11331127

1134-
/* Shields against vga_arb_device_card_gone (pci_dev going
1135-
* away), and allows access to vga list
1136-
*/
1128+
/* Protects vga_list */
11371129
spin_lock_irqsave(&vga_lock, flags);
11381130

11391131
/* If we are targeting the default, use it */
@@ -1150,8 +1142,6 @@ static ssize_t vga_arb_read(struct file *file, char __user *buf,
11501142
/* Wow, it's not in the list, that shouldn't happen,
11511143
* let's fix us up and return invalid card
11521144
*/
1153-
if (pdev == priv->target)
1154-
vga_arb_device_card_gone(pdev);
11551145
spin_unlock_irqrestore(&vga_lock, flags);
11561146
len = sprintf(lbuf, "invalid");
11571147
goto done;
@@ -1495,10 +1485,6 @@ static int vga_arb_release(struct inode *inode, struct file *file)
14951485
return 0;
14961486
}
14971487

1498-
static void vga_arb_device_card_gone(struct pci_dev *pdev)
1499-
{
1500-
}
1501-
15021488
/*
15031489
* callback any registered clients to let them know we have a
15041490
* change in VGA cards

0 commit comments

Comments
 (0)