[PATCH 1/1] ata: ata-samsung_cf: Trivial cleanup in header file

[PATCH 1/1] ata: ata-samsung_cf: Trivial cleanup in header file

[Sachin Kamat]

Commit 436d42c61c3e ("ARM: samsung: move platform_data definitions")
moved the files to the current location but forgot to remove the pointer
to its previous location. Clean it up. While at it also change the header
file protection macros appropriately.

Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
---
 include/linux/platform_data/ata-samsung_cf.h |    9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/include/linux/platform_data/ata-samsung_cf.h b/include/linux/platform_data/ata-samsung_cf.h
index 2a3855a8372a..064f86329219 100644
--- a/include/linux/platform_data/ata-samsung_cf.h
+++ b/include/linux/platform_data/ata-samsung_cf.h
@@ -1,5 +1,4 @@
-/* linux/arch/arm/plat-samsung/include/plat/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_ATA_H
-#define __ASM_PLAT_ATA_H __FILE__
+#ifndef __ATA_SAMSUNG_CF_ATA_H
+#define __ATA_SAMSUNG_CF_ATA_H __FILE__
 
 /**
  * struct s3c_ide_platdata - S3C IDE driver platform data.
@@ -33,4 +32,4 @@ extern void s3c64xx_ide_setup_gpio(void);
 extern void s5pc100_ide_setup_gpio(void);
 extern void s5pv210_ide_setup_gpio(void);
 
-#endif /*__ASM_PLAT_ATA_H */
+#endif /*__ATA_SAMSUNG_CF_ATA_H */
-- 
1.7.9.5

Re: [PATCH 1/1] ata: ata-samsung_cf: Trivial cleanup in header file

[Sergei Shtylyov]

Hello.

On 14-02-2014 10:25, Sachin Kamat wrote:

> Commit 436d42c61c3e ("ARM: samsung: move platform_data definitions")
> moved the files to the current location but forgot to remove the pointer
> to its previous location. Clean it up. While at it also change the header
> file protection macros appropriately.
> Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>

> ---
>   include/linux/platform_data/ata-samsung_cf.h |    9 ++++-----
>   1 file changed, 4 insertions(+), 5 deletions(-)

> diff --git a/include/linux/platform_data/ata-samsung_cf.h b/include/linux/platform_data/ata-samsung_cf.h
> index 2a3855a8372a..064f86329219 100644
> --- a/include/linux/platform_data/ata-samsung_cf.h
> +++ b/include/linux/platform_data/ata-samsung_cf.h
[...]
> @@ -10,8 +9,8 @@
>    * published by the Free Software Foundation.
>   */
>
> -#ifndef __ASM_PLAT_ATA_H
> -#define __ASM_PLAT_ATA_H __FILE__
> +#ifndef __ATA_SAMSUNG_CF_ATA_H
> +#define __ATA_SAMSUNG_CF_ATA_H __FILE__

    Why not just __ATA_SAMSUNG_CF_H?

WBR, Sergei

Re: [PATCH 1/1] ata: ata-samsung_cf: Trivial cleanup in header file

[Sachin Kamat]

On 14 February 2014 18:58, Sergei Shtylyov
<sergei.shtylyov@cogentembedded.com> wrote:
> Hello.
>
>
> On 14-02-2014 10:25, Sachin Kamat wrote:
>
>> Commit 436d42c61c3e ("ARM: samsung: move platform_data definitions")
>> moved the files to the current location but forgot to remove the pointer
>> to its previous location. Clean it up. While at it also change the header
>> file protection macros appropriately.
>> Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
>
>
>> ---
>>   include/linux/platform_data/ata-samsung_cf.h |    9 ++++-----
>>   1 file changed, 4 insertions(+), 5 deletions(-)
>
>
>> diff --git a/include/linux/platform_data/ata-samsung_cf.h
>> b/include/linux/platform_data/ata-samsung_cf.h
>> index 2a3855a8372a..064f86329219 100644
>> --- a/include/linux/platform_data/ata-samsung_cf.h
>> +++ b/include/linux/platform_data/ata-samsung_cf.h
>
> [...]
>
>> @@ -10,8 +9,8 @@
>>    * published by the Free Software Foundation.
>>   */
>>
>> -#ifndef __ASM_PLAT_ATA_H
>> -#define __ASM_PLAT_ATA_H __FILE__
>> +#ifndef __ATA_SAMSUNG_CF_ATA_H
>> +#define __ATA_SAMSUNG_CF_ATA_H __FILE__
>
>
>    Why not just __ATA_SAMSUNG_CF_H?

Yes that should have been it. Not sure why I added one more ATA.
Thanks for pointing out.

-- 
With warm regards,
Sachin