On Fri, Nov 11, 2022 at 02:54:35PM +0100, Thomas Gleixner wrote:
> From: Ahmed S. Darwish <darwi@xxxxxxxxxxxxx>
>
> Set the bus token in the msi_domain_info structure and let the core code
> handle the update.
>
> Signed-off-by: Ahmed S. Darwish <darwi@xxxxxxxxxxxxx>
> Signed-off-by: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
Acked-by: Bjorn Helgaas <bhelgaas@xxxxxxxxxx>
> ---
> drivers/pci/msi/irqdomain.c | 11 +++--------
> 1 file changed, 3 insertions(+), 8 deletions(-)
>
> --- a/drivers/pci/msi/irqdomain.c
> +++ b/drivers/pci/msi/irqdomain.c
> @@ -162,8 +162,6 @@ struct irq_domain *pci_msi_create_irq_do
> struct msi_domain_info *info,
> struct irq_domain *parent)
> {
> - struct irq_domain *domain;
> -
> if (WARN_ON(info->flags & MSI_FLAG_LEVEL_CAPABLE))
> info->flags &= ~MSI_FLAG_LEVEL_CAPABLE;
>
> @@ -178,13 +176,10 @@ struct irq_domain *pci_msi_create_irq_do
>
> /* PCI-MSI is oneshot-safe */
> info->chip->flags |= IRQCHIP_ONESHOT_SAFE;
> + /* Let the core update the bus token */
> + info->bus_token = DOMAIN_BUS_PCI_MSI;
>
> - domain = msi_create_irq_domain(fwnode, info, parent);
> - if (!domain)
> - return NULL;
> -
> - irq_domain_update_bus_token(domain, DOMAIN_BUS_PCI_MSI);
> - return domain;
> + return msi_create_irq_domain(fwnode, info, parent);
> }
> EXPORT_SYMBOL_GPL(pci_msi_create_irq_domain);
>
>
