diff options
| author | Andrey Smirnov <andrew.smirnov@gmail.com> | 2016-07-25 21:45:01 -0700 |
|---|---|---|
| committer | Scott Wood <oss@buserror.net> | 2016-09-24 23:59:51 -0500 |
| commit | 625f3eea40024d0fc6562fc737761bba696c662b (patch) | |
| tree | 41afa31616c20bb37bd741ee89b687527a7b7421 /arch/powerpc | |
| parent | 49bf9279cd3edb9d7178223f52d4656dbf2e46b5 (diff) | |
| download | linux-stable-625f3eea40024d0fc6562fc737761bba696c662b.tar.gz linux-stable-625f3eea40024d0fc6562fc737761bba696c662b.tar.bz2 linux-stable-625f3eea40024d0fc6562fc737761bba696c662b.zip | |
powerpc/sgy_cts1000: Fix gpio_halt_cb()'s signature
Halt callback in struct machdep_calls is declared with __noreturn
attribute, so omitting that attribute in gpio_halt_cb()'s signatrue
results in compilation error.
Change the signature to address the problem as well as change the code
of the function to avoid ever returning from the function.
Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com>
Signed-off-by: Scott Wood <oss@buserror.net>
Diffstat (limited to 'arch/powerpc')
| -rw-r--r-- | arch/powerpc/platforms/85xx/sgy_cts1000.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/arch/powerpc/platforms/85xx/sgy_cts1000.c b/arch/powerpc/platforms/85xx/sgy_cts1000.c index 79fd0dfd4b82..21d6aaa5c3e4 100644 --- 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 void gpio_halt_cb(void) +static void __noreturn gpio_halt_cb(void) { 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)) - return; + panic("Provided GPIO is invalid\n"); trigger = (flags == OF_GPIO_ACTIVE_LOW); @@ -57,6 +57,8 @@ static void gpio_halt_cb(void) /* 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 |