diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-11-06 17:22:23 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-01-05 13:57:21 +0100 |
| commit | d9eedaf329a28a20a4b0f18fed2beb40be10a406 (patch) | |
| tree | bcf266ac23070f5c41dcd2a6091ee327df17a94a /arch | |
| parent | ARM: restart: w90x900: use new restart hook (diff) | |
| download | linux-d9eedaf329a28a20a4b0f18fed2beb40be10a406.tar.xz linux-d9eedaf329a28a20a4b0f18fed2beb40be10a406.zip | |
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')
| -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 @@ -/* linux/arch/arm/plat-samsung/include/plat/reset.h - * - * Copyright (c) 2010 Samsung Electronics Co., Ltd. - * http://www.samsung.com/ - * - * 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 __PLAT_SAMSUNG_RESET_H -#define __PLAT_SAMSUNG_RESET_H __FILE__ - -extern void (*s5p_reset_hook)(void); - -#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 @@ #include <plat/watchdog-reset.h> -void (*s5p_reset_hook)(void); - static void arch_reset(char mode, const char *cmd) { - /* SWRESET support in s5p_reset_hook() */ - - if (s5p_reset_hook) - s5p_reset_hook(); - - /* Perform reset using Watchdog reset - * if there is no s5p_reset_hook() - */ - arch_wdt_reset(); } |