[lkml]   [2014]   [Mar]   [4]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
Messages in this thread
Patch in this message
Subject[tip:irq/core] powerpc:eVh_pic: Kill irq_desc abuse
Commit-ID:  c866cda47f2c6c8abb929933b7794e9a92d7c924
Author: Thomas Gleixner <>
AuthorDate: Sun, 23 Feb 2014 21:40:08 +0000
Committer: Thomas Gleixner <>
CommitDate: Tue, 4 Mar 2014 17:37:51 +0100

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 <>
Cc: Peter Zijlstra <>
Cc: Benjamin Herrenschmidt <>
Cc: Ashish Kalra <>
Cc: Timur Tabi <>
Cc: Kumar Gala <>
Cc: ppc <>
Signed-off-by: Thomas Gleixner <>
arch/powerpc/sysdev/ehv_pic.c | 10 ++--------
1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/arch/powerpc/sysdev/ehv_pic.c b/arch/powerpc/sysdev/ehv_pic.c
index b74085c..2d20f10 100644
--- a/arch/powerpc/sysdev/ehv_pic.c
+++ b/arch/powerpc/sysdev/ehv_pic.c
@@ -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);
- 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;

static struct irq_chip ehv_pic_irq_chip = {

 \ /
  Last update: 2014-03-04 18:21    [W:0.422 / U:0.068 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site