projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'powerpc-4.9-2' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc...
[cascardo/linux.git]
/
arch
/
powerpc
/
platforms
/
85xx
/
sgy_cts1000.c
diff --git
a/arch/powerpc/platforms/85xx/sgy_cts1000.c
b/arch/powerpc/platforms/85xx/sgy_cts1000.c
index
79fd0df
..
21d6aaa
100644
(file)
--- a/
arch/powerpc/platforms/85xx/sgy_cts1000.c
+++ b/
arch/powerpc/platforms/85xx/sgy_cts1000.c
@@
-38,18
+38,18
@@
static void gpio_halt_wfn(struct work_struct *work)
}
static DECLARE_WORK(gpio_halt_wq, gpio_halt_wfn);
}
static DECLARE_WORK(gpio_halt_wq, gpio_halt_wfn);
-static void gpio_halt_cb(void)
+static void
__noreturn
gpio_halt_cb(void)
{
enum of_gpio_flags flags;
int trigger, gpio;
if (!halt_node)
{
enum of_gpio_flags flags;
int trigger, gpio;
if (!halt_node)
-
return
;
+
panic("No reset GPIO information was provided in DT\n")
;
gpio = of_get_gpio_flags(halt_node, 0, &flags);
if (!gpio_is_valid(gpio))
gpio = of_get_gpio_flags(halt_node, 0, &flags);
if (!gpio_is_valid(gpio))
-
return
;
+
panic("Provided GPIO is invalid\n")
;
trigger = (flags == OF_GPIO_ACTIVE_LOW);
trigger = (flags == OF_GPIO_ACTIVE_LOW);
@@
-57,6
+57,8
@@
static void gpio_halt_cb(void)
/* Probably wont return */
gpio_set_value(gpio, trigger);
/* Probably wont return */
gpio_set_value(gpio, trigger);
+
+ panic("Halt failed\n");
}
/* This IRQ means someone pressed the power button and it is waiting for us
}
/* This IRQ means someone pressed the power button and it is waiting for us