diff options
| author | Corey Minyard <cminyard@mvista.com> | 2019-07-31 19:18:25 -0500 |
|---|---|---|
| committer | Corey Minyard <cminyard@mvista.com> | 2019-08-02 07:25:03 -0500 |
| commit | 104fb25f60077e4696145bcea51ca56f0959d7e3 (patch) | |
| tree | 5ce57ae72112aa1f598ec98b8a59940403c72cec /drivers/char/ipmi/ipmi_si_intf.c | |
| parent | cbb19cb1eef050b193c823502bf920097c0f0459 (diff) | |
ipmi_si: Rework some include files
ipmi_si_sm.h was getting included in lots of places it didn't
belong. Rework things a bit to remove all the dependencies,
mostly just moving things between include files that were in
the wrong place and removing bogus includes.
Signed-off-by: Corey Minyard <cminyard@mvista.com>
Diffstat (limited to 'drivers/char/ipmi/ipmi_si_intf.c')
| -rw-r--r-- | drivers/char/ipmi/ipmi_si_intf.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/char/ipmi/ipmi_si_intf.c b/drivers/char/ipmi/ipmi_si_intf.c index 488979cc2579..d728682236ea 100644 --- a/drivers/char/ipmi/ipmi_si_intf.c +++ b/drivers/char/ipmi/ipmi_si_intf.c @@ -40,6 +40,7 @@ #include <linux/ipmi.h> #include <linux/ipmi_smi.h> #include "ipmi_si.h" +#include "ipmi_si_sm.h" #include <linux/string.h> #include <linux/ctype.h> @@ -1266,12 +1267,12 @@ int ipmi_std_irq_setup(struct si_sm_io *io) rv = request_irq(io->irq, ipmi_si_irq_handler, IRQF_SHARED, - DEVICE_NAME, + SI_DEVICE_NAME, io->irq_handler_data); if (rv) { dev_warn(io->dev, "%s unable to claim interrupt %d," " running polled\n", - DEVICE_NAME, io->irq); + SI_DEVICE_NAME, io->irq); io->irq = 0; } else { io->irq_cleanup = std_irq_cleanup; |