Skip to contentSkip to conversation

m68k: Remove printk statement and add return statement in q40ints.c

PATCH In review Nicholas Krause 2 participants 6 messages Jul 23, 2014 m68k architecture

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 m68k: Remove printk statement and add return statement in q40ints.c

This removes the printk statement for irqs not defined by the hardware in function q40_irq_startup and instead returns -ENXIO as stated by the fix me message.

---
 arch/m68k/q40/q40ints.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
arch/m68k/q40/q40ints.c +1 -2
index 513f9bb..86f05c0 100644
@@ -48,8 +48,7 @@ static unsigned int q40_irq_startup(struct irq_data *data)
 	switch (irq) {
 	case 1: case 2: case 8: case 9:
 	case 11: case 12: case 13:
-		printk("%s: ISA IRQ %d not implemented by HW\n", __func__, irq);
-		/* FIXME return -ENXIO; */
+		return -ENXIO;
 	}
 	return 0;
 }
Signature · 1 line
1.9.1
#1 lore raw
Quoted 14 lines · Nicholas Krause

This removes the printk statement for irqs not defined by the hardware in function q40_irq_startup and instead returns -ENXIO as stated by the fix me message.

---
  arch/m68k/q40/q40ints.c | 3 +--
  1 file changed, 1 insertion(+), 2 deletions(-)
arch/m68k/q40/q40ints.c +0 -0
index 513f9bb..86f05c0 100644

arch/m68k/q40/q40ints.c static unsigned int q40_irq_startup(struct irq_data *data) · line 51

Quoted 6 lines
arch/m68k/q40/q40ints.c +1 -2
@@ -48,8 +48,7 @@ static unsigned int q40_irq_startup(struct irq_data *data)
  	switch (irq) {
  	case 1: case 2: case 8: case 9:
  	case 11: case 12: case 13:
-		printk("%s: ISA IRQ %d not implemented by HW\n", __func__, irq);
-		/* FIXME return -ENXIO; */
+		return -ENXIO;

Returning -ENXIO from a function returning an unsigned int isn't really very helpful, don't you think ?

With all those FIXMEs, you might want to keep in mind that there is typically a good reason for it. If it was as easy as your proposed fix, you can assume that the FIXME would not have been there in the first place.

Guenter

#2 lore raw
In reply to Nicholas Krause
Quoted 14 lines · Nicholas Krause

This removes the printk statement for irqs not defined by the hardware in function q40_irq_startup and instead returns -ENXIO as stated by the fix me message.

---
  arch/m68k/q40/q40ints.c | 3 +--
  1 file changed, 1 insertion(+), 2 deletions(-)
arch/m68k/q40/q40ints.c +0 -0
index 513f9bb..86f05c0 100644

arch/m68k/q40/q40ints.c static unsigned int q40_irq_startup(struct irq_data *data) · line 51

Quoted 6 lines
arch/m68k/q40/q40ints.c +1 -2
@@ -48,8 +48,7 @@ static unsigned int q40_irq_startup(struct irq_data *data)
  	switch (irq) {
  	case 1: case 2: case 8: case 9:
  	case 11: case 12: case 13:
-		printk("%s: ISA IRQ %d not implemented by HW\n", __func__, irq);
-		/* FIXME return -ENXIO; */
+		return -ENXIO;

Returning -ENXIO from a function returning an unsigned int isn't really very helpful, don't you think ?

With all those FIXMEs, you might want to keep in mind that there is typically a good reason for it. If it was as easy as your proposed fix, you can assume that the FIXME would not have been there in the first place.

Guenter

#3 lore raw
Quoted 30 lines · Guenter Roeck
Quoted 15 lines · Nicholas Krause

This removes the printk statement for irqs not defined by the hardware in function q40_irq_startup and instead returns -ENXIO as stated by the fix me message.

---
  arch/m68k/q40/q40ints.c | 3 +--
  1 file changed, 1 insertion(+), 2 deletions(-)
arch/m68k/q40/q40ints.c +0 -0
index 513f9bb..86f05c0 100644

arch/m68k/q40/q40ints.c static unsigned int q40_irq_startup(struct irq_data · line 53

Quoted 8 lines
arch/m68k/q40/q40ints.c +1 -2
@@ -48,8 +48,7 @@ static unsigned int q40_irq_startup(struct irq_data
 *data)
        switch (irq) {
        case 1: case 2: case 8: case 9:
        case 11: case 12: case 13:
-               printk("%s: ISA IRQ %d not implemented by HW\n", __func__,
 irq);
-               /* FIXME return -ENXIO; */
+               return -ENXIO;

Returning -ENXIO from a function returning an unsigned int isn't really very helpful,
don't you think ?

Quoted 7 lines

With all those FIXMEs, you might want to keep in mind that there is typically a
good reason for it. If it was as easy as your proposed fix, you can assume that the FIXME would not have been there in the first place.

Guenter

Sorry Guenter,
That's fine. can I can change the return type of the function or is that going to break things?
Nick

#4 lore raw
In reply to Guenter Roeck
Quoted 30 lines · Guenter Roeck
Quoted 15 lines · Nicholas Krause

This removes the printk statement for irqs not defined by the hardware in function q40_irq_startup and instead returns -ENXIO as stated by the fix me message.

---
  arch/m68k/q40/q40ints.c | 3 +--
  1 file changed, 1 insertion(+), 2 deletions(-)
arch/m68k/q40/q40ints.c +0 -0
index 513f9bb..86f05c0 100644

arch/m68k/q40/q40ints.c static unsigned int q40_irq_startup(struct irq_data · line 53

Quoted 8 lines
arch/m68k/q40/q40ints.c +1 -2
@@ -48,8 +48,7 @@ static unsigned int q40_irq_startup(struct irq_data
 *data)
        switch (irq) {
        case 1: case 2: case 8: case 9:
        case 11: case 12: case 13:
-               printk("%s: ISA IRQ %d not implemented by HW\n", __func__,
 irq);
-               /* FIXME return -ENXIO; */
+               return -ENXIO;

Returning -ENXIO from a function returning an unsigned int isn't really very helpful,
don't you think ?

Quoted 7 lines

With all those FIXMEs, you might want to keep in mind that there is typically a
good reason for it. If it was as easy as your proposed fix, you can assume that the FIXME would not have been there in the first place.

Guenter

Sorry Guenter,
That's fine. can I can change the return type of the function or is that going to break things?
Nick

#5 lore raw
Quoted 36 lines · Nick Krause
Quoted 35 lines · Guenter Roeck
Quoted 15 lines · Nicholas Krause

This removes the printk statement for irqs not defined by the hardware in function q40_irq_startup and instead returns -ENXIO as stated by the fix me message.

---
   arch/m68k/q40/q40ints.c | 3 +--
   1 file changed, 1 insertion(+), 2 deletions(-)
arch/m68k/q40/q40ints.c +0 -0
index 513f9bb..86f05c0 100644

arch/m68k/q40/q40ints.c static unsigned int q40_irq_startup(struct irq_data · line 53

Quoted 8 lines
arch/m68k/q40/q40ints.c +1 -2
@@ -48,8 +48,7 @@ static unsigned int q40_irq_startup(struct irq_data
 *data)
         switch (irq) {
         case 1: case 2: case 8: case 9:
         case 11: case 12: case 13:
-               printk("%s: ISA IRQ %d not implemented by HW\n", __func__,
 irq);
-               /* FIXME return -ENXIO; */
+               return -ENXIO;

Returning -ENXIO from a function returning an unsigned int isn't really very helpful,
don't you think ?

With all those FIXMEs, you might want to keep in mind that there is typically a
good reason for it. If it was as easy as your proposed fix, you can assume that the FIXME would not have been there in the first place.

Quoted 9 lines
Quoted 2 lines

Guenter

Sorry Guenter,
That's fine. can I can change the return type of the function or is that going to break things?
Nick

Please have a look at the context. q40_irq_startup is used to initialize struct irq_chip.irq_startup, which expects an unsigned int as return value. To make things more interesting, the caller (function irq_startup) assigns the result to an int. However, _callers_ of irq_startup either ignore the return value, or assume that an interrupt is pending if the return value is not 0.

So all your change accomplishes is to tell the caller that an interrupt would be pending. Changing the return value to int will only result in a compile warning but otherwise not change anything.

Unless you put in the effort to really analyze the code, and that applies to each FIXME you are trying to fix, I would suggest to leave it alone. Otherwise we just end up worse than before.

Guenter