Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 34eddefe authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull irq fixes from Ingo Molnar:
 "A resume_irq() fix, plus a number of static declaration fixes"

* 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  irqchip/digicolor: Drop unnecessary static
  irqchip/mips-cpu: Drop unnecessary static
  irqchip/gic/realview: Drop unnecessary static
  irqchip/mips-gic: Remove population of irq domain names
  genirq/PM: Properly pretend disabled state when force resuming interrupts
parents 0a6109fd acc80c39

drivers/irqchip/irq-digicolor.c

+1 −1
Original line number Diff line number Diff line
@@ -71,7 +71,7 @@ static void __init digicolor_set_gc(void __iomem *reg_base, unsigned irq_base, 
static int __init digicolor_of_init(struct device_node *node,

				struct device_node *parent)

{

	static void __iomem *reg_base;

	void __iomem *reg_base;

	unsigned int clr = IRQ_NOREQUEST | IRQ_NOPROBE | IRQ_NOAUTOEN;

	struct regmap *ucregs;

	int ret;

drivers/irqchip/irq-gic-realview.c

+1 −1
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ static const struct of_device_id syscon_pldset_of_match[] = { 
static int __init

realview_gic_of_init(struct device_node *node, struct device_node *parent)

{

	static struct regmap *map;

	struct regmap *map;

	struct device_node *np;

	const struct of_device_id *gic_id;

	u32 pld1_ctrl;

drivers/irqchip/irq-mips-cpu.c

+1 −1
Original line number Diff line number Diff line
@@ -154,7 +154,7 @@ asmlinkage void __weak plat_irq_dispatch(void) 
static int mips_cpu_intc_map(struct irq_domain *d, unsigned int irq,

			     irq_hw_number_t hw)

{

	static struct irq_chip *chip;

	struct irq_chip *chip;



	if (hw < 2 && cpu_has_mipsmt) {

		/* Software interrupts are used for MT/CMT IPI */

drivers/irqchip/irq-mips-gic.c

+0 −2
Original line number Diff line number Diff line
@@ -950,7 +950,6 @@ static void __init __gic_init(unsigned long gic_base_addr, 
					       &gic_irq_domain_ops, NULL);

	if (!gic_irq_domain)

		panic("Failed to add GIC IRQ domain");

	gic_irq_domain->name = "mips-gic-irq";



	gic_ipi_domain = irq_domain_add_hierarchy(gic_irq_domain,

						  IRQ_DOMAIN_FLAG_IPI_PER_CPU,
@@ -959,7 +958,6 @@ static void __init __gic_init(unsigned long gic_base_addr, 
	if (!gic_ipi_domain)

		panic("Failed to add GIC IPI domain");



	gic_ipi_domain->name = "mips-gic-ipi";

	irq_domain_update_bus_token(gic_ipi_domain, DOMAIN_BUS_IPI);



	if (node &&

kernel/irq/chip.c

+0 −10
Original line number Diff line number Diff line
@@ -170,21 +170,11 @@ static void irq_state_clr_disabled(struct irq_desc *desc) 
	irqd_clear(&desc->irq_data, IRQD_IRQ_DISABLED);

}



static void irq_state_set_disabled(struct irq_desc *desc)

{

	irqd_set(&desc->irq_data, IRQD_IRQ_DISABLED);

}



static void irq_state_clr_masked(struct irq_desc *desc)

{

	irqd_clear(&desc->irq_data, IRQD_IRQ_MASKED);

}



static void irq_state_set_masked(struct irq_desc *desc)

{

	irqd_set(&desc->irq_data, IRQD_IRQ_MASKED);

}



static void irq_state_clr_started(struct irq_desc *desc)

{

	irqd_clear(&desc->irq_data, IRQD_IRQ_STARTED);