From patchwork Tue Nov 27 00:03:09 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Pinchart X-Patchwork-Id: 1807881 Return-Path: X-Original-To: patchwork-linux-sh@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id C9D97DF2EC for ; Tue, 27 Nov 2012 00:02:59 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932952Ab2K0AC7 (ORCPT ); Mon, 26 Nov 2012 19:02:59 -0500 Received: from perceval.ideasonboard.com ([95.142.166.194]:48913 "EHLO perceval.ideasonboard.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932957Ab2K0AC4 (ORCPT ); Mon, 26 Nov 2012 19:02:56 -0500 Received: from avalon.ideasonboard.com (unknown [91.178.20.73]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 599E235B12; Tue, 27 Nov 2012 01:02:44 +0100 (CET) From: Laurent Pinchart To: linux-sh@vger.kernel.org Cc: Paul Mundt , Magnus Damm , Simon Horman , Linus Walleij , Kuninori Morimoto , Phil Edworthy , Nobuhiro Iwamatsu Subject: [PATCH v2 70/77] sh-pfc: Move sh_pfc.h from include/linux/ to driver directory Date: Tue, 27 Nov 2012 01:03:09 +0100 Message-Id: <1353974596-30033-71-git-send-email-laurent.pinchart+renesas@ideasonboard.com> X-Mailer: git-send-email 1.7.8.6 In-Reply-To: <1353974596-30033-1-git-send-email-laurent.pinchart+renesas@ideasonboard.com> References: <1353974596-30033-1-git-send-email-laurent.pinchart+renesas@ideasonboard.com> Sender: linux-sh-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-sh@vger.kernel.org The header file isn't used by arch code anymore. Make it private to the driver. Signed-off-by: Laurent Pinchart Acked-by: Paul Mundt --- drivers/pinctrl/sh-pfc/core.c | 1 - drivers/pinctrl/sh-pfc/core.h | 3 ++- drivers/pinctrl/sh-pfc/gpio.c | 1 - drivers/pinctrl/sh-pfc/pfc-r8a7740.c | 3 ++- drivers/pinctrl/sh-pfc/pfc-r8a7779.c | 3 ++- drivers/pinctrl/sh-pfc/pfc-sh7203.c | 3 ++- drivers/pinctrl/sh-pfc/pfc-sh7264.c | 3 ++- drivers/pinctrl/sh-pfc/pfc-sh7269.c | 3 ++- drivers/pinctrl/sh-pfc/pfc-sh7372.c | 3 ++- drivers/pinctrl/sh-pfc/pfc-sh73a0.c | 3 ++- drivers/pinctrl/sh-pfc/pfc-sh7720.c | 3 ++- drivers/pinctrl/sh-pfc/pfc-sh7722.c | 3 ++- drivers/pinctrl/sh-pfc/pfc-sh7723.c | 3 ++- drivers/pinctrl/sh-pfc/pfc-sh7724.c | 3 ++- drivers/pinctrl/sh-pfc/pfc-sh7734.c | 3 ++- drivers/pinctrl/sh-pfc/pfc-sh7757.c | 3 ++- drivers/pinctrl/sh-pfc/pfc-sh7785.c | 3 ++- drivers/pinctrl/sh-pfc/pfc-sh7786.c | 3 ++- drivers/pinctrl/sh-pfc/pfc-shx3.c | 3 ++- drivers/pinctrl/sh-pfc/pinctrl.c | 1 - {include/linux => drivers/pinctrl/sh-pfc}/sh_pfc.h | 0 21 files changed, 34 insertions(+), 20 deletions(-) rename {include/linux => drivers/pinctrl/sh-pfc}/sh_pfc.h (100%) diff --git a/include/linux/sh_pfc.h b/drivers/pinctrl/sh-pfc/sh_pfc.h similarity index 100% rename from include/linux/sh_pfc.h rename to drivers/pinctrl/sh-pfc/sh_pfc.h diff --git a/drivers/pinctrl/sh-pfc/core.c b/drivers/pinctrl/sh-pfc/core.c index 300e55d..062308f 100644 --- a/drivers/pinctrl/sh-pfc/core.c +++ b/drivers/pinctrl/sh-pfc/core.c @@ -19,7 +19,6 @@ #include #include #include -#include #include #include #include diff --git a/drivers/pinctrl/sh-pfc/core.h b/drivers/pinctrl/sh-pfc/core.h index 8b3a0a5..19e2061 100644 --- a/drivers/pinctrl/sh-pfc/core.h +++ b/drivers/pinctrl/sh-pfc/core.h @@ -11,9 +11,10 @@ #define __SH_PFC_CORE_H__ #include -#include #include +#include "sh_pfc.h" + struct pfc_window { phys_addr_t phys; void __iomem *virt; diff --git a/drivers/pinctrl/sh-pfc/gpio.c b/drivers/pinctrl/sh-pfc/gpio.c index 2a68c12..22df3fe 100644 --- a/drivers/pinctrl/sh-pfc/gpio.c +++ b/drivers/pinctrl/sh-pfc/gpio.c @@ -15,7 +15,6 @@ #include #include #include -#include #include #include diff --git a/drivers/pinctrl/sh-pfc/pfc-r8a7740.c b/drivers/pinctrl/sh-pfc/pfc-r8a7740.c index 0ab4cb6..214788c 100644 --- a/drivers/pinctrl/sh-pfc/pfc-r8a7740.c +++ b/drivers/pinctrl/sh-pfc/pfc-r8a7740.c @@ -19,10 +19,11 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ #include -#include #include #include +#include "sh_pfc.h" + #define CPU_ALL_PORT(fn, pfx, sfx) \ PORT_10(fn, pfx, sfx), PORT_90(fn, pfx, sfx), \ PORT_10(fn, pfx##10, sfx), PORT_90(fn, pfx##1, sfx), \ diff --git a/drivers/pinctrl/sh-pfc/pfc-r8a7779.c b/drivers/pinctrl/sh-pfc/pfc-r8a7779.c index 16c9e8c..2ab9ec1 100644 --- a/drivers/pinctrl/sh-pfc/pfc-r8a7779.c +++ b/drivers/pinctrl/sh-pfc/pfc-r8a7779.c @@ -19,9 +19,10 @@ */ #include -#include #include +#include "sh_pfc.h" + #define CPU_32_PORT(fn, pfx, sfx) \ PORT_10(fn, pfx, sfx), PORT_10(fn, pfx##1, sfx), \ PORT_10(fn, pfx##2, sfx), PORT_1(fn, pfx##30, sfx), \ diff --git a/drivers/pinctrl/sh-pfc/pfc-sh7203.c b/drivers/pinctrl/sh-pfc/pfc-sh7203.c index 62bd173..01b425d 100644 --- a/drivers/pinctrl/sh-pfc/pfc-sh7203.c +++ b/drivers/pinctrl/sh-pfc/pfc-sh7203.c @@ -10,9 +10,10 @@ #include #include -#include #include +#include "sh_pfc.h" + enum { PINMUX_RESERVED = 0, diff --git a/drivers/pinctrl/sh-pfc/pfc-sh7264.c b/drivers/pinctrl/sh-pfc/pfc-sh7264.c index 66d7692..8270493 100644 --- a/drivers/pinctrl/sh-pfc/pfc-sh7264.c +++ b/drivers/pinctrl/sh-pfc/pfc-sh7264.c @@ -10,9 +10,10 @@ #include #include -#include #include +#include "sh_pfc.h" + enum { PINMUX_RESERVED = 0, diff --git a/drivers/pinctrl/sh-pfc/pfc-sh7269.c b/drivers/pinctrl/sh-pfc/pfc-sh7269.c index 80da98d..d25825b 100644 --- a/drivers/pinctrl/sh-pfc/pfc-sh7269.c +++ b/drivers/pinctrl/sh-pfc/pfc-sh7269.c @@ -11,9 +11,10 @@ #include #include -#include #include +#include "sh_pfc.h" + enum { PINMUX_RESERVED = 0, diff --git a/drivers/pinctrl/sh-pfc/pfc-sh7372.c b/drivers/pinctrl/sh-pfc/pfc-sh7372.c index a52fabe..d44e7f0 100644 --- a/drivers/pinctrl/sh-pfc/pfc-sh7372.c +++ b/drivers/pinctrl/sh-pfc/pfc-sh7372.c @@ -21,10 +21,11 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ #include -#include #include #include +#include "sh_pfc.h" + #define CPU_ALL_PORT(fn, pfx, sfx) \ PORT_10(fn, pfx, sfx), PORT_90(fn, pfx, sfx), \ PORT_10(fn, pfx##10, sfx), PORT_10(fn, pfx##11, sfx), \ diff --git a/drivers/pinctrl/sh-pfc/pfc-sh73a0.c b/drivers/pinctrl/sh-pfc/pfc-sh73a0.c index 8a0eee9..709008e 100644 --- a/drivers/pinctrl/sh-pfc/pfc-sh73a0.c +++ b/drivers/pinctrl/sh-pfc/pfc-sh73a0.c @@ -19,10 +19,11 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ #include -#include #include #include +#include "sh_pfc.h" + #define CPU_ALL_PORT(fn, pfx, sfx) \ PORT_10(fn, pfx, sfx), PORT_10(fn, pfx##1, sfx), \ PORT_10(fn, pfx##2, sfx), PORT_10(fn, pfx##3, sfx), \ diff --git a/drivers/pinctrl/sh-pfc/pfc-sh7720.c b/drivers/pinctrl/sh-pfc/pfc-sh7720.c index 20d0577..10872ed 100644 --- a/drivers/pinctrl/sh-pfc/pfc-sh7720.c +++ b/drivers/pinctrl/sh-pfc/pfc-sh7720.c @@ -10,9 +10,10 @@ #include #include -#include #include +#include "sh_pfc.h" + enum { PINMUX_RESERVED = 0, diff --git a/drivers/pinctrl/sh-pfc/pfc-sh7722.c b/drivers/pinctrl/sh-pfc/pfc-sh7722.c index f58f009..2de0929 100644 --- a/drivers/pinctrl/sh-pfc/pfc-sh7722.c +++ b/drivers/pinctrl/sh-pfc/pfc-sh7722.c @@ -1,9 +1,10 @@ #include #include #include -#include #include +#include "sh_pfc.h" + enum { PINMUX_RESERVED = 0, diff --git a/drivers/pinctrl/sh-pfc/pfc-sh7723.c b/drivers/pinctrl/sh-pfc/pfc-sh7723.c index 0564099..7943a7a 100644 --- a/drivers/pinctrl/sh-pfc/pfc-sh7723.c +++ b/drivers/pinctrl/sh-pfc/pfc-sh7723.c @@ -10,9 +10,10 @@ #include #include -#include #include +#include "sh_pfc.h" + enum { PINMUX_RESERVED = 0, diff --git a/drivers/pinctrl/sh-pfc/pfc-sh7724.c b/drivers/pinctrl/sh-pfc/pfc-sh7724.c index 85b6253..1e3a6c2 100644 --- a/drivers/pinctrl/sh-pfc/pfc-sh7724.c +++ b/drivers/pinctrl/sh-pfc/pfc-sh7724.c @@ -15,9 +15,10 @@ #include #include -#include #include +#include "sh_pfc.h" + enum { PINMUX_RESERVED = 0, diff --git a/drivers/pinctrl/sh-pfc/pfc-sh7734.c b/drivers/pinctrl/sh-pfc/pfc-sh7734.c index cbb5f4c..23d76d2 100644 --- a/drivers/pinctrl/sh-pfc/pfc-sh7734.c +++ b/drivers/pinctrl/sh-pfc/pfc-sh7734.c @@ -10,9 +10,10 @@ */ #include #include -#include #include +#include "sh_pfc.h" + #define CPU_32_PORT(fn, pfx, sfx) \ PORT_10(fn, pfx, sfx), PORT_10(fn, pfx##1, sfx), \ PORT_10(fn, pfx##2, sfx), PORT_1(fn, pfx##30, sfx), \ diff --git a/drivers/pinctrl/sh-pfc/pfc-sh7757.c b/drivers/pinctrl/sh-pfc/pfc-sh7757.c index 09433b3..07553e3 100644 --- a/drivers/pinctrl/sh-pfc/pfc-sh7757.c +++ b/drivers/pinctrl/sh-pfc/pfc-sh7757.c @@ -15,9 +15,10 @@ #include #include -#include #include +#include "sh_pfc.h" + enum { PINMUX_RESERVED = 0, diff --git a/drivers/pinctrl/sh-pfc/pfc-sh7785.c b/drivers/pinctrl/sh-pfc/pfc-sh7785.c index 23f2c31..3b1825d 100644 --- a/drivers/pinctrl/sh-pfc/pfc-sh7785.c +++ b/drivers/pinctrl/sh-pfc/pfc-sh7785.c @@ -10,9 +10,10 @@ #include #include -#include #include +#include "sh_pfc.h" + enum { PINMUX_RESERVED = 0, diff --git a/drivers/pinctrl/sh-pfc/pfc-sh7786.c b/drivers/pinctrl/sh-pfc/pfc-sh7786.c index 1d80461..15f1d5a 100644 --- a/drivers/pinctrl/sh-pfc/pfc-sh7786.c +++ b/drivers/pinctrl/sh-pfc/pfc-sh7786.c @@ -15,9 +15,10 @@ #include #include -#include #include +#include "sh_pfc.h" + enum { PINMUX_RESERVED = 0, diff --git a/drivers/pinctrl/sh-pfc/pfc-shx3.c b/drivers/pinctrl/sh-pfc/pfc-shx3.c index e21eb24..c5af0cc 100644 --- a/drivers/pinctrl/sh-pfc/pfc-shx3.c +++ b/drivers/pinctrl/sh-pfc/pfc-shx3.c @@ -9,9 +9,10 @@ */ #include #include -#include #include +#include "sh_pfc.h" + enum { PINMUX_RESERVED = 0, diff --git a/drivers/pinctrl/sh-pfc/pinctrl.c b/drivers/pinctrl/sh-pfc/pinctrl.c index 7f3187a..0914f5c 100644 --- a/drivers/pinctrl/sh-pfc/pinctrl.c +++ b/drivers/pinctrl/sh-pfc/pinctrl.c @@ -14,7 +14,6 @@ #include #include #include -#include #include #include #include