ich777/linux_media
1
0
Fork 0
mirror of https://github.com/tbsdtv/linux_media.git synced 2025-07-23 20:51:03 +02:00
Code Issues Packages Projects Releases Wiki Activity

mips: ip22: Reword PANICED to PANICKED and remove useless header

Browse Source 
Many other place in the kernel prefer the latter, so let's keep
it consistent in MIPS code as well. Also, removes a useless header.

Cc: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
Signed-off-by: Guilherme G. Piccoli <gpiccoli@igalia.com>
Signed-off-by: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
This commit is contained in:
Guilherme G. Piccoli
2022-04-27 19:49:01 -03:00
committed by Thomas Bogendoerfer
parent f44b3e74c3
commit d0ab32b0f0
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
arch/mips/sgi-ip22/ip22-reset.c
View File

@@ -11,7 +11,6 @@
#include <linux/interrupt.h> #include <linux/interrupt.h>
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/sched/signal.h> #include <linux/sched/signal.h>
#include <linux/notifier.h>
#include <linux/panic_notifier.h> #include <linux/panic_notifier.h>
#include <linux/pm.h> #include <linux/pm.h>
#include <linux/timer.h> #include <linux/timer.h>
@@ -41,7 +40,7 @@
static struct timer_list power_timer, blink_timer, debounce_timer; static struct timer_list power_timer, blink_timer, debounce_timer;
static unsigned long blink_timer_timeout; static unsigned long blink_timer_timeout;
#define MACHINE_PANICED 1 #define MACHINE_PANICKED 1
#define MACHINE_SHUTTING_DOWN 2 #define MACHINE_SHUTTING_DOWN 2
static int machine_state; static int machine_state;
@@ -112,7 +111,7 @@ static void debounce(struct timer_list *unused)
return; return;
} }
if (machine_state & MACHINE_PANICED) if (machine_state & MACHINE_PANICKED)
sgimc->cpuctrl0 |= SGIMC_CCTRL0_SYSINIT; sgimc->cpuctrl0 |= SGIMC_CCTRL0_SYSINIT;
enable_irq(SGI_PANEL_IRQ); enable_irq(SGI_PANEL_IRQ);
@@ -120,7 +119,7 @@ static void debounce(struct timer_list *unused)
static inline void power_button(void) static inline void power_button(void)
{ {
if (machine_state & MACHINE_PANICED) if (machine_state & MACHINE_PANICKED)
return; return;
if ((machine_state & MACHINE_SHUTTING_DOWN) || if ((machine_state & MACHINE_SHUTTING_DOWN) ||
@@ -167,9 +166,9 @@ static irqreturn_t panel_int(int irq, void *dev_id)
static int panic_event(struct notifier_block *this, unsigned long event, static int panic_event(struct notifier_block *this, unsigned long event,
void *ptr) void *ptr)
{ {
if (machine_state & MACHINE_PANICED) if (machine_state & MACHINE_PANICKED)
return NOTIFY_DONE; return NOTIFY_DONE;
machine_state |= MACHINE_PANICED; machine_state |= MACHINE_PANICKED;
blink_timer_timeout = PANIC_FREQ; blink_timer_timeout = PANIC_FREQ;
blink_timeout(&blink_timer); blink_timeout(&blink_timer);