diff options
author | Stephen Boyd <sboyd@codeaurora.org> | 2012-08-22 18:55:43 -0400 |
---|---|---|
committer | David Brown <davidb@codeaurora.org> | 2012-09-13 13:43:57 -0400 |
commit | 085eea143effef565e6b508ccb793921d0d7f4d4 (patch) | |
tree | ad139d143f3bab18c526794d3306fb41109c1f3b | |
parent | 28a33cbc24e4256c143dce96c7d93bf423229f92 (diff) |
ARM: msm: Remove msm_hw_reset_hook
This reset hook is never assigned and is dead code. Remove it so
we have one less header file in the mach directory.
Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
Signed-off-by: David Brown <davidb@codeaurora.org>
-rw-r--r-- | arch/arm/mach-msm/board-mahimahi.c | 1 | ||||
-rw-r--r-- | arch/arm/mach-msm/board-sapphire.c | 1 | ||||
-rw-r--r-- | arch/arm/mach-msm/include/mach/system.h | 19 | ||||
-rw-r--r-- | arch/arm/mach-msm/proc_comm.c | 1 | ||||
-rw-r--r-- | arch/arm/mach-msm/smd.c | 7 |
5 files changed, 0 insertions, 29 deletions
diff --git a/arch/arm/mach-msm/board-mahimahi.c b/arch/arm/mach-msm/board-mahimahi.c index cf1f89a5dc62..df00bc03ce74 100644 --- a/arch/arm/mach-msm/board-mahimahi.c +++ b/arch/arm/mach-msm/board-mahimahi.c | |||
@@ -30,7 +30,6 @@ | |||
30 | 30 | ||
31 | #include <mach/board.h> | 31 | #include <mach/board.h> |
32 | #include <mach/hardware.h> | 32 | #include <mach/hardware.h> |
33 | #include <mach/system.h> | ||
34 | 33 | ||
35 | #include "board-mahimahi.h" | 34 | #include "board-mahimahi.h" |
36 | #include "devices.h" | 35 | #include "devices.h" |
diff --git a/arch/arm/mach-msm/board-sapphire.c b/arch/arm/mach-msm/board-sapphire.c index 2e569ab10eef..b7b0fc7e3278 100644 --- a/arch/arm/mach-msm/board-sapphire.c +++ b/arch/arm/mach-msm/board-sapphire.c | |||
@@ -27,7 +27,6 @@ | |||
27 | #include <asm/mach/arch.h> | 27 | #include <asm/mach/arch.h> |
28 | #include <asm/mach/map.h> | 28 | #include <asm/mach/map.h> |
29 | #include <asm/mach/flash.h> | 29 | #include <asm/mach/flash.h> |
30 | #include <mach/system.h> | ||
31 | #include <mach/vreg.h> | 30 | #include <mach/vreg.h> |
32 | #include <mach/board.h> | 31 | #include <mach/board.h> |
33 | 32 | ||
diff --git a/arch/arm/mach-msm/include/mach/system.h b/arch/arm/mach-msm/include/mach/system.h deleted file mode 100644 index f5fb2ec87ffe..000000000000 --- a/arch/arm/mach-msm/include/mach/system.h +++ /dev/null | |||
@@ -1,19 +0,0 @@ | |||
1 | /* arch/arm/mach-msm/include/mach/system.h | ||
2 | * | ||
3 | * Copyright (C) 2007 Google, Inc. | ||
4 | * | ||
5 | * This software is licensed under the terms of the GNU General Public | ||
6 | * License version 2, as published by the Free Software Foundation, and | ||
7 | * may be copied, distributed, and modified under those terms. | ||
8 | * | ||
9 | * This program is distributed in the hope that it will be useful, | ||
10 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
11 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
12 | * GNU General Public License for more details. | ||
13 | * | ||
14 | */ | ||
15 | |||
16 | /* low level hardware reset hook -- for example, hitting the | ||
17 | * PSHOLD line on the PMIC to hard reset the system | ||
18 | */ | ||
19 | extern void (*msm_hw_reset_hook)(void); | ||
diff --git a/arch/arm/mach-msm/proc_comm.c b/arch/arm/mach-msm/proc_comm.c index 9980dc736e7b..8f1eecd88186 100644 --- a/arch/arm/mach-msm/proc_comm.c +++ b/arch/arm/mach-msm/proc_comm.c | |||
@@ -19,7 +19,6 @@ | |||
19 | #include <linux/io.h> | 19 | #include <linux/io.h> |
20 | #include <linux/spinlock.h> | 20 | #include <linux/spinlock.h> |
21 | #include <mach/msm_iomap.h> | 21 | #include <mach/msm_iomap.h> |
22 | #include <mach/system.h> | ||
23 | 22 | ||
24 | #include "proc_comm.h" | 23 | #include "proc_comm.h" |
25 | 24 | ||
diff --git a/arch/arm/mach-msm/smd.c b/arch/arm/mach-msm/smd.c index 657be73297db..84183ed2ef79 100644 --- a/arch/arm/mach-msm/smd.c +++ b/arch/arm/mach-msm/smd.c | |||
@@ -30,7 +30,6 @@ | |||
30 | #include <linux/delay.h> | 30 | #include <linux/delay.h> |
31 | 31 | ||
32 | #include <mach/msm_smd.h> | 32 | #include <mach/msm_smd.h> |
33 | #include <mach/system.h> | ||
34 | 33 | ||
35 | #include "smd_private.h" | 34 | #include "smd_private.h" |
36 | #include "proc_comm.h" | 35 | #include "proc_comm.h" |
@@ -39,8 +38,6 @@ | |||
39 | #define CONFIG_QDSP6 1 | 38 | #define CONFIG_QDSP6 1 |
40 | #endif | 39 | #endif |
41 | 40 | ||
42 | void (*msm_hw_reset_hook)(void); | ||
43 | |||
44 | #define MODULE_NAME "msm_smd" | 41 | #define MODULE_NAME "msm_smd" |
45 | 42 | ||
46 | enum { | 43 | enum { |
@@ -101,10 +98,6 @@ static void handle_modem_crash(void) | |||
101 | pr_err("ARM9 has CRASHED\n"); | 98 | pr_err("ARM9 has CRASHED\n"); |
102 | smd_diag(); | 99 | smd_diag(); |
103 | 100 | ||
104 | /* hard reboot if possible */ | ||
105 | if (msm_hw_reset_hook) | ||
106 | msm_hw_reset_hook(); | ||
107 | |||
108 | /* in this case the modem or watchdog should reboot us */ | 101 | /* in this case the modem or watchdog should reboot us */ |
109 | for (;;) | 102 | for (;;) |
110 | ; | 103 | ; |