lkml.org 
[lkml]   [2015]   [Jul]   [11]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[tip:irq/core] genirq: Remove the irq argument from setup_affinity()
    Commit-ID:  a8a98eac7b238beb49b479c164303651d5a37eb6
    Gitweb: http://git.kernel.org/tip/a8a98eac7b238beb49b479c164303651d5a37eb6
    Author: Jiang Liu <jiang.liu@linux.intel.com>
    AuthorDate: Thu, 4 Jun 2015 12:13:30 +0800
    Committer: Thomas Gleixner <tglx@linutronix.de>
    CommitDate: Sat, 11 Jul 2015 23:14:25 +0200

    genirq: Remove the irq argument from setup_affinity()

    Unused except for the alpha wrapper, which can retrieve if from the
    irq descriptor.

    Signed-off-by: Jiang Liu <jiang.liu@linux.intel.com>
    Cc: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
    Cc: Tony Luck <tony.luck@intel.com>
    Cc: Bjorn Helgaas <bhelgaas@google.com>
    Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
    Cc: Randy Dunlap <rdunlap@infradead.org>
    Cc: Yinghai Lu <yinghai@kernel.org>
    Cc: Borislav Petkov <bp@alien8.de>
    Link: http://lkml.kernel.org/r/1433391238-19471-21-git-send-email-jiang.liu@linux.intel.com
    Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
    ---
    kernel/irq/manage.c | 15 +++++++--------
    1 file changed, 7 insertions(+), 8 deletions(-)

    diff --git a/kernel/irq/manage.c b/kernel/irq/manage.c
    index f5b7742..886f115 100644
    --- a/kernel/irq/manage.c
    +++ b/kernel/irq/manage.c
    @@ -361,8 +361,7 @@ EXPORT_SYMBOL_GPL(irq_set_affinity_notifier);
    /*
    * Generic version of the affinity autoselector.
    */
    -static int
    -setup_affinity(unsigned int irq, struct irq_desc *desc, struct cpumask *mask)
    +static int setup_affinity(struct irq_desc *desc, struct cpumask *mask)
    {
    struct cpumask *set = irq_default_affinity;
    int node = irq_desc_get_node(desc);
    @@ -395,10 +394,10 @@ setup_affinity(unsigned int irq, struct irq_desc *desc, struct cpumask *mask)
    return 0;
    }
    #else
    -static inline int
    -setup_affinity(unsigned int irq, struct irq_desc *d, struct cpumask *mask)
    +/* Wrapper for ALPHA specific affinity selector magic */
    +static inline int setup_affinity(struct irq_desc *d, struct cpumask *mask)
    {
    - return irq_select_affinity(irq);
    + return irq_select_affinity(irq_desc_get_irq(d));
    }
    #endif

    @@ -412,14 +411,14 @@ int irq_select_affinity_usr(unsigned int irq, struct cpumask *mask)
    int ret;

    raw_spin_lock_irqsave(&desc->lock, flags);
    - ret = setup_affinity(irq, desc, mask);
    + ret = setup_affinity(desc, mask);
    raw_spin_unlock_irqrestore(&desc->lock, flags);
    return ret;
    }

    #else
    static inline int
    -setup_affinity(unsigned int irq, struct irq_desc *desc, struct cpumask *mask)
    +setup_affinity(struct irq_desc *desc, struct cpumask *mask)
    {
    return 0;
    }
    @@ -1256,7 +1255,7 @@ __setup_irq(unsigned int irq, struct irq_desc *desc, struct irqaction *new)
    }

    /* Set default affinity mask once everything is setup */
    - setup_affinity(irq, desc, mask);
    + setup_affinity(desc, mask);

    } else if (new->flags & IRQF_TRIGGER_MASK) {
    unsigned int nmsk = new->flags & IRQF_TRIGGER_MASK;

    \
     
     \ /
      Last update: 2015-07-12 00:01    [W:4.568 / U:0.284 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site