diff options
Diffstat (limited to 'drivers/char/ipmi')
-rw-r--r-- | drivers/char/ipmi/ipmi_si_intf.c | 6 | ||||
-rw-r--r-- | drivers/char/ipmi/ipmi_watchdog.c | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/drivers/char/ipmi/ipmi_si_intf.c b/drivers/char/ipmi/ipmi_si_intf.c index b106c45abfc9..24825bdca8f4 100644 --- a/drivers/char/ipmi/ipmi_si_intf.c +++ b/drivers/char/ipmi/ipmi_si_intf.c | |||
@@ -872,7 +872,7 @@ static void smi_timeout(unsigned long data) | |||
872 | add_timer(&(smi_info->si_timer)); | 872 | add_timer(&(smi_info->si_timer)); |
873 | } | 873 | } |
874 | 874 | ||
875 | static irqreturn_t si_irq_handler(int irq, void *data, struct pt_regs *regs) | 875 | static irqreturn_t si_irq_handler(int irq, void *data) |
876 | { | 876 | { |
877 | struct smi_info *smi_info = data; | 877 | struct smi_info *smi_info = data; |
878 | unsigned long flags; | 878 | unsigned long flags; |
@@ -899,14 +899,14 @@ static irqreturn_t si_irq_handler(int irq, void *data, struct pt_regs *regs) | |||
899 | return IRQ_HANDLED; | 899 | return IRQ_HANDLED; |
900 | } | 900 | } |
901 | 901 | ||
902 | static irqreturn_t si_bt_irq_handler(int irq, void *data, struct pt_regs *regs) | 902 | static irqreturn_t si_bt_irq_handler(int irq, void *data) |
903 | { | 903 | { |
904 | struct smi_info *smi_info = data; | 904 | struct smi_info *smi_info = data; |
905 | /* We need to clear the IRQ flag for the BT interface. */ | 905 | /* We need to clear the IRQ flag for the BT interface. */ |
906 | smi_info->io.outputb(&smi_info->io, IPMI_BT_INTMASK_REG, | 906 | smi_info->io.outputb(&smi_info->io, IPMI_BT_INTMASK_REG, |
907 | IPMI_BT_INTMASK_CLEAR_IRQ_BIT | 907 | IPMI_BT_INTMASK_CLEAR_IRQ_BIT |
908 | | IPMI_BT_INTMASK_ENABLE_IRQ_BIT); | 908 | | IPMI_BT_INTMASK_ENABLE_IRQ_BIT); |
909 | return si_irq_handler(irq, data, regs); | 909 | return si_irq_handler(irq, data); |
910 | } | 910 | } |
911 | 911 | ||
912 | static int smi_start_processing(void *send_info, | 912 | static int smi_start_processing(void *send_info, |
diff --git a/drivers/char/ipmi/ipmi_watchdog.c b/drivers/char/ipmi/ipmi_watchdog.c index accaaf1a6b69..73f759eaa5a6 100644 --- a/drivers/char/ipmi/ipmi_watchdog.c +++ b/drivers/char/ipmi/ipmi_watchdog.c | |||
@@ -903,7 +903,7 @@ static void ipmi_register_watchdog(int ipmi_intf) | |||
903 | 903 | ||
904 | #ifdef HAVE_NMI_HANDLER | 904 | #ifdef HAVE_NMI_HANDLER |
905 | static int | 905 | static int |
906 | ipmi_nmi(void *dev_id, struct pt_regs *regs, int cpu, int handled) | 906 | ipmi_nmi(void *dev_id, int cpu, int handled) |
907 | { | 907 | { |
908 | /* If we are not expecting a timeout, ignore it. */ | 908 | /* If we are not expecting a timeout, ignore it. */ |
909 | if (ipmi_watchdog_state == WDOG_TIMEOUT_NONE) | 909 | if (ipmi_watchdog_state == WDOG_TIMEOUT_NONE) |