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] genirq/msi: Remove msi_domain_ops:: Msi_check()
    The following commit has been merged into the irq/core branch of tip:

    Commit-ID: 2569f62ca473584a8ba389f455fc00805389f7da
    Gitweb: https://git.kernel.org/tip/2569f62ca473584a8ba389f455fc00805389f7da
    Author: Thomas Gleixner <tglx@linutronix.de>
    AuthorDate: Fri, 11 Nov 2022 14:55:15 +01:00
    Committer: Thomas Gleixner <tglx@linutronix.de>
    CommitterDate: Thu, 17 Nov 2022 15:15:22 +01:00

    genirq/msi: Remove msi_domain_ops:: Msi_check()

    No more users.

    Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
    Reviewed-by: Jason Gunthorpe <jgg@nvidia.com>
    Link: https://lore.kernel.org/r/20221111122015.807616900@linutronix.de

    ---
    include/linux/msi.h | 4 ----
    kernel/irq/msi.c | 17 +----------------
    2 files changed, 1 insertion(+), 20 deletions(-)

    diff --git a/include/linux/msi.h b/include/linux/msi.h
    index 8b28714..1ce9d5e 100644
    --- a/include/linux/msi.h
    +++ b/include/linux/msi.h
    @@ -292,7 +292,6 @@ struct msi_domain_info;
    * @get_hwirq: Retrieve the resulting hw irq number
    * @msi_init: Domain specific init function for MSI interrupts
    * @msi_free: Domain specific function to free a MSI interrupts
    - * @msi_check: Callback for verification of the domain/info/dev data
    * @msi_prepare: Prepare the allocation of the interrupts in the domain
    * @set_desc: Set the msi descriptor for an interrupt
    * @domain_alloc_irqs: Optional function to override the default allocation
    @@ -330,9 +329,6 @@ struct msi_domain_ops {
    void (*msi_free)(struct irq_domain *domain,
    struct msi_domain_info *info,
    unsigned int virq);
    - int (*msi_check)(struct irq_domain *domain,
    - struct msi_domain_info *info,
    - struct device *dev);
    int (*msi_prepare)(struct irq_domain *domain,
    struct device *dev, int nvec,
    msi_alloc_info_t *arg);
    diff --git a/kernel/irq/msi.c b/kernel/irq/msi.c
    index 4fde917..4b99f37 100644
    --- a/kernel/irq/msi.c
    +++ b/kernel/irq/msi.c
    @@ -617,17 +617,9 @@ static int msi_domain_ops_init(struct irq_domain *domain,
    return 0;
    }

    -static int msi_domain_ops_check(struct irq_domain *domain,
    - struct msi_domain_info *info,
    - struct device *dev)
    -{
    - return 0;
    -}
    -
    static struct msi_domain_ops msi_domain_ops_default = {
    .get_hwirq = msi_domain_ops_get_hwirq,
    .msi_init = msi_domain_ops_init,
    - .msi_check = msi_domain_ops_check,
    .msi_prepare = msi_domain_ops_prepare,
    .set_desc = msi_domain_ops_set_desc,
    .domain_alloc_irqs = __msi_domain_alloc_irqs,
    @@ -655,8 +647,6 @@ static void msi_domain_update_dom_ops(struct msi_domain_info *info)
    ops->get_hwirq = msi_domain_ops_default.get_hwirq;
    if (ops->msi_init == NULL)
    ops->msi_init = msi_domain_ops_default.msi_init;
    - if (ops->msi_check == NULL)
    - ops->msi_check = msi_domain_ops_default.msi_check;
    if (ops->msi_prepare == NULL)
    ops->msi_prepare = msi_domain_ops_default.msi_prepare;
    if (ops->set_desc == NULL)
    @@ -707,13 +697,8 @@ int msi_domain_prepare_irqs(struct irq_domain *domain, struct device *dev,
    {
    struct msi_domain_info *info = domain->host_data;
    struct msi_domain_ops *ops = info->ops;
    - int ret;
    -
    - ret = ops->msi_check(domain, info, dev);
    - if (ret == 0)
    - ret = ops->msi_prepare(domain, dev, nvec, arg);

    - return ret;
    + return ops->msi_prepare(domain, dev, nvec, arg);
    }

    int msi_domain_populate_irqs(struct irq_domain *domain, struct device *dev,
    \
     
     \ /
      Last update: 2022-11-17 16:09    [W:4.146 / U:0.072 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site