irq: remove obsolete definitions in interrupt.h

PATCH In review Sam Ravnborg 5 participants 9 messages Apr 4, 2012 – Apr 5, 2012 s390

Share & tools

Sam Ravnborg

author

2012-04-04 07:45 UTC #0 lore raw

PATCH 1/1 irq: remove obsolete definitions in interrupt.h

interrupt.h contained a small fixlet for the days when m68k and sparc32 did not use genirq.
As they have both entered the modern world this fixlet can be dropped.

Signed-off-by Sam Ravnborg <[email protected]>

Cc Geert Uytterhoeven <[email protected]>

Cc Greg Ungerer <[email protected]>

Cc "David S. Miller" <[email protected]>

---

include/linux/interrupt.h +0 ~~-37~~

index 2aea5d2..3848176 100644
@@ -122,7 +122,6 @@ struct irqaction {
 
 extern irqreturn_t no_action(int cpl, void *dev_id);
 
-#ifdef CONFIG_GENERIC_HARDIRQS
 extern int __must_check
 request_threaded_irq(unsigned int irq, irq_handler_t handler,
 		     irq_handler_t thread_fn,

@@ -144,42 +143,6 @@ request_percpu_irq(unsigned int irq, irq_handler_t handler,
 		   const char *devname, void __percpu *percpu_dev_id);
 
 extern void exit_irq_thread(void);
-#else
-
-extern int __must_check
-request_irq(unsigned int irq, irq_handler_t handler, unsigned long flags,
-	    const char *name, void *dev);
-
-/*
- * Special function to avoid ifdeffery in kernel/irq/devres.c which
- * gets magically built by GENERIC_HARDIRQS=n architectures (sparc,
- * m68k). I really love these $@%#!* obvious Makefile references:
- * ../../../kernel/irq/devres.o
- */
-static inline int __must_check
-request_threaded_irq(unsigned int irq, irq_handler_t handler,
-		     irq_handler_t thread_fn,
-		     unsigned long flags, const char *name, void *dev)
-{
-	return request_irq(irq, handler, flags, name, dev);
-}
-
-static inline int __must_check
-request_any_context_irq(unsigned int irq, irq_handler_t handler,
-			unsigned long flags, const char *name, void *dev_id)
-{
-	return request_irq(irq, handler, flags, name, dev_id);
-}
-
-static inline int __must_check
-request_percpu_irq(unsigned int irq, irq_handler_t handler,
-		   const char *devname, void __percpu *percpu_dev_id)
-{
-	return request_irq(irq, handler, 0, devname, percpu_dev_id);
-}
-
-static inline void exit_irq_thread(void) { }
-#endif
 
 extern void free_irq(unsigned int, void *);
 extern void free_percpu_irq(unsigned int, void __percpu *);

David Miller

Acked-by on v1 1/1

2012-04-04 07:52 UTC #1 lore raw

From: Sam Ravnborg <[email protected]>
Date: Wed, 4 Apr 2012 09:45:54 +0200

Quoted 6 lines

interrupt.h contained a small fixlet for the days when m68k and sparc32 did not use genirq.
As they have both entered the modern world this fixlet can be dropped.
Signed-off-by Sam Ravnborg <[email protected]>

Acked-by David S. Miller <[email protected]>

Greg Ungerer

Acked-by on v1 1/1

2012-04-04 11:47 UTC #2 lore raw

In reply to Sam Ravnborg

Quoted 8 lines · Sam Ravnborg

interrupt.h contained a small fixlet for the days when m68k and sparc32 did not use genirq.
As they have both entered the modern world this fixlet can be dropped.
Signed-off-by Sam Ravnborg<[email protected]>
Cc Geert Uytterhoeven<[email protected]>
Cc Greg Ungerer<[email protected]>

Acked-by Greg Ungerer <[email protected]>

Quoted 62 lines

Cc "David S. Miller"<[email protected]>

---

include/linux/interrupt.h +0 ~~-37~~

index 2aea5d2..3848176 100644
@@ -122,7 +122,6 @@ struct irqaction {
 
  extern irqreturn_t no_action(int cpl, void *dev_id);
 
-#ifdef CONFIG_GENERIC_HARDIRQS
  extern int __must_check
  request_threaded_irq(unsigned int irq, irq_handler_t handler,
  		     irq_handler_t thread_fn,

@@ -144,42 +143,6 @@ request_percpu_irq(unsigned int irq, irq_handler_t handler,
  		   const char *devname, void __percpu *percpu_dev_id);
 
  extern void exit_irq_thread(void);
-#else
-
-extern int __must_check
-request_irq(unsigned int irq, irq_handler_t handler, unsigned long flags,
-	    const char *name, void *dev);
-
-/*
- * Special function to avoid ifdeffery in kernel/irq/devres.c which
- * gets magically built by GENERIC_HARDIRQS=n architectures (sparc,
- * m68k). I really love these $@%#!* obvious Makefile references:
- * ../../../kernel/irq/devres.o
- */
-static inline int __must_check
-request_threaded_irq(unsigned int irq, irq_handler_t handler,
-		     irq_handler_t thread_fn,
-		     unsigned long flags, const char *name, void *dev)
-{
-	return request_irq(irq, handler, flags, name, dev);
-}
-
-static inline int __must_check
-request_any_context_irq(unsigned int irq, irq_handler_t handler,
-			unsigned long flags, const char *name, void *dev_id)
-{
-	return request_irq(irq, handler, flags, name, dev_id);
-}
-
-static inline int __must_check
-request_percpu_irq(unsigned int irq, irq_handler_t handler,
-		   const char *devname, void __percpu *percpu_dev_id)
-{
-	return request_irq(irq, handler, 0, devname, percpu_dev_id);
-}
-
-static inline void exit_irq_thread(void) { }
-#endif
 
  extern void free_irq(unsigned int, void *);
  extern void free_percpu_irq(unsigned int, void __percpu *);

Signature · 5 lines

------------------------------------------------------------------------
Greg Ungerer  --  Principal Engineer        EMAIL:     [email protected]
SnapGear Group, McAfee                      PHONE:       +61 7 3435 2888
8 Gardner Close,                            FAX:         +61 7 3891 3630
Milton, QLD, 4064, Australia                WEB: http://www.SnapGear.com

Geert Uytterhoeven

Acked-by on v1 1/1

2012-04-04 17:44 UTC #3 lore raw

In reply to Sam Ravnborg

Quoted 9 lines · Sam Ravnborg

interrupt.h contained a small fixlet for the days when m68k and sparc32 did not use genirq.
As they have both entered the modern world this fixlet can be dropped.
Signed-off-by Sam Ravnborg <[email protected]>
Cc Geert Uytterhoeven <[email protected]>
Cc Greg Ungerer <[email protected]>
Cc "David S. Miller" <[email protected]>

Does this affect s390 (the sole !genirq arch) negatively?

If not:

Acked-by Geert Uytterhoeven <[email protected]>

Gr{oetje,eeting}s,

Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected]

In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that. -- Linus Torvalds

Geert Uytterhoeven

Acked-by on v1 1/1

2012-04-04 17:44 UTC #4 lore raw

In reply to Sam Ravnborg

Quoted 9 lines · Sam Ravnborg

interrupt.h contained a small fixlet for the days when m68k and sparc32 did not use genirq.
As they have both entered the modern world this fixlet can be dropped.
Signed-off-by Sam Ravnborg <[email protected]>
Cc Geert Uytterhoeven <[email protected]>
Cc Greg Ungerer <[email protected]>
Cc "David S. Miller" <[email protected]>

Does this affect s390 (the sole !genirq arch) negatively?

If not:

Acked-by Geert Uytterhoeven <[email protected]>

Gr{oetje,eeting}s,

Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected]

In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that. -- Linus Torvalds

Thomas Gleixner

2012-04-05 08:43 UTC #5 lore raw

In reply to Sam Ravnborg

Quoted 4 lines · Sam Ravnborg

interrupt.h contained a small fixlet for the days when m68k and sparc32 did not use genirq.
As they have both entered the modern world this fixlet can be dropped.

You forgot that there is still an esoteric architecture which has CONFIG_GENERIC_HARDIRQS=n.

So at least the exit_irq_thread() needs to stay.

The request_threaded_irq() one should not be used by any S390 driver. If it's used, they have probably a special opcode for it. :)

Thanks,

tglx

Sam Ravnborg

author

2012-04-05 10:56 UTC #6 lore raw

Quoted 9 lines · Thomas Gleixner

Quoted 4 lines · Sam Ravnborg
interrupt.h contained a small fixlet for the days when m68k and sparc32 did not use genirq.
As they have both entered the modern world this fixlet can be dropped.
You forgot that there is still an esoteric architecture which has CONFIG_GENERIC_HARDIRQS=n.

Yup.

Quoted 2 lines

So at least the exit_irq_thread() needs to stay.

My grepping turn up no s390 users of this. But I may have missed it.

Anyway - take this as a reminder that there is an opportunity to clean up after m68k + sparc32 got converted.

Sam

Sam Ravnborg

author

2012-04-05 10:56 UTC #7 lore raw

In reply to Thomas Gleixner

Quoted 9 lines · Thomas Gleixner

Quoted 4 lines · Sam Ravnborg
interrupt.h contained a small fixlet for the days when m68k and sparc32 did not use genirq.
As they have both entered the modern world this fixlet can be dropped.
You forgot that there is still an esoteric architecture which has CONFIG_GENERIC_HARDIRQS=n.

Yup.

Quoted 2 lines

So at least the exit_irq_thread() needs to stay.

My grepping turn up no s390 users of this. But I may have missed it.

Anyway - take this as a reminder that there is an opportunity to clean up after m68k + sparc32 got converted.

Sam

Thomas Gleixner

2012-04-05 08:43 UTC #8 lore raw

In reply to Sam Ravnborg

Quoted 4 lines · Sam Ravnborg

interrupt.h contained a small fixlet for the days when m68k and sparc32 did not use genirq.
As they have both entered the modern world this fixlet can be dropped.

You forgot that there is still an esoteric architecture which has CONFIG_GENERIC_HARDIRQS=n.

So at least the exit_irq_thread() needs to stay.

The request_threaded_irq() one should not be used by any S390 driver. If it's used, they have probably a special opcode for it. :)

Thanks,

tglx