diff mbox

[1/1] ata: pata_samsung_cf: Move plat/regs-ata.h to drivers/ata

Message ID 1388467753-24431-1-git-send-email-sachin.kamat@linaro.org (mailing list archive)
State New, archived
Headers show

Commit Message

Sachin Kamat Dec. 31, 2013, 5:29 a.m. UTC
plat/regs-ata.h is used only by Samsung PATA driver.
Move this file to the drivers folder to remove platform
dependency required for multiplatform support.

Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
---
 drivers/ata/pata_samsung_cf.c                      |    2 +-
 .../regs-ata.h => drivers/ata/pata_samsung_cf.h    |    9 ++++-----
 2 files changed, 5 insertions(+), 6 deletions(-)
 rename arch/arm/plat-samsung/include/plat/regs-ata.h => drivers/ata/pata_samsung_cf.h (91%)

Comments

Jingoo Han Dec. 31, 2013, 6:32 a.m. UTC | #1
On Tuesday, December 31, 2013 2:29 PM, Sachin Kamat wrote:
> 
> plat/regs-ata.h is used only by Samsung PATA driver.
> Move this file to the drivers folder to remove platform
> dependency required for multiplatform support.
> 
> Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>

Reviewed-by: Jingoo Han <jg1.han@samsung.com>

Best regards,
Jingoo Han

> ---
>  drivers/ata/pata_samsung_cf.c                      |    2 +-
>  .../regs-ata.h => drivers/ata/pata_samsung_cf.h    |    9 ++++-----
>  2 files changed, 5 insertions(+), 6 deletions(-)
>  rename arch/arm/plat-samsung/include/plat/regs-ata.h => drivers/ata/pata_samsung_cf.h (91%)
> 
> diff --git a/drivers/ata/pata_samsung_cf.c b/drivers/ata/pata_samsung_cf.c
> index 898e544a7ae8..e04d70b7ce76 100644
> --- a/drivers/ata/pata_samsung_cf.c
> +++ b/drivers/ata/pata_samsung_cf.c
> @@ -24,7 +24,7 @@
>  #include <linux/slab.h>
> 
>  #include <linux/platform_data/ata-samsung_cf.h>
> -#include <plat/regs-ata.h>
> +#include "pata_samsung_cf.h"
> 
>  #define DRV_NAME "pata_samsung_cf"
>  #define DRV_VERSION "0.1"
> diff --git a/arch/arm/plat-samsung/include/plat/regs-ata.h b/drivers/ata/pata_samsung_cf.h
> similarity index 91%
> rename from arch/arm/plat-samsung/include/plat/regs-ata.h
> rename to drivers/ata/pata_samsung_cf.h
> index f5df92fdae26..eeefe2e0cdc6 100644
> --- a/arch/arm/plat-samsung/include/plat/regs-ata.h
> +++ b/drivers/ata/pata_samsung_cf.h
> @@ -1,5 +1,4 @@
> -/* linux/arch/arm/plat-samsung/include/plat/regs-ata.h
> - *
> +/*
>   * Copyright (c) 2010 Samsung Electronics Co., Ltd.
>   *		http://www.samsung.com
>   *
> @@ -10,8 +9,8 @@
>   * published by the Free Software Foundation.
>  */
> 
> -#ifndef __ASM_PLAT_REGS_ATA_H
> -#define __ASM_PLAT_REGS_ATA_H __FILE__
> +#ifndef __PATA_SAMSUNG_CF_H
> +#define __PATA_SAMSUNG_CF_H
> 
>  #define S3C_CFATA_REG(x)	(x)
> 
> @@ -53,4 +52,4 @@
>  #define S3C_ATA_CFG_SWAP	0x40
>  #define S3C_ATA_CFG_IORDYEN	0x02
> 
> -#endif /* __ASM_PLAT_REGS_ATA_H */
> +#endif /* __PATA_SAMSUNG_CF_H */
> --
> 1.7.9.5
> 
> --

--
To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Tejun Heo Dec. 31, 2013, 11:34 a.m. UTC | #2
On Tue, Dec 31, 2013 at 10:59:13AM +0530, Sachin Kamat wrote:
> plat/regs-ata.h is used only by Samsung PATA driver.
> Move this file to the drivers folder to remove platform
> dependency required for multiplatform support.
> 
> Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>

Applied to libata/for-3.14.

As this is only used by pata_samsung_cf.c, can you please follow up
with a patch to roll pata_samsung_cf.h into .c?  There's no point in
creating separate header files for stuff which isn't shared among
multiple files.

Thanks.
Jingoo Han Jan. 2, 2014, 12:49 a.m. UTC | #3
On Tuesday, December 31, 2013 8:34 PM, Tejun Heo wrote:
> On Tue, Dec 31, 2013 at 10:59:13AM +0530, Sachin Kamat wrote:
> > plat/regs-ata.h is used only by Samsung PATA driver.
> > Move this file to the drivers folder to remove platform
> > dependency required for multiplatform support.
> >
> > Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
> 
> Applied to libata/for-3.14.
> 
> As this is only used by pata_samsung_cf.c, can you please follow up
> with a patch to roll pata_samsung_cf.h into .c?  There's no point in
> creating separate header files for stuff which isn't shared among
> multiple files.

(+cc Brian Norris, linux-mtd mailing list)

Right, I also agree with Tejun's opinion.
Would you also send the patch to roll .h into .c for your another
patch "mtd: s3c2410: Move plat/regs-nand.h to drivers/mtd"?
(http://www.spinics.net/lists/linux-samsung-soc/msg25498.html)

Best regards,
Jingoo Han

--
To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
kgene@kernel.org Jan. 4, 2014, 2 a.m. UTC | #4
Sachin Kamat wrote:
> 
> plat/regs-ata.h is used only by Samsung PATA driver.
> Move this file to the drivers folder to remove platform
> dependency required for multiplatform support.
> 
> Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
> ---
>  drivers/ata/pata_samsung_cf.c                      |    2 +-
>  .../regs-ata.h => drivers/ata/pata_samsung_cf.h    |    9 ++++-----
>  2 files changed, 5 insertions(+), 6 deletions(-)
>  rename arch/arm/plat-samsung/include/plat/regs-ata.h =>
> drivers/ata/pata_samsung_cf.h (91%)
> 
I don't know we need to create header file into drivers/ata/ because the
header will be used for only pata_samsung_cf.c. But it's up to Tejun who is
a maintainer of SERIAL ATA ;-)

Thanks,
Kukjin

--
To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
kgene@kernel.org Jan. 4, 2014, 2:25 a.m. UTC | #5
Tejun Heo wrote:
> 
> On Tue, Dec 31, 2013 at 10:59:13AM +0530, Sachin Kamat wrote:
> > plat/regs-ata.h is used only by Samsung PATA driver.
> > Move this file to the drivers folder to remove platform
> > dependency required for multiplatform support.
> >
> > Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
> 
> Applied to libata/for-3.14.
> 
> As this is only used by pata_samsung_cf.c, can you please follow up
> with a patch to roll pata_samsung_cf.h into .c?  There's no point in
> creating separate header files for stuff which isn't shared among
> multiple files.
> 
Oops, I read this just now ;-)

Tejun, if you've applied this in your tree already, I'm OK so please kindly
ignore my previous reply.

Sachin, when you move the definitions into the .c file per Tejun's
suggestion, please cleanup useless definitions.

Thanks and happy new year.
- Kukjin

--
To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

diff --git a/drivers/ata/pata_samsung_cf.c b/drivers/ata/pata_samsung_cf.c
index 898e544a7ae8..e04d70b7ce76 100644
--- a/drivers/ata/pata_samsung_cf.c
+++ b/drivers/ata/pata_samsung_cf.c
@@ -24,7 +24,7 @@ 
 #include <linux/slab.h>
 
 #include <linux/platform_data/ata-samsung_cf.h>
-#include <plat/regs-ata.h>
+#include "pata_samsung_cf.h"
 
 #define DRV_NAME "pata_samsung_cf"
 #define DRV_VERSION "0.1"
diff --git a/arch/arm/plat-samsung/include/plat/regs-ata.h b/drivers/ata/pata_samsung_cf.h
similarity index 91%
rename from arch/arm/plat-samsung/include/plat/regs-ata.h
rename to drivers/ata/pata_samsung_cf.h
index f5df92fdae26..eeefe2e0cdc6 100644
--- a/arch/arm/plat-samsung/include/plat/regs-ata.h
+++ b/drivers/ata/pata_samsung_cf.h
@@ -1,5 +1,4 @@ 
-/* linux/arch/arm/plat-samsung/include/plat/regs-ata.h
- *
+/*
  * Copyright (c) 2010 Samsung Electronics Co., Ltd.
  *		http://www.samsung.com
  *
@@ -10,8 +9,8 @@ 
  * published by the Free Software Foundation.
 */
 
-#ifndef __ASM_PLAT_REGS_ATA_H
-#define __ASM_PLAT_REGS_ATA_H __FILE__
+#ifndef __PATA_SAMSUNG_CF_H
+#define __PATA_SAMSUNG_CF_H
 
 #define S3C_CFATA_REG(x)	(x)
 
@@ -53,4 +52,4 @@ 
 #define S3C_ATA_CFG_SWAP	0x40
 #define S3C_ATA_CFG_IORDYEN	0x02
 
-#endif /* __ASM_PLAT_REGS_ATA_H */
+#endif /* __PATA_SAMSUNG_CF_H */