Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 14a6f198 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull irq update from Thomas Gleixner:
 "The last update for 4.2 is just moving a macro from a local header to
  the global one, so it can be used in architecture code as well.

  Cleanup of the now empty local header is 4.3 material"

* 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  irqchip: Move IRQCHIP_DECLARE macro to include/linux/irqchip.h
parents b1be9ead 91e20b50

drivers/irqchip/irqchip.h

+1 −18
Original line number Diff line number Diff line
@@ -8,21 +8,4 @@ 
 * warranty of any kind, whether express or implied.

 */



#ifndef _IRQCHIP_H

#define _IRQCHIP_H



#include <linux/of.h>



/*

 * This macro must be used by the different irqchip drivers to declare

 * the association between their DT compatible string and their

 * initialization function.

 *

 * @name: name that must be unique accross all IRQCHIP_DECLARE of the

 * same file.

 * @compstr: compatible string of the irqchip driver

 * @fn: initialization function

 */

#define IRQCHIP_DECLARE(name, compat, fn) OF_DECLARE_2(irqchip, name, compat, fn)



#endif
 
#include <linux/irqchip.h>

include/linux/irqchip.h

+14 −0
Original line number Diff line number Diff line
@@ -11,6 +11,20 @@ 
#ifndef _LINUX_IRQCHIP_H

#define _LINUX_IRQCHIP_H



#include <linux/of.h>



/*

 * This macro must be used by the different irqchip drivers to declare

 * the association between their DT compatible string and their

 * initialization function.

 *

 * @name: name that must be unique accross all IRQCHIP_DECLARE of the

 * same file.

 * @compstr: compatible string of the irqchip driver

 * @fn: initialization function

 */

#define IRQCHIP_DECLARE(name, compat, fn) OF_DECLARE_2(irqchip, name, compat, fn)



#ifdef CONFIG_IRQCHIP

void irqchip_init(void);

#else