LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
From: Thomas Gleixner <tglx@linutronix.de>
To: LKML <linux-kernel@vger.kernel.org>
Cc: Ingo Molnar <mingo@elte.hu>,
	Peter Zijlstra <peterz@infradead.org>,
	Benjamin Herrenschmidt <benh@kernel.crashing.org>,
	Ralf Baechle <ralf@linux-mips.org>,
	Tony Luck <tony.luck@intel.com>,
	David Howells <dhowells@redhat.com>,
	Michal Simek <monstr@monstr.eu>
Subject: [patch 8/8] genirq-remove-stale-irq-end.patch
Date: Thu, 03 Feb 2011 00:47:04 -0000	[thread overview]
Message-ID: <20110203004210.722023160@linutronix.de> (raw)
In-Reply-To: <20110203003745.371989282@linutronix.de>

[-- Attachment #1: genirq-remove-stale-irq-end.patch --]
[-- Type: text/plain, Size: 3611 bytes --]

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
---
 include/linux/irq.h    |    2 --
 kernel/irq/chip.c      |    3 ---
 kernel/irq/dummychip.c |    9 ---------
 kernel/irq/internals.h |   10 ----------
 kernel/irq/spurious.c  |    6 ------
 5 files changed, 30 deletions(-)

Index: linux-2.6-tip/include/linux/irq.h
===================================================================
--- linux-2.6-tip.orig/include/linux/irq.h
+++ linux-2.6-tip/include/linux/irq.h
@@ -126,7 +126,6 @@ struct irq_data {
  * @mask_ack:		deprecated, replaced by irq_mask_ack
  * @unmask:		deprecated, replaced by irq_unmask
  * @eoi:		deprecated, replaced by irq_eoi
- * @end:		deprecated, will go away with __do_IRQ()
  * @set_affinity:	deprecated, replaced by irq_set_affinity
  * @retrigger:		deprecated, replaced by irq_retrigger
  * @set_type:		deprecated, replaced by irq_set_type
@@ -166,7 +165,6 @@ struct irq_chip {
 	void		(*unmask)(unsigned int irq);
 	void		(*eoi)(unsigned int irq);
 
-	void		(*end)(unsigned int irq);
 	int		(*set_affinity)(unsigned int irq,
 					const struct cpumask *dest);
 	int		(*retrigger)(unsigned int irq);
Index: linux-2.6-tip/kernel/irq/chip.c
===================================================================
--- linux-2.6-tip.orig/kernel/irq/chip.c
+++ linux-2.6-tip/kernel/irq/chip.c
@@ -348,9 +348,6 @@ void irq_chip_set_defaults(struct irq_ch
 			chip->irq_disable : default_shutdown;
 
 #ifndef CONFIG_GENERIC_HARDIRQS_NO_DEPRECATED
-	if (!chip->end)
-		chip->end = dummy_irq_chip.end;
-
 	/*
 	 * Now fix up the remaining compat handlers
 	 */
Index: linux-2.6-tip/kernel/irq/dummychip.c
===================================================================
--- linux-2.6-tip.orig/kernel/irq/dummychip.c
+++ linux-2.6-tip/kernel/irq/dummychip.c
@@ -31,13 +31,6 @@ static unsigned int noop_ret(struct irq_
 	return 0;
 }
 
-#ifndef CONFIG_GENERIC_HARDIRQS_NO_DEPRECATED
-static void compat_noop(unsigned int irq) { }
-#define END_INIT .end = compat_noop
-#else
-#define END_INIT
-#endif
-
 /*
  * Generic no controller implementation
  */
@@ -48,7 +41,6 @@ struct irq_chip no_irq_chip = {
 	.irq_enable	= noop,
 	.irq_disable	= noop,
 	.irq_ack	= ack_bad,
-	END_INIT
 };
 
 /*
@@ -64,5 +56,4 @@ struct irq_chip dummy_irq_chip = {
 	.irq_ack	= noop,
 	.irq_mask	= noop,
 	.irq_unmask	= noop,
-	END_INIT
 };
Index: linux-2.6-tip/kernel/irq/internals.h
===================================================================
--- linux-2.6-tip.orig/kernel/irq/internals.h
+++ linux-2.6-tip/kernel/irq/internals.h
@@ -41,16 +41,6 @@ extern int irq_select_affinity_usr(unsig
 
 extern void irq_set_thread_affinity(struct irq_desc *desc);
 
-#ifndef CONFIG_GENERIC_HARDIRQS_NO_DEPRECATED
-static inline void irq_end(unsigned int irq, struct irq_desc *desc)
-{
-	if (desc->irq_data.chip && desc->irq_data.chip->end)
-		desc->irq_data.chip->end(irq);
-}
-#else
-static inline void irq_end(unsigned int irq, struct irq_desc *desc) { }
-#endif
-
 /* Inline functions for support of irq chips on slow busses */
 static inline void chip_bus_lock(struct irq_desc *desc)
 {
Index: linux-2.6-tip/kernel/irq/spurious.c
===================================================================
--- linux-2.6-tip.orig/kernel/irq/spurious.c
+++ linux-2.6-tip/kernel/irq/spurious.c
@@ -76,12 +76,6 @@ static int try_one_irq(int irq, struct i
 		desc->status &= ~IRQ_PENDING;
 	}
 	desc->status &= ~IRQ_INPROGRESS;
-	/*
-	 * If we did actual work for the real IRQ line we must let the
-	 * IRQ controller clean up too
-	 */
-	if (work)
-		irq_end(irq, desc);
 	raw_spin_unlock(&desc->lock);
 
 	return ok;



  parent reply	other threads:[~2011-02-03  0:48 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-02-03  0:46 [patch 0/8] genirq: Remove the last __do_IRQ() leftovers Thomas Gleixner
2011-02-03  0:46 ` [patch 1/8] frv: Remove stale irq_chip.end Thomas Gleixner
2011-02-03  0:46 ` [patch 2/8] ia64: " Thomas Gleixner
2011-02-03  0:46 ` [patch 3/8] microblaze: " Thomas Gleixner
2011-02-03 13:06   ` Michal Simek
2011-02-03  0:46 ` [patch 4/8] mips: " Thomas Gleixner
2011-02-03  0:46 ` [patch 5/8] mn10300: " Thomas Gleixner
2011-02-03  0:46 ` [patch 6/8] powerpc: " Thomas Gleixner
2011-02-03  0:47 ` [patch 7/8] um: " Thomas Gleixner
2011-02-03  0:47 ` Thomas Gleixner [this message]
2011-02-09 15:28 ` [patch 5/8] mn10300: " David Howells

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20110203004210.722023160@linutronix.de \
    --to=tglx@linutronix.de \
    --cc=benh@kernel.crashing.org \
    --cc=dhowells@redhat.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mingo@elte.hu \
    --cc=monstr@monstr.eu \
    --cc=peterz@infradead.org \
    --cc=ralf@linux-mips.org \
    --cc=tony.luck@intel.com \
    --subject='Re: [patch 8/8] genirq-remove-stale-irq-end.patch' \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).