genirq: Add new functions to dummy chips

The compat functions go away when the core code is converted. Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Reviewed-by: Ingo Molnar <mingo@elte.hu>

genirq: Add new functions to dummy chips
The compat functions go away when the core code is converted. Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Reviewed-by: Ingo Molnar <mingo@elte.hu>
Thomas Gleixner
1 parent f8822657e7
Showing 2 changed files with 44 additions and 17 deletions Side-by-side Diff
kernel/irq/handle.c
kernel/irq/internals.h
@@ -291,8 +291,16 @@
  * What should we do if we get a hw irq event on an illegal vector?
  * Each architecture has to answer this themself.
  */
-static void ack_bad(unsigned int irq)
+static void ack_bad(struct irq_data *data)
 {
+	struct irq_desc *desc = irq_data_to_desc(data);
+
+	print_irq_desc(data->irq, desc);
+	ack_bad_irq(data->irq);
+}
+
+static void compat_ack_bad(unsigned int irq)
+{
 	struct irq_desc *desc = irq_to_desc(irq);
  
 	print_irq_desc(irq, desc);
  
  
@@ -302,11 +310,16 @@
 /*
  * NOP functions
  */
-static void noop(unsigned int irq)
+static void noop(struct irq_data *data) { }
+
+static unsigned int noop_ret(struct irq_data *data)
 {
+	return 0;
 }
  
-static unsigned int noop_ret(unsigned int irq)
+static void compat_noop(unsigned int irq) { }
+
+static unsigned int compat_noop_ret(unsigned int irq)
 {
 	return 0;
 }
@@ -316,12 +329,17 @@
  */
 struct irq_chip no_irq_chip = {
 	.name		= "none",
-	.startup	= noop_ret,
-	.shutdown	= noop,
-	.enable		= noop,
-	.disable	= noop,
-	.ack		= ack_bad,
-	.end		= noop,
+	.irq_startup	= noop_ret,
+	.irq_shutdown	= noop,
+	.irq_enable	= noop,
+	.irq_disable	= noop,
+	.irq_ack	= ack_bad,
+	.startup	= compat_noop_ret,
+	.shutdown	= compat_noop,
+	.enable		= compat_noop,
+	.disable	= compat_noop,
+	.ack		= compat_ack_bad,
+	.end		= compat_noop,
 };
  
 /*
@@ -330,14 +348,21 @@
  */
 struct irq_chip dummy_irq_chip = {
 	.name		= "dummy",
-	.startup	= noop_ret,
-	.shutdown	= noop,
-	.enable		= noop,
-	.disable	= noop,
-	.ack		= noop,
-	.mask		= noop,
-	.unmask		= noop,
-	.end		= noop,
+	.irq_startup	= noop_ret,
+	.irq_shutdown	= noop,
+	.irq_enable	= noop,
+	.irq_disable	= noop,
+	.irq_ack	= noop,
+	.irq_mask	= noop,
+	.irq_unmask	= noop,
+	.startup	= compat_noop_ret,
+	.shutdown	= compat_noop,
+	.enable		= compat_noop,
+	.disable	= compat_noop,
+	.ack		= compat_noop,
+	.mask		= compat_noop,
+	.unmask		= compat_noop,
+	.end		= compat_noop,
 };
  
 /*
@@ -4,6 +4,8 @@
  
 extern int noirqdebug;
  
+#define irq_data_to_desc(data)	container_of(data, struct irq_desc, irq_data)
+
 /* Set default functions for irq_chip structures: */
 extern void irq_chip_set_defaults(struct irq_chip *chip);
...	...	@@ -291,8 +291,16 @@
291	291	* What should we do if we get a hw irq event on an illegal vector?
292	292	* Each architecture has to answer this themself.
293	293	*/
294		-static void ack_bad(unsigned int irq)
	294	+static void ack_bad(struct irq_data *data)
295	295	{
	296	+ struct irq_desc *desc = irq_data_to_desc(data);
	297	+
	298	+ print_irq_desc(data->irq, desc);
	299	+ ack_bad_irq(data->irq);
	300	+}
	301	+
	302	+static void compat_ack_bad(unsigned int irq)
	303	+{
296	304	struct irq_desc *desc = irq_to_desc(irq);
297	305
298	306	print_irq_desc(irq, desc);
299	307
300	308
...	...	@@ -302,11 +310,16 @@
302	310	/*
303	311	* NOP functions
304	312	*/
305		-static void noop(unsigned int irq)
	313	+static void noop(struct irq_data *data) { }
	314	+
	315	+static unsigned int noop_ret(struct irq_data *data)
306	316	{
	317	+ return 0;
307	318	}
308	319
309		-static unsigned int noop_ret(unsigned int irq)
	320	+static void compat_noop(unsigned int irq) { }
	321	+
	322	+static unsigned int compat_noop_ret(unsigned int irq)
310	323	{
311	324	return 0;
312	325	}
...	...	@@ -316,12 +329,17 @@
316	329	*/
317	330	struct irq_chip no_irq_chip = {
318	331	.name = "none",
319		- .startup = noop_ret,
320		- .shutdown = noop,
321		- .enable = noop,
322		- .disable = noop,
323		- .ack = ack_bad,
324		- .end = noop,
	332	+ .irq_startup = noop_ret,
	333	+ .irq_shutdown = noop,
	334	+ .irq_enable = noop,
	335	+ .irq_disable = noop,
	336	+ .irq_ack = ack_bad,
	337	+ .startup = compat_noop_ret,
	338	+ .shutdown = compat_noop,
	339	+ .enable = compat_noop,
	340	+ .disable = compat_noop,
	341	+ .ack = compat_ack_bad,
	342	+ .end = compat_noop,
325	343	};
326	344
327	345	/*
...	...	@@ -330,14 +348,21 @@
330	348	*/
331	349	struct irq_chip dummy_irq_chip = {
332	350	.name = "dummy",
333		- .startup = noop_ret,
334		- .shutdown = noop,
335		- .enable = noop,
336		- .disable = noop,
337		- .ack = noop,
338		- .mask = noop,
339		- .unmask = noop,
340		- .end = noop,
	351	+ .irq_startup = noop_ret,
	352	+ .irq_shutdown = noop,
	353	+ .irq_enable = noop,
	354	+ .irq_disable = noop,
	355	+ .irq_ack = noop,
	356	+ .irq_mask = noop,
	357	+ .irq_unmask = noop,
	358	+ .startup = compat_noop_ret,
	359	+ .shutdown = compat_noop,
	360	+ .enable = compat_noop,
	361	+ .disable = compat_noop,
	362	+ .ack = compat_noop,
	363	+ .mask = compat_noop,
	364	+ .unmask = compat_noop,
	365	+ .end = compat_noop,
341	366	};
342	367
343	368	/*
...	...	@@ -4,6 +4,8 @@
4	4
5	5	extern int noirqdebug;
6	6
	7	+#define irq_data_to_desc(data) container_of(data, struct irq_desc, irq_data)
	8	+
7	9	/* Set default functions for irq_chip structures: */
8	10	extern void irq_chip_set_defaults(struct irq_chip *chip);
9	11