summaryrefslogtreecommitdiffstats
path: root/drivers/char
diff options
context:
space:
mode:
authorCorey Minyard <cminyard@mvista.com>2017-09-13 06:35:39 +0200
committerCorey Minyard <cminyard@mvista.com>2017-09-28 19:26:01 +0200
commit67f4fb025d8e2189f91f6ccfc8f62f76f56f889d (patch)
treeed8db916160f1a5fdc1e59b59b16405249391cec /drivers/char
parentipmi_si: Move port and mem I/O handling to their own files (diff)
downloadlinux-67f4fb025d8e2189f91f6ccfc8f62f76f56f889d.tar.xz
linux-67f4fb025d8e2189f91f6ccfc8f62f76f56f889d.zip
ipmi_si: remove ipmi_smi_alloc() function
It's only used in one place now, so it's overkill. Signed-off-by: Corey Minyard <cminyard@mvista.com>
Diffstat (limited to 'drivers/char')
-rw-r--r--drivers/char/ipmi/ipmi_si_intf.c12
1 files changed, 2 insertions, 10 deletions
diff --git a/drivers/char/ipmi/ipmi_si_intf.c b/drivers/char/ipmi/ipmi_si_intf.c
index d24cd5de09d0..3758560a6ab2 100644
--- a/drivers/char/ipmi/ipmi_si_intf.c
+++ b/drivers/char/ipmi/ipmi_si_intf.c
@@ -1302,15 +1302,6 @@ int ipmi_std_irq_setup(struct si_sm_io *io)
return rv;
}
-static struct smi_info *smi_info_alloc(void)
-{
- struct smi_info *info = kzalloc(sizeof(*info), GFP_KERNEL);
-
- if (info)
- spin_lock_init(&info->si_lock);
- return info;
-}
-
static int wait_for_msg_done(struct smi_info *smi_info)
{
enum si_sm_result smi_result;
@@ -1902,9 +1893,10 @@ int ipmi_si_add_smi(struct si_sm_io *io)
}
}
- new_smi = smi_info_alloc();
+ new_smi = kzalloc(sizeof(*new_smi), GFP_KERNEL);
if (!new_smi)
return -ENOMEM;
+ spin_lock_init(&new_smi->si_lock);
new_smi->io = *io;