[PATCH] irq-flags: SPARC: Use the new IRQF_ constants (67413202) · Commits · e / devices / android_kernel_oneplus_sm7250

arch/sparc/kernel/irq.c

+7 −7

Original line number	Original line	Diff line number	Diff line
	@@ -191,11 +191,11 @@ int show_interrupts(struct seq_file p, void v)
	}		}
	#endif		#endif
	seq_printf(p, " %c %s",		seq_printf(p, " %c %s",
	(action->flags & SA_INTERRUPT) ? '+' : ' ',		(action->flags & IRQF_DISABLED) ? '+' : ' ',
	action->name);		action->name);
	for (action=action->next; action; action = action->next) {		for (action=action->next; action; action = action->next) {
	seq_printf(p, ",%s %s",		seq_printf(p, ",%s %s",
	(action->flags & SA_INTERRUPT) ? " +" : "",		(action->flags & IRQF_DISABLED) ? " +" : "",
	action->name);		action->name);
	}		}
	seq_putc(p, '\n');		seq_putc(p, '\n');
	@@ -243,7 +243,7 @@ void free_irq(unsigned int irq, void *dev_id)
	printk("Trying to free free shared IRQ%d\n",irq);		printk("Trying to free free shared IRQ%d\n",irq);
	goto out_unlock;		goto out_unlock;
	}		}
	} else if (action->flags & SA_SHIRQ) {		} else if (action->flags & IRQF_SHARED) {
	printk("Trying to free shared IRQ%d with NULL device ID\n", irq);		printk("Trying to free shared IRQ%d with NULL device ID\n", irq);
	goto out_unlock;		goto out_unlock;
	}		}
	@@ -395,9 +395,9 @@ int request_fast_irq(unsigned int irq,

	action = sparc_irq[cpu_irq].action;		action = sparc_irq[cpu_irq].action;
	if(action) {		if(action) {
	if(action->flags & SA_SHIRQ)		if(action->flags & IRQF_SHARED)
	panic("Trying to register fast irq when already shared.\n");		panic("Trying to register fast irq when already shared.\n");
	if(irqflags & SA_SHIRQ)		if(irqflags & IRQF_SHARED)
	panic("Trying to register fast irq as shared.\n");		panic("Trying to register fast irq as shared.\n");

	/* Anyway, someone already owns it so cannot be made fast. */		/* Anyway, someone already owns it so cannot be made fast. */
	@@ -497,11 +497,11 @@ int request_irq(unsigned int irq,
	actionp = &sparc_irq[cpu_irq].action;		actionp = &sparc_irq[cpu_irq].action;
	action = *actionp;		action = *actionp;
	if (action) {		if (action) {
	if (!(action->flags & SA_SHIRQ) \|\| !(irqflags & SA_SHIRQ)) {		if (!(action->flags & IRQF_SHARED) \|\| !(irqflags & IRQF_SHARED)) {
	ret = -EBUSY;		ret = -EBUSY;
	goto out_unlock;		goto out_unlock;
	}		}
	if ((action->flags & SA_INTERRUPT) != (irqflags & SA_INTERRUPT)) {		if ((action->flags & IRQF_DISABLED) != (irqflags & IRQF_DISABLED)) {
	printk("Attempt to mix fast and slow interrupts on IRQ%d denied\n", irq);		printk("Attempt to mix fast and slow interrupts on IRQ%d denied\n", irq);
	ret = -EBUSY;		ret = -EBUSY;
	goto out_unlock;		goto out_unlock;

arch/sparc/kernel/pcic.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -745,7 +745,7 @@ void __init pci_time_init(void)
	writel (PCI_COUNTER_IRQ_SET(timer_irq, 0),		writel (PCI_COUNTER_IRQ_SET(timer_irq, 0),
	pcic->pcic_regs+PCI_COUNTER_IRQ);		pcic->pcic_regs+PCI_COUNTER_IRQ);
	irq = request_irq(timer_irq, pcic_timer_handler,		irq = request_irq(timer_irq, pcic_timer_handler,
	(SA_INTERRUPT \| SA_STATIC_ALLOC), "timer", NULL);		(IRQF_DISABLED \| SA_STATIC_ALLOC), "timer", NULL);
	if (irq) {		if (irq) {
	prom_printf("time_init: unable to attach IRQ%d\n", timer_irq);		prom_printf("time_init: unable to attach IRQ%d\n", timer_irq);
	prom_halt();		prom_halt();

arch/sparc/kernel/sun4c_irq.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -179,7 +179,7 @@ static void __init sun4c_init_timers(irqreturn_t (counter_fn)(int, void , stru

	irq = request_irq(TIMER_IRQ,		irq = request_irq(TIMER_IRQ,
	counter_fn,		counter_fn,
	(SA_INTERRUPT \| SA_STATIC_ALLOC),		(IRQF_DISABLED \| SA_STATIC_ALLOC),
	"timer", NULL);		"timer", NULL);
	if (irq) {		if (irq) {
	prom_printf("time_init: unable to attach IRQ%d\n",TIMER_IRQ);		prom_printf("time_init: unable to attach IRQ%d\n",TIMER_IRQ);

arch/sparc/kernel/sun4d_irq.c

+6 −6

Original line number	Original line	Diff line number	Diff line
	@@ -107,13 +107,13 @@ found_it: seq_printf(p, "%3d: ", i);
	kstat_cpu(cpu_logical_map(x)).irqs[i]);		kstat_cpu(cpu_logical_map(x)).irqs[i]);
	#endif		#endif
	seq_printf(p, "%c %s",		seq_printf(p, "%c %s",
	(action->flags & SA_INTERRUPT) ? '+' : ' ',		(action->flags & IRQF_DISABLED) ? '+' : ' ',
	action->name);		action->name);
	action = action->next;		action = action->next;
	for (;;) {		for (;;) {
	for (; action; action = action->next) {		for (; action; action = action->next) {
	seq_printf(p, ",%s %s",		seq_printf(p, ",%s %s",
	(action->flags & SA_INTERRUPT) ? " +" : "",		(action->flags & IRQF_DISABLED) ? " +" : "",
	action->name);		action->name);
	}		}
	if (!sbusl) break;		if (!sbusl) break;
	@@ -160,7 +160,7 @@ void sun4d_free_irq(unsigned int irq, void *dev_id)
	printk("Trying to free free shared IRQ%d\n",irq);		printk("Trying to free free shared IRQ%d\n",irq);
	goto out_unlock;		goto out_unlock;
	}		}
	} else if (action->flags & SA_SHIRQ) {		} else if (action->flags & IRQF_SHARED) {
	printk("Trying to free shared IRQ%d with NULL device ID\n", irq);		printk("Trying to free shared IRQ%d with NULL device ID\n", irq);
	goto out_unlock;		goto out_unlock;
	}		}
	@@ -298,13 +298,13 @@ int sun4d_request_irq(unsigned int irq,
	action = *actionp;		action = *actionp;

	if (action) {		if (action) {
	if ((action->flags & SA_SHIRQ) && (irqflags & SA_SHIRQ)) {		if ((action->flags & IRQF_SHARED) && (irqflags & IRQF_SHARED)) {
	for (tmp = action; tmp->next; tmp = tmp->next);		for (tmp = action; tmp->next; tmp = tmp->next);
	} else {		} else {
	ret = -EBUSY;		ret = -EBUSY;
	goto out_unlock;		goto out_unlock;
	}		}
	if ((action->flags & SA_INTERRUPT) ^ (irqflags & SA_INTERRUPT)) {		if ((action->flags & IRQF_DISABLED) ^ (irqflags & IRQF_DISABLED)) {
	printk("Attempt to mix fast and slow interrupts on IRQ%d denied\n", irq);		printk("Attempt to mix fast and slow interrupts on IRQ%d denied\n", irq);
	ret = -EBUSY;		ret = -EBUSY;
	goto out_unlock;		goto out_unlock;
	@@ -490,7 +490,7 @@ static void __init sun4d_init_timers(irqreturn_t (counter_fn)(int, void , stru

	irq = request_irq(TIMER_IRQ,		irq = request_irq(TIMER_IRQ,
	counter_fn,		counter_fn,
	(SA_INTERRUPT \| SA_STATIC_ALLOC),		(IRQF_DISABLED \| SA_STATIC_ALLOC),
	"timer", NULL);		"timer", NULL);
	if (irq) {		if (irq) {
	prom_printf("time_init: unable to attach IRQ%d\n",TIMER_IRQ);		prom_printf("time_init: unable to attach IRQ%d\n",TIMER_IRQ);

arch/sparc/kernel/sun4m_irq.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -278,7 +278,7 @@ static void __init sun4m_init_timers(irqreturn_t (counter_fn)(int, void , stru

	irq = request_irq(TIMER_IRQ,		irq = request_irq(TIMER_IRQ,
	counter_fn,		counter_fn,
	(SA_INTERRUPT \| SA_STATIC_ALLOC),		(IRQF_DISABLED \| SA_STATIC_ALLOC),
	"timer", NULL);		"timer", NULL);
	if (irq) {		if (irq) {
	prom_printf("time_init: unable to attach IRQ%d\n",TIMER_IRQ);		prom_printf("time_init: unable to attach IRQ%d\n",TIMER_IRQ);