Patchwork [04/10] mmc: mxs-mmc: move header from mach into linux folder

login
register
mail settings
Submitter Shawn Guo
Date May 7, 2012, 2:43 p.m.
Message ID <1336401793-13753-5-git-send-email-shawn.guo@linaro.org>
Download mbox | patch
Permalink /patch/157337/
State New
Headers show

Comments

Shawn Guo - May 7, 2012, 2:43 p.m.
Rename arch/arm/mach-mxs/include/mach/mmc.h to
include/linux/mmc/mxs-mmc.h, so that mxs-mmc driver becomes
<mach/*> inclusion free.

Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
---
 arch/arm/mach-mxs/include/mach/devices-common.h    |    2 +-
 drivers/mmc/host/mxs-mmc.c                         |    3 +--
 .../mach/mmc.h => include/linux/mmc/mxs-mmc.h      |    7 ++++---
 3 files changed, 6 insertions(+), 6 deletions(-)
 rename arch/arm/mach-mxs/include/mach/mmc.h => include/linux/mmc/mxs-mmc.h (81%)
Marek Vasut - May 7, 2012, 11:47 p.m.
Dear Shawn Guo,

> Rename arch/arm/mach-mxs/include/mach/mmc.h to
> include/linux/mmc/mxs-mmc.h, so that mxs-mmc driver becomes
> <mach/*> inclusion free.

Good :-)

Acked-by: Marek Vasut <marex@denx.de>
> 
> Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
> ---
>  arch/arm/mach-mxs/include/mach/devices-common.h    |    2 +-
>  drivers/mmc/host/mxs-mmc.c                         |    3 +--
>  .../mach/mmc.h => include/linux/mmc/mxs-mmc.h      |    7 ++++---
>  3 files changed, 6 insertions(+), 6 deletions(-)
>  rename arch/arm/mach-mxs/include/mach/mmc.h => include/linux/mmc/mxs-mmc.h
> (81%)
> 
> diff --git a/arch/arm/mach-mxs/include/mach/devices-common.h
> b/arch/arm/mach-mxs/include/mach/devices-common.h index 2b37689..6fc0601
> 100644
> --- a/arch/arm/mach-mxs/include/mach/devices-common.h
> +++ b/arch/arm/mach-mxs/include/mach/devices-common.h
> @@ -87,7 +87,7 @@ struct platform_device * __init mxs_add_mxs_i2c(
>  		const struct mxs_mxs_i2c_data *data);
> 
>  /* mmc */
> -#include <mach/mmc.h>
> +#include <linux/mmc/mxs-mmc.h>
>  struct mxs_mxs_mmc_data {
>  	const char *devid;
>  	int id;
> diff --git a/drivers/mmc/host/mxs-mmc.c b/drivers/mmc/host/mxs-mmc.c
> index 54bbb8b..c70c7c7 100644
> --- a/drivers/mmc/host/mxs-mmc.c
> +++ b/drivers/mmc/host/mxs-mmc.c
> @@ -41,8 +41,7 @@
>  #include <linux/fsl/mxs-dma.h>
>  #include <linux/pinctrl/consumer.h>
>  #include <linux/stmp_device.h>
> -
> -#include <mach/mmc.h>
> +#include <linux/mmc/mxs-mmc.h>
> 
>  #define DRIVER_NAME	"mxs-mmc"
> 
> diff --git a/arch/arm/mach-mxs/include/mach/mmc.h
> b/include/linux/mmc/mxs-mmc.h similarity index 81%
> rename from arch/arm/mach-mxs/include/mach/mmc.h
> rename to include/linux/mmc/mxs-mmc.h
> index 211547a..7c2ad3a 100644
> --- a/arch/arm/mach-mxs/include/mach/mmc.h
> +++ b/include/linux/mmc/mxs-mmc.h
> @@ -6,8 +6,8 @@
>   * published by the Free Software Foundation.
>   */
> 
> -#ifndef __MACH_MXS_MMC_H__
> -#define __MACH_MXS_MMC_H__
> +#ifndef __LINUX_MMC_MXS_MMC_H__
> +#define __LINUX_MMC_MXS_MMC_H__
> 
>  struct mxs_mmc_platform_data {
>  	int wp_gpio;	/* write protect pin */
> @@ -15,4 +15,5 @@ struct mxs_mmc_platform_data {
>  #define SLOTF_4_BIT_CAPABLE	(1 << 0)
>  #define SLOTF_8_BIT_CAPABLE	(1 << 1)
>  };
> -#endif /* __MACH_MXS_MMC_H__ */
> +
> +#endif /* __LINUX_MMC_MXS_MMC_H__ */

Best regards,
Marek Vasut

Patch

diff --git a/arch/arm/mach-mxs/include/mach/devices-common.h b/arch/arm/mach-mxs/include/mach/devices-common.h
index 2b37689..6fc0601 100644
--- a/arch/arm/mach-mxs/include/mach/devices-common.h
+++ b/arch/arm/mach-mxs/include/mach/devices-common.h
@@ -87,7 +87,7 @@  struct platform_device * __init mxs_add_mxs_i2c(
 		const struct mxs_mxs_i2c_data *data);
 
 /* mmc */
-#include <mach/mmc.h>
+#include <linux/mmc/mxs-mmc.h>
 struct mxs_mxs_mmc_data {
 	const char *devid;
 	int id;
diff --git a/drivers/mmc/host/mxs-mmc.c b/drivers/mmc/host/mxs-mmc.c
index 54bbb8b..c70c7c7 100644
--- a/drivers/mmc/host/mxs-mmc.c
+++ b/drivers/mmc/host/mxs-mmc.c
@@ -41,8 +41,7 @@ 
 #include <linux/fsl/mxs-dma.h>
 #include <linux/pinctrl/consumer.h>
 #include <linux/stmp_device.h>
-
-#include <mach/mmc.h>
+#include <linux/mmc/mxs-mmc.h>
 
 #define DRIVER_NAME	"mxs-mmc"
 
diff --git a/arch/arm/mach-mxs/include/mach/mmc.h b/include/linux/mmc/mxs-mmc.h
similarity index 81%
rename from arch/arm/mach-mxs/include/mach/mmc.h
rename to include/linux/mmc/mxs-mmc.h
index 211547a..7c2ad3a 100644
--- a/arch/arm/mach-mxs/include/mach/mmc.h
+++ b/include/linux/mmc/mxs-mmc.h
@@ -6,8 +6,8 @@ 
  * published by the Free Software Foundation.
  */
 
-#ifndef __MACH_MXS_MMC_H__
-#define __MACH_MXS_MMC_H__
+#ifndef __LINUX_MMC_MXS_MMC_H__
+#define __LINUX_MMC_MXS_MMC_H__
 
 struct mxs_mmc_platform_data {
 	int wp_gpio;	/* write protect pin */
@@ -15,4 +15,5 @@  struct mxs_mmc_platform_data {
 #define SLOTF_4_BIT_CAPABLE	(1 << 0)
 #define SLOTF_8_BIT_CAPABLE	(1 << 1)
 };
-#endif /* __MACH_MXS_MMC_H__ */
+
+#endif /* __LINUX_MMC_MXS_MMC_H__ */