Skip to content

Commit

Permalink
genirq: Provide locked setter for chip, handler, name
Browse files Browse the repository at this point in the history
Some irq_set_type() callbacks need to change the chip and the handler
when the trigger mode changes. We have already a (misnomed) setter
function for the handler which can be called from irq_set_type().

Provide one which allows to set chip and name as well. Put the
misnomed function under the COMPAT switch and provide a replacement.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
  • Loading branch information
Thomas Gleixner committed Mar 23, 2011
1 parent d3e17de commit a2e8461
Showing 1 changed file with 24 additions and 5 deletions.
29 changes: 24 additions & 5 deletions include/linux/irqdesc.h
Original file line number Diff line number Diff line change
Expand Up @@ -171,25 +171,44 @@ static inline int irq_has_action(unsigned int irq)
return desc->action != NULL;
}

#ifndef CONFIG_GENERIC_HARDIRQS_NO_COMPAT
static inline int irq_balancing_disabled(unsigned int irq)
/* caller has locked the irq_desc and both params are valid */
static inline void __irq_set_handler_locked(unsigned int irq,
irq_flow_handler_t handler)
{
struct irq_desc *desc;

desc = irq_to_desc(irq);
return desc->status & IRQ_NO_BALANCING_MASK;
desc->handle_irq = handler;
}
#endif

/* caller has locked the irq_desc and both params are valid */
static inline void
__irq_set_chip_handler_name_locked(unsigned int irq, struct irq_chip *chip,
irq_flow_handler_t handler, const char *name)
{
struct irq_desc *desc;

desc = irq_to_desc(irq);
irq_desc_get_irq_data(desc)->chip = chip;
desc->handle_irq = handler;
desc->name = name;
}

#ifndef CONFIG_GENERIC_HARDIRQS_NO_COMPAT
static inline void __set_irq_handler_unlocked(int irq,
irq_flow_handler_t handler)
{
__irq_set_handler_locked(irq, handler);
}

static inline int irq_balancing_disabled(unsigned int irq)
{
struct irq_desc *desc;

desc = irq_to_desc(irq);
desc->handle_irq = handler;
return desc->status & IRQ_NO_BALANCING_MASK;
}
#endif

static inline void
irq_set_lockdep_class(unsigned int irq, struct lock_class_key *class)
Expand Down

0 comments on commit a2e8461

Please sign in to comment.