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 /drivers/gpu/vga | |
| parent | vgaarb: remove VGA_DEFAULT_DEVICE (diff) | |
| download | linux-dev-b0b514abc4cf2841ee1e0833252b2e8a78401276.tar.xz linux-dev-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 'drivers/gpu/vga')
| -rw-r--r-- | drivers/gpu/vga/vgaarb.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/drivers/gpu/vga/vgaarb.c b/drivers/gpu/vga/vgaarb.c index 949fde433ea2..fccc7ef5153a 100644 --- a/drivers/gpu/vga/vgaarb.c +++ b/drivers/gpu/vga/vgaarb.c @@ -284,12 +284,6 @@ static struct vga_device *__vga_tryget(struct vga_device *vgadev, if (vgadev == conflict) continue; - /* Check if the architecture allows a conflict between those - * 2 devices or if they are on separate domains - */ - if (!vga_conflicts(vgadev->pdev, conflict->pdev)) - continue; - /* We have a possible conflict. before we go further, we must * check if we sit on the same bus as the conflicting device. * if we don't, then we must tie both IO and MEM resources |