From: Thierry Reding <thierry.reding@avionic-design.de>
To: Ralf Baechle <ralf@linux-mips.org>
Cc: linux-mips@linux-mips.org, linux-kernel@vger.kernel.org,
Antony Pavlov <antonynpavlov@gmail.com>,
Lars-Peter Clausen <lars@metafoo.de>,
Maarten ter Huurne <maarten@treewalker.org>
Subject: [PATCH v2 1/3] MIPS: JZ4740: Break circular header dependency
Date: Mon, 10 Sep 2012 14:05:17 +0200 [thread overview]
Message-ID: <1347278719-15276-2-git-send-email-thierry.reding@avionic-design.de> (raw)
In-Reply-To: <1347278719-15276-1-git-send-email-thierry.reding@avionic-design.de>
When including irq.h, arch/mips/jz4740/irq.h will be selected as the
first candidate. This header does not include the proper definitions
(most notably NR_IRQS) required by subsequent headers. To solve this
arch/mips/jz4740/irq.h can be deleted and its contents can be moved
into arch/mips/include/asm/mach-jz4740/irq.h, which will then be
correctly included.
Signed-off-by: Thierry Reding <thierry.reding@avionic-design.de>
---
arch/mips/include/asm/mach-jz4740/irq.h | 5 +++++
arch/mips/jz4740/irq.h | 23 -----------------------
2 files changed, 5 insertions(+), 23 deletions(-)
delete mode 100644 arch/mips/jz4740/irq.h
diff --git a/arch/mips/include/asm/mach-jz4740/irq.h b/arch/mips/include/asm/mach-jz4740/irq.h
index 5ad1a9c..aa6fd90 100644
--- a/arch/mips/include/asm/mach-jz4740/irq.h
+++ b/arch/mips/include/asm/mach-jz4740/irq.h
@@ -54,4 +54,9 @@
#define NR_IRQS (JZ4740_IRQ_ADC_BASE + 6)
+struct irq_data;
+
+extern void jz4740_irq_suspend(struct irq_data *data);
+extern void jz4740_irq_resume(struct irq_data *data);
+
#endif
diff --git a/arch/mips/jz4740/irq.h b/arch/mips/jz4740/irq.h
deleted file mode 100644
index f75e39d..0000000
--- a/arch/mips/jz4740/irq.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Copyright (C) 2010, Lars-Peter Clausen <lars@metafoo.de>
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the
- * Free Software Foundation; either version 2 of the License, or (at your
- * option) any later version.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- */
-
-#ifndef __MIPS_JZ4740_IRQ_H__
-#define __MIPS_JZ4740_IRQ_H__
-
-#include <linux/irq.h>
-
-extern void jz4740_irq_suspend(struct irq_data *data);
-extern void jz4740_irq_resume(struct irq_data *data);
-
-#endif
--
1.7.12
next prev parent reply other threads:[~2012-09-10 12:05 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-09-10 12:05 [PATCH v2 0/3] MIPS: JZ4740: Move PWM driver to PWM framework Thierry Reding
2012-09-10 12:05 ` Thierry Reding [this message]
2012-09-10 12:05 ` [PATCH v2 2/3] MIPS: JZ4740: Export timer API Thierry Reding
2012-09-10 12:05 ` [PATCH v2 3/3] pwm: Add Ingenic JZ4740 support Thierry Reding
2012-09-10 21:51 ` Lars-Peter Clausen
2012-09-11 5:02 ` Thierry Reding
2012-09-11 17:54 ` Lars-Peter Clausen
2012-09-10 15:20 ` [PATCH v2 0/3] MIPS: JZ4740: Move PWM driver to PWM framework Lars-Peter Clausen
2012-09-10 17:30 ` Thierry Reding
2012-09-11 17:56 ` Lars-Peter Clausen
2012-09-12 15:02 ` Thierry Reding
2012-09-22 7:41 ` Thierry Reding
2012-09-23 13:56 ` Ralf Baechle
2012-09-23 17:12 ` Thierry Reding
2012-09-27 19:48 ` Thierry Reding
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=1347278719-15276-2-git-send-email-thierry.reding@avionic-design.de \
--to=thierry.reding@avionic-design.de \
--cc=antonynpavlov@gmail.com \
--cc=lars@metafoo.de \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mips@linux-mips.org \
--cc=maarten@treewalker.org \
--cc=ralf@linux-mips.org \
/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
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Powered by JetHome