From: Huacai Chen <chenhuacai@loongson.cn>
To: David Airlie <airlied@linux.ie>, Daniel Vetter <daniel@ffwll.ch>,
Bjorn Helgaas <bhelgaas@google.com>
Cc: linux-pci@vger.kernel.org, dri-devel@lists.freedesktop.org,
Xuefeng Li <lixuefeng@loongson.cn>,
Huacai Chen <chenhuacai@gmail.com>
Subject: [PATCH V4 04/10] PCI/VGA: Remove empty vga_arb_device_card_gone()
Date: Fri, 27 Aug 2021 16:31:23 +0800 [thread overview]
Message-ID: <20210827083129.2781420-5-chenhuacai@loongson.cn> (raw)
In-Reply-To: <20210827083129.2781420-1-chenhuacai@loongson.cn>
From: Bjorn Helgaas <bhelgaas@google.com>
vga_arb_device_card_gone() has always been empty. Remove it.
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
---
drivers/pci/vgaarb.c | 16 +---------------
1 file changed, 1 insertion(+), 15 deletions(-)
diff --git a/drivers/pci/vgaarb.c b/drivers/pci/vgaarb.c
index e4153ab70481..c984c76b3fd7 100644
--- a/drivers/pci/vgaarb.c
+++ b/drivers/pci/vgaarb.c
@@ -104,8 +104,6 @@ static int vga_str_to_iostate(char *buf, int str_size, int *io_state)
/* this is only used a cookie - it should not be dereferenced */
static struct pci_dev *vga_default;
-static void vga_arb_device_card_gone(struct pci_dev *pdev);
-
/* Find somebody in our list */
static struct vga_device *vgadev_find(struct pci_dev *pdev)
{
@@ -741,10 +739,6 @@ static bool vga_arbiter_del_pci_device(struct pci_dev *pdev)
/* Remove entry from list */
list_del(&vgadev->list);
vga_count--;
- /* Notify userland driver that the device is gone so it discards
- * it's copies of the pci_dev pointer
- */
- vga_arb_device_card_gone(pdev);
/* Wake up all possible waiters */
wake_up_all(&vga_wait_queue);
@@ -994,9 +988,7 @@ static ssize_t vga_arb_read(struct file *file, char __user *buf,
if (lbuf == NULL)
return -ENOMEM;
- /* Shields against vga_arb_device_card_gone (pci_dev going
- * away), and allows access to vga list
- */
+ /* Protects vga_list */
spin_lock_irqsave(&vga_lock, flags);
/* If we are targeting the default, use it */
@@ -1013,8 +1005,6 @@ static ssize_t vga_arb_read(struct file *file, char __user *buf,
/* Wow, it's not in the list, that shouldn't happen,
* let's fix us up and return invalid card
*/
- if (pdev == priv->target)
- vga_arb_device_card_gone(pdev);
spin_unlock_irqrestore(&vga_lock, flags);
len = sprintf(lbuf, "invalid");
goto done;
@@ -1358,10 +1348,6 @@ static int vga_arb_release(struct inode *inode, struct file *file)
return 0;
}
-static void vga_arb_device_card_gone(struct pci_dev *pdev)
-{
-}
-
/*
* callback any registered clients to let them know we have a
* change in VGA cards
--
2.27.0
next prev parent reply other threads:[~2021-08-27 8:34 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-08-27 8:31 [PATCH V4 00/10] PCI/VGA: Rework default VGA device selection Huacai Chen
2021-08-27 8:31 ` [PATCH V4 01/10] PCI/VGA: Move vgaarb to drivers/pci Huacai Chen
2021-08-27 8:31 ` [PATCH V4 02/10] PCI/VGA: Replace full MIT license text with SPDX identifier Huacai Chen
2021-08-27 8:31 ` [PATCH V4 03/10] PCI/VGA: Use unsigned format string to print lock counts Huacai Chen
2021-08-27 8:31 ` Huacai Chen [this message]
2021-08-27 8:31 ` [PATCH V4 05/10] PCI/VGA: Move vga_arb_integrated_gpu() earlier in file Huacai Chen
2021-08-27 8:31 ` [PATCH V4 06/10] PCI/VGA: Prefer vga_default_device() Huacai Chen
2021-08-27 8:31 ` [PATCH V4 07/10] PCI/VGA: Split out vga_arb_update_default_device() Huacai Chen
2021-08-27 8:31 ` [PATCH V4 08/10] PCI/VGA: Log bridge control messages when adding devices Huacai Chen
2021-08-27 8:31 ` [PATCH V4 09/10] PCI/VGA: Rework default VGA device selection (Step 1) Huacai Chen
2021-08-27 8:31 ` [PATCH V4 10/10] PCI/VGA: Rework default VGA device selection (Step 2) Huacai Chen
2021-09-09 17:59 ` [PATCH V4 00/10] PCI/VGA: Rework default VGA device selection Bjorn Helgaas
2021-09-11 9:17 ` Huacai Chen
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=20210827083129.2781420-5-chenhuacai@loongson.cn \
--to=chenhuacai@loongson.cn \
--cc=airlied@linux.ie \
--cc=bhelgaas@google.com \
--cc=chenhuacai@gmail.com \
--cc=daniel@ffwll.ch \
--cc=dri-devel@lists.freedesktop.org \
--cc=linux-pci@vger.kernel.org \
--cc=lixuefeng@loongson.cn \
/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;
as well as URLs for NNTP newsgroup(s).