On 25/09/2019 08:45, David Gibson wrote:
> No point having a two-line helper that's used exactly once, and not likely
> to be used anywhere else in future.
>
> Signed-off-by: David Gibson <da...@gibson.dropbear.id.au>
Reviewed-by: Cédric Le Goater <c...@kaod.org>
> ---
> hw/ppc/spapr_pci.c | 3 ++-
> include/hw/pci-host/spapr.h | 7 -------
> 2 files changed, 2 insertions(+), 8 deletions(-)
>
> diff --git a/hw/ppc/spapr_pci.c b/hw/ppc/spapr_pci.c
> index 7b71ad7c74..6934d506a7 100644
> --- a/hw/ppc/spapr_pci.c
> +++ b/hw/ppc/spapr_pci.c
> @@ -721,9 +721,10 @@ static void pci_spapr_set_irq(void *opaque, int irq_num,
> int level)
> * corresponding qemu_irq.
> */
> SpaprPhbState *phb = opaque;
> + SpaprMachineState *spapr = SPAPR_MACHINE(qdev_get_machine());
>
> trace_spapr_pci_lsi_set(phb->dtbusname, irq_num,
> phb->lsi_table[irq_num].irq);
> - qemu_set_irq(spapr_phb_lsi_qirq(phb, irq_num), level);
> + qemu_set_irq(spapr_qirq(spapr, phb->lsi_table[irq_num].irq), level);
> }
>
> static PCIINTxRoute spapr_route_intx_pin_to_irq(void *opaque, int pin)
> diff --git a/include/hw/pci-host/spapr.h b/include/hw/pci-host/spapr.h
> index abd87605b2..23506f05d9 100644
> --- a/include/hw/pci-host/spapr.h
> +++ b/include/hw/pci-host/spapr.h
> @@ -128,13 +128,6 @@ struct SpaprPhbState {
> #define SPAPR_PCI_NV2ATSD_WIN_SIZE (NVGPU_MAX_NUM * NVGPU_MAX_LINKS * \
> 64 * KiB)
>
> -static inline qemu_irq spapr_phb_lsi_qirq(struct SpaprPhbState *phb, int pin)
> -{
> - SpaprMachineState *spapr = SPAPR_MACHINE(qdev_get_machine());
> -
> - return spapr_qirq(spapr, phb->lsi_table[pin].irq);
> -}
> -
> int spapr_dt_phb(SpaprPhbState *phb, uint32_t intc_phandle, void *fdt,
> uint32_t nr_msis, int *node_offset);
>
>
