diff options
author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-11-06 11:22:23 -0500 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-01-05 07:57:21 -0500 |
commit | d9eedaf329a28a20a4b0f18fed2beb40be10a406 (patch) | |
tree | bcf266ac23070f5c41dcd2a6091ee327df17a94a /arch/arm/plat-samsung | |
parent | fe76daea9ede24f9f53cb847563c2fa7a50cedf2 (diff) |
ARM: restart: plat-samsung: remove plat/reset.h and s5p_reset_hook
Now that s5p_reset_hook is unused, we can get rid of plat/reset.h and
the s5p_reset_hook code in plat/system-reset.h.
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/plat-samsung')
-rw-r--r-- | arch/arm/plat-samsung/include/plat/reset.h | 16 | ||||
-rw-r--r-- | arch/arm/plat-samsung/include/plat/system-reset.h | 11 |
2 files changed, 0 insertions, 27 deletions
diff --git a/arch/arm/plat-samsung/include/plat/reset.h b/arch/arm/plat-samsung/include/plat/reset.h deleted file mode 100644 index 32ca5179c6e1..000000000000 --- a/arch/arm/plat-samsung/include/plat/reset.h +++ /dev/null | |||
@@ -1,16 +0,0 @@ | |||
1 | /* linux/arch/arm/plat-samsung/include/plat/reset.h | ||
2 | * | ||
3 | * Copyright (c) 2010 Samsung Electronics Co., Ltd. | ||
4 | * http://www.samsung.com/ | ||
5 | * | ||
6 | * This program is free software; you can redistribute it and/or modify | ||
7 | * it under the terms of the GNU General Public License version 2 as | ||
8 | * published by the Free Software Foundation. | ||
9 | */ | ||
10 | |||
11 | #ifndef __PLAT_SAMSUNG_RESET_H | ||
12 | #define __PLAT_SAMSUNG_RESET_H __FILE__ | ||
13 | |||
14 | extern void (*s5p_reset_hook)(void); | ||
15 | |||
16 | #endif /* __PLAT_SAMSUNG_RESET_H */ | ||
diff --git a/arch/arm/plat-samsung/include/plat/system-reset.h b/arch/arm/plat-samsung/include/plat/system-reset.h index a448e990964d..73d7808a26f1 100644 --- a/arch/arm/plat-samsung/include/plat/system-reset.h +++ b/arch/arm/plat-samsung/include/plat/system-reset.h | |||
@@ -14,18 +14,7 @@ | |||
14 | 14 | ||
15 | #include <plat/watchdog-reset.h> | 15 | #include <plat/watchdog-reset.h> |
16 | 16 | ||
17 | void (*s5p_reset_hook)(void); | ||
18 | |||
19 | static void arch_reset(char mode, const char *cmd) | 17 | static void arch_reset(char mode, const char *cmd) |
20 | { | 18 | { |
21 | /* SWRESET support in s5p_reset_hook() */ | ||
22 | |||
23 | if (s5p_reset_hook) | ||
24 | s5p_reset_hook(); | ||
25 | |||
26 | /* Perform reset using Watchdog reset | ||
27 | * if there is no s5p_reset_hook() | ||
28 | */ | ||
29 | |||
30 | arch_wdt_reset(); | 19 | arch_wdt_reset(); |
31 | } | 20 | } |