| Message ID | 20201012124506.3406909-4-philmd@redhat.com |
|---|---|
| State | New |
| Headers | show |
| Series | hw: Use PCI macros from 'hw/pci/pci.h' | expand |
On Mon, Oct 12, 2020 at 02:45:04PM +0200, Philippe Mathieu-Daudé wrote: > From: Philippe Mathieu-Daudé <f4bug@amsat.org> > > We already have a generic PCI_FUNC() macro in "hw/pci/pci.h" to > extract the PCI function identifier, use it. > > Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org> Acked-by: David Gibson <david@gibson.dropbear.id.au> > --- > hw/pci-host/uninorth.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/hw/pci-host/uninorth.c b/hw/pci-host/uninorth.c > index 1ed1072eeb5..c21de0ab805 100644 > --- a/hw/pci-host/uninorth.c > +++ b/hw/pci-host/uninorth.c > @@ -65,7 +65,7 @@ static uint32_t unin_get_config_reg(uint32_t reg, uint32_t addr) > if (slot == 32) { > slot = -1; /* XXX: should this be 0? */ > } > - func = (reg >> 8) & 7; > + func = PCI_FUNC(reg >> 8); > > /* ... and then convert them to x86 format */ > /* config pointer */
diff --git a/hw/pci-host/uninorth.c b/hw/pci-host/uninorth.c index 1ed1072eeb5..c21de0ab805 100644 --- a/hw/pci-host/uninorth.c +++ b/hw/pci-host/uninorth.c @@ -65,7 +65,7 @@ static uint32_t unin_get_config_reg(uint32_t reg, uint32_t addr) if (slot == 32) { slot = -1; /* XXX: should this be 0? */ } - func = (reg >> 8) & 7; + func = PCI_FUNC(reg >> 8); /* ... and then convert them to x86 format */ /* config pointer */