From e979b1a9b47dbe56fa7543bde3dc093231c1eb6e Mon Sep 17 00:00:00 2001 From: Kukjin Kim Date: Thu, 30 Jul 2015 02:00:36 +0900 Subject: ARM: SAMSUNG: local ata-core header in mach-s3c64xx This patch moves ata-core header file into mach-s3c64xx. Because it is not used for others except mach-s3c64xx. Cc: Krzysztof Kozlowski Signed-off-by: Kukjin Kim --- arch/arm/mach-s3c64xx/ata-core.h | 27 ++++++++++++++++++++++++++ arch/arm/mach-s3c64xx/s3c6410.c | 2 +- arch/arm/plat-samsung/include/plat/ata-core.h | 28 --------------------------- 3 files changed, 28 insertions(+), 29 deletions(-) create mode 100644 arch/arm/mach-s3c64xx/ata-core.h delete mode 100644 arch/arm/plat-samsung/include/plat/ata-core.h (limited to 'arch') diff --git a/arch/arm/mach-s3c64xx/ata-core.h b/arch/arm/mach-s3c64xx/ata-core.h new file mode 100644 index 000000000000..5951f24a9ec8 --- /dev/null +++ b/arch/arm/mach-s3c64xx/ata-core.h @@ -0,0 +1,27 @@ +/* + * Copyright (c) 2010 Samsung Electronics Co., Ltd. + * http://www.samsung.com + * + * Samsung CF-ATA Controller core functions + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. +*/ + +#ifndef __ASM_PLAT_ATA_CORE_H +#define __ASM_PLAT_ATA_CORE_H __FILE__ + +/* These functions are only for use with the core support code, such as + * the cpu specific initialisation code +*/ + +/* re-define device name depending on support. */ +static inline void s3c_cfcon_setname(char *name) +{ +#ifdef CONFIG_SAMSUNG_DEV_IDE + s3c_device_cfcon.name = name; +#endif +} + +#endif /* __ASM_PLAT_ATA_CORE_H */ diff --git a/arch/arm/mach-s3c64xx/s3c6410.c b/arch/arm/mach-s3c64xx/s3c6410.c index b2a7930548d9..5081f08f56d3 100644 --- a/arch/arm/mach-s3c64xx/s3c6410.c +++ b/arch/arm/mach-s3c64xx/s3c6410.c @@ -41,11 +41,11 @@ #include #include #include -#include #include #include #include +#include "ata-core.h" #include "common.h" void __init s3c6410_map_io(void) diff --git a/arch/arm/plat-samsung/include/plat/ata-core.h b/arch/arm/plat-samsung/include/plat/ata-core.h deleted file mode 100644 index f5a4ec7141b1..000000000000 --- a/arch/arm/plat-samsung/include/plat/ata-core.h +++ /dev/null @@ -1,28 +0,0 @@ -/* linux/arch/arm/plat-samsung/include/plat/ata-core.h - * - * Copyright (c) 2010 Samsung Electronics Co., Ltd. - * http://www.samsung.com - * - * Samsung CF-ATA Controller core functions - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation. -*/ - -#ifndef __ASM_PLAT_ATA_CORE_H -#define __ASM_PLAT_ATA_CORE_H __FILE__ - -/* These functions are only for use with the core support code, such as - * the cpu specific initialisation code -*/ - -/* re-define device name depending on support. */ -static inline void s3c_cfcon_setname(char *name) -{ -#ifdef CONFIG_SAMSUNG_DEV_IDE - s3c_device_cfcon.name = name; -#endif -} - -#endif /* __ASM_PLAT_ATA_CORE_H */ -- cgit v1.2.3