From: arnd@arndb.de (Arnd Bergmann)
To: linux-arm-kernel@lists.infradead.org
Subject: [RFC PATCH 16/18] ARM: msm: make msm_smd.h global
Date: Wed, 4 Mar 2015 20:33:10 +0100 [thread overview]
Message-ID: <1425497592-1831064-17-git-send-email-arnd@arndb.de> (raw)
In-Reply-To: <1425497592-1831064-1-git-send-email-arnd@arndb.de>
This is one of several approaches to the problem of this
header file not being visible on ARCH_MULTIPLATFORM otherwise.
Signed-off-by: Arnd Bergmann <arnd@arnd@arndb.de>
---
arch/arm/mach-msm/smd.c | 6 +++---
drivers/char/msm_smd_pkt.c | 2 +-
drivers/tty/serial/msm_smd_tty.c | 2 +-
{arch/arm/mach-msm/include/mach => include/linux}/msm_smd.h | 0
4 files changed, 5 insertions(+), 5 deletions(-)
rename {arch/arm/mach-msm/include/mach => include/linux}/msm_smd.h (100%)
diff --git a/arch/arm/mach-msm/smd.c b/arch/arm/mach-msm/smd.c
index b87f183a86c5..b50b495ab281 100644
--- a/arch/arm/mach-msm/smd.c
+++ b/arch/arm/mach-msm/smd.c
@@ -29,7 +29,7 @@
#include <linux/debugfs.h>
#include <linux/delay.h>
-#include <mach/msm_smd.h>
+#include <linux/msm_smd.h>
#include "smd_private.h"
#include "proc_comm.h"
@@ -59,14 +59,14 @@ enum {
static int msm_smd_debug_mask;
-struct shared_info {
+struct msm_smd_shared_info {
int ready;
void __iomem *state;
};
static unsigned dummy_state[SMSM_STATE_COUNT];
-static struct shared_info smd_info = {
+static struct msm_smd_shared_info smd_info = {
/* FIXME: not a real __iomem pointer */
.state = &dummy_state,
};
diff --git a/drivers/char/msm_smd_pkt.c b/drivers/char/msm_smd_pkt.c
index ba82a06d9684..2ee28ed77791 100644
--- a/drivers/char/msm_smd_pkt.c
+++ b/drivers/char/msm_smd_pkt.c
@@ -31,7 +31,7 @@
#include <linux/workqueue.h>
#include <linux/poll.h>
-#include <mach/msm_smd.h>
+#include <linux/msm_smd.h>
#define NUM_SMD_PKT_PORTS 9
#define DEVICE_NAME "smdpkt"
diff --git a/drivers/tty/serial/msm_smd_tty.c b/drivers/tty/serial/msm_smd_tty.c
index 1238ac370bff..246b81c316c0 100644
--- a/drivers/tty/serial/msm_smd_tty.c
+++ b/drivers/tty/serial/msm_smd_tty.c
@@ -24,7 +24,7 @@
#include <linux/tty_driver.h>
#include <linux/tty_flip.h>
-#include <mach/msm_smd.h>
+#include <linux/msm_smd.h>
#define MAX_SMD_TTYS 32
diff --git a/arch/arm/mach-msm/include/mach/msm_smd.h b/include/linux/msm_smd.h
similarity index 100%
rename from arch/arm/mach-msm/include/mach/msm_smd.h
rename to include/linux/msm_smd.h
--
2.1.0.rc2
next prev parent reply other threads:[~2015-03-04 19:33 UTC|newest]
Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-03-04 19:32 [RFC PATCH 00/18] ARM: msm multiplatform support Arnd Bergmann
2015-03-04 19:32 ` [RFC PATCH 01/18] serial: remove obsolete msm_serial_hs driver Arnd Bergmann
2015-03-04 20:03 ` Paul Bolle
2015-03-04 20:07 ` Paul Bolle
2015-03-04 20:38 ` Arnd Bergmann
2015-03-04 19:32 ` [RFC PATCH 02/18] mmc: msm: move data mover into mmc driver Arnd Bergmann
2015-03-13 13:14 ` Ulf Hansson
2015-03-04 19:32 ` [RFC PATCH 03/18] mmc: msm: pass dmov resources via device Arnd Bergmann
2015-03-13 13:15 ` Ulf Hansson
2015-03-04 19:32 ` [RFC PATCH 04/18] mmc: msm: move clk-reset logic to platform Arnd Bergmann
2015-03-13 13:15 ` Ulf Hansson
2015-03-04 19:32 ` [RFC PATCH 05/18] ARM: msm: fix qsd8x50 rev.a support Arnd Bergmann
2015-03-04 19:33 ` [RFC PATCH 06/18] ARM: msm: fix mach/msm_iomap.h inclusions Arnd Bergmann
2015-03-04 19:33 ` [RFC PATCH 07/18] ARM: msm: fix sirc code for multiplatform Arnd Bergmann
2015-03-04 19:33 ` [RFC PATCH 08/18] ARM: msm: fix gpiomux config " Arnd Bergmann
2015-03-04 19:33 ` [RFC PATCH 09/18] ARM: msm: fix vic irqchip " Arnd Bergmann
2015-03-04 19:33 ` [RFC PATCH 10/18] gpio: move msm-v1 driver to mach-msm Arnd Bergmann
2015-03-09 16:10 ` Linus Walleij
2015-03-04 19:33 ` [RFC PATCH 11/18] clocksource: qcom: make mach-msm and mach-qcom coexist Arnd Bergmann
2015-03-04 19:33 ` [RFC PATCH 12/18] ARM: msm: make smd behave like a normal driver Arnd Bergmann
2015-03-04 19:33 ` [RFC PATCH 13/18] ARM: msm: rename conflicting symbols Arnd Bergmann
2015-03-04 19:33 ` [RFC PATCH 14/18] ARM: msm: pass gpio irq range as resource Arnd Bergmann
2015-03-04 19:33 ` [RFC PATCH 15/18] ARM: msm: clean up irq handling Arnd Bergmann
2015-03-04 19:33 ` Arnd Bergmann [this message]
2015-03-04 19:33 ` [RFC PATCH 17/18] ARM: msm: make all header files local Arnd Bergmann
2015-03-04 19:33 ` [RFC PATCH 18/18] ARM: msm: enable multiplatform support Arnd Bergmann
2015-03-04 20:31 ` [RFC PATCH 00/18] ARM: msm " Paul Bolle
2015-03-04 20:35 ` Arnd Bergmann
2015-03-04 21:09 ` Paul Bolle
2015-03-04 21:14 ` Paul Bolle
2015-03-04 22:11 ` dwalker at fifo99.com
2015-03-04 22:30 ` Arnd Bergmann
2015-03-05 16:40 ` Ulf Hansson
2015-03-08 22:52 ` Arnd Bergmann
2015-03-07 3:12 ` dwalker at fifo99.com
2015-03-12 16:27 ` Arnd Bergmann
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=1425497592-1831064-17-git-send-email-arnd@arndb.de \
--to=arnd@arndb.de \
--cc=linux-arm-kernel@lists.infradead.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;
as well as URLs for NNTP newsgroup(s).