mirror of
https://github.com/torvalds/linux.git
synced 2024-10-30 16:51:45 +00:00
powerpc:eVh_pic: Kill irq_desc abuse
I'm really grumpy about this one. The line: #include "../../../kernel/irq/settings.h" should have been an alarm sign for all people who added their SOB to this trainwreck. When I cleaned up the mess people made with interrupt descriptors a few years ago, I warned that I'm going to hunt down new offenders and treat them with stinking trouts. In this case I'll use frozen shark for a better educational value. The whole idiocy which was done there could have been avoided with two lines of perfectly fine code. And do not complain about the lack of correct examples in tree. The solution is simple: Remove the brainfart and use the proper functions, which should have been used in the first place Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org> Cc: Ashish Kalra <ashish.kalra@freescale.com> Cc: Timur Tabi <timur@freescale.com> Cc: Kumar Gala <galak@kernel.crashing.org> Cc: ppc <linuxppc-dev@lists.ozlabs.org> Link: http://lkml.kernel.org/r/20140223212736.451970660@linutronix.de Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
This commit is contained in:
parent
eb9cf4e8ec
commit
c866cda47f
@ -28,8 +28,6 @@
|
||||
#include <asm/ehv_pic.h>
|
||||
#include <asm/fsl_hcalls.h>
|
||||
|
||||
#include "../../../kernel/irq/settings.h"
|
||||
|
||||
static struct ehv_pic *global_ehv_pic;
|
||||
static DEFINE_SPINLOCK(ehv_pic_lock);
|
||||
|
||||
@ -113,17 +111,13 @@ static unsigned int ehv_pic_type_to_vecpri(unsigned int type)
|
||||
int ehv_pic_set_irq_type(struct irq_data *d, unsigned int flow_type)
|
||||
{
|
||||
unsigned int src = virq_to_hw(d->irq);
|
||||
struct irq_desc *desc = irq_to_desc(d->irq);
|
||||
unsigned int vecpri, vold, vnew, prio, cpu_dest;
|
||||
unsigned long flags;
|
||||
|
||||
if (flow_type == IRQ_TYPE_NONE)
|
||||
flow_type = IRQ_TYPE_LEVEL_LOW;
|
||||
|
||||
irq_settings_clr_level(desc);
|
||||
irq_settings_set_trigger_mask(desc, flow_type);
|
||||
if (flow_type & (IRQ_TYPE_LEVEL_HIGH | IRQ_TYPE_LEVEL_LOW))
|
||||
irq_settings_set_level(desc);
|
||||
irqd_set_trigger_type(d, flow_type);
|
||||
|
||||
vecpri = ehv_pic_type_to_vecpri(flow_type);
|
||||
|
||||
@ -144,7 +138,7 @@ int ehv_pic_set_irq_type(struct irq_data *d, unsigned int flow_type)
|
||||
ev_int_set_config(src, vecpri, prio, cpu_dest);
|
||||
|
||||
spin_unlock_irqrestore(&ehv_pic_lock, flags);
|
||||
return 0;
|
||||
return IRQ_SET_MASK_OK_NOCOPY;
|
||||
}
|
||||
|
||||
static struct irq_chip ehv_pic_irq_chip = {
|
||||
|
Loading…
Reference in New Issue
Block a user