From patchwork Wed Mar 4 19:33:10 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 5939451 Return-Path: X-Original-To: patchwork-linux-arm-msm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 4E3E0BF440 for ; Wed, 4 Mar 2015 19:36:49 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 7C98020320 for ; Wed, 4 Mar 2015 19:36:48 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 94DF820303 for ; Wed, 4 Mar 2015 19:36:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759084AbbCDTgR (ORCPT ); Wed, 4 Mar 2015 14:36:17 -0500 Received: from mout.kundenserver.de ([212.227.126.187]:64324 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758554AbbCDTeL (ORCPT ); Wed, 4 Mar 2015 14:34:11 -0500 Received: from wuerfel.lan. ([149.172.15.242]) by mrelayeu.kundenserver.de (mreue003) with ESMTPSA (Nemesis) id 0MDl1u-1YGavr1rIM-00H54F; Wed, 04 Mar 2015 20:34:05 +0100 From: Arnd Bergmann To: linux-arm-msm@vger.kernel.org Cc: linux-arm-kernel@lists.infradead.org, David Brown , Daniel Walker , Bryan Huntsman , Stephen Boyd , Tim Bird , Bjorn Andersson , Linus Walleij , linux-kernel@vger.kernel.org, Greg Kroah-Hartman , Ulf Hansson , Arnd Bergmann Subject: [RFC PATCH 16/18] ARM: msm: make msm_smd.h global Date: Wed, 4 Mar 2015 20:33:10 +0100 Message-Id: <1425497592-1831064-17-git-send-email-arnd@arndb.de> X-Mailer: git-send-email 2.1.0.rc2 In-Reply-To: <1425497592-1831064-1-git-send-email-arnd@arndb.de> References: <1425497592-1831064-1-git-send-email-arnd@arndb.de> X-Provags-ID: V03:K0:McZHvSfBg3uie7iJVTtS392uLjTLT6RxxHv5mJt8kZloGtkK2jy 57ZB2tPrx+2G2OA13HyhwSSGkAjDLYit/4/vLz6Mt1u4I3Qgs4wm0Xn0miNLTdW1VarxMot M/lMtFgEGY3YWxxIJE6C1TRSRNV3eHhcHa51vZ2Y1B2ncyEmPSq0DWsjm0tdNf45YzF0v8/ x1uehUlhqkDcpwjI+1XQQ== X-UI-Out-Filterresults: notjunk:1; Sender: linux-arm-msm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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 --- 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/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 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 #include -#include +#include #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 #include -#include +#include #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 #include -#include +#include #define MAX_SMD_TTYS 32