diff options
| author |   Christoph Hellwig <hch@lst.de> | 2021-07-16 08:16:29 +0200 |
|---|---|---|
| committer |   Christian König <christian.koenig@amd.com> | 2021-07-21 10:28:47 +0200 |
| commit | b0b514abc4cf2841ee1e0833252b2e8a78401276 (patch) | |
| tree | 045cd358d59ff5d9588c0630d80bea50b08c5ab7 /include/linux/vgaarb.h | |
| parent | vgaarb: remove VGA_DEFAULT_DEVICE (diff) | |
| download | wireguard-linux-b0b514abc4cf2841ee1e0833252b2e8a78401276.tar.xz wireguard-linux-b0b514abc4cf2841ee1e0833252b2e8a78401276.zip | |
vgaarb: remove vga_conflicts
vga_conflicts only has a single caller and none of the arch overrides
mentioned in the comment. Just remove it and the thus dead check in the
caller.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Link: https://patchwork.freedesktop.org/patch/msgid/20210716061634.2446357-3-hch@lst.de
Acked-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Christian König <christian.koenig@amd.com>
Diffstat (limited to 'include/linux/vgaarb.h')
| -rw-r--r-- | include/linux/vgaarb.h | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/include/linux/vgaarb.h b/include/linux/vgaarb.h index 26ec8a057d2a..ca5160218538 100644 --- a/include/linux/vgaarb.h +++ b/include/linux/vgaarb.h @@ -122,18 +122,6 @@ static inline void vga_set_default_device(struct pci_dev *pdev) { } static inline int vga_remove_vgacon(struct pci_dev *pdev) { return 0; } #endif -/* - * Architectures should define this if they have several - * independent PCI domains that can afford concurrent VGA - * decoding - */ -#ifndef __ARCH_HAS_VGA_CONFLICT -static inline int vga_conflicts(struct pci_dev *p1, struct pci_dev *p2) -{ - return 1; -} -#endif - #if defined(CONFIG_VGA_ARB) int vga_client_register(struct pci_dev *pdev, void *cookie, void (*irq_set_state)(void *cookie, bool state), |