lkml.org 
[lkml]   [2022]   [Nov]   [17]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[tip: irq/core] PCI/MSI: Use msi_domain_info:: Bus_token
    The following commit has been merged into the irq/core branch of tip:

    Commit-ID: 38c0c10ae6a3d386c50e182227f606d8243124b8
    Gitweb: https://git.kernel.org/tip/38c0c10ae6a3d386c50e182227f606d8243124b8
    Author: Ahmed S. Darwish <darwi@linutronix.de>
    AuthorDate: Fri, 11 Nov 2022 14:54:35 +01:00
    Committer: Thomas Gleixner <tglx@linutronix.de>
    CommitterDate: Thu, 17 Nov 2022 15:15:19 +01:00

    PCI/MSI: Use msi_domain_info:: Bus_token

    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@linutronix.de>
    Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
    Reviewed-by: Jason Gunthorpe <jgg@nvidia.com>
    Acked-by: Bjorn Helgaas <bhelgaas@google.com>
    Link: https://lore.kernel.org/r/20221111122014.352437595@linutronix.de

    ---
    drivers/pci/msi/irqdomain.c | 11 +++--------
    1 file changed, 3 insertions(+), 8 deletions(-)

    diff --git a/drivers/pci/msi/irqdomain.c b/drivers/pci/msi/irqdomain.c
    index e9cf318..7766fa6 100644
    --- a/drivers/pci/msi/irqdomain.c
    +++ b/drivers/pci/msi/irqdomain.c
    @@ -162,8 +162,6 @@ struct irq_domain *pci_msi_create_irq_domain(struct fwnode_handle *fwnode,
    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_domain(struct fwnode_handle *fwnode,

    /* 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);

    \
     
     \ /
      Last update: 2022-11-17 16:11    [W:4.078 / U:0.828 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site