Skip to content

Commit

Permalink
Merge branch 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/l…
Browse files Browse the repository at this point in the history
…inux/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
  • Loading branch information
Linus Torvalds committed Jul 4, 2015
2 parents b1be9ea + 91e20b5 commit 14a6f19
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 18 deletions.
19 changes: 1 addition & 18 deletions drivers/irqchip/irqchip.h
Original file line number Diff line number Diff line change
Expand Up @@ -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>
14 changes: 14 additions & 0 deletions include/linux/irqchip.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 14a6f19

Please sign in to comment.