From: Jan Beulich Date: Tue, 28 Apr 2020 15:49:55 +0000 (+0200) Subject: PCI: drop a redundant variable from pci_add_device() X-Git-Tag: archive/raspbian/4.14.0+80-gd101b417b7-1+rpi1^2~63^2~337 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=4ec07971f1c5a236a0d8c528d806efb6bfd3d1a6;p=xen.git PCI: drop a redundant variable from pci_add_device() Surrounding code already uses the available alternative, after all. Signed-off-by: Jan Beulich Acked-by: Andrew Cooper Reviewed-by: Paul Durrant --- diff --git a/xen/drivers/passthrough/pci.c b/xen/drivers/passthrough/pci.c index 5660f7e1c2..15114e7cbc 100644 --- a/xen/drivers/passthrough/pci.c +++ b/xen/drivers/passthrough/pci.c @@ -760,7 +760,6 @@ int pci_add_device(u16 seg, u8 bus, u8 devfn, { unsigned int idx = pos + PCI_SRIOV_BAR + i * 4; uint32_t bar = pci_conf_read32(pdev->sbdf, idx); - pci_sbdf_t sbdf = PCI_SBDF3(seg, bus, devfn); if ( (bar & PCI_BASE_ADDRESS_SPACE) == PCI_BASE_ADDRESS_SPACE_IO ) @@ -771,7 +770,8 @@ int pci_add_device(u16 seg, u8 bus, u8 devfn, seg, bus, slot, func, i); continue; } - ret = pci_size_mem_bar(sbdf, idx, NULL, &pdev->vf_rlen[i], + ret = pci_size_mem_bar(pdev->sbdf, idx, NULL, + &pdev->vf_rlen[i], PCI_BAR_VF | ((i == PCI_SRIOV_NUM_BARS - 1) ? PCI_BAR_LAST : 0));