From: Corey Minyard <cminyard@mvista.com>
Date: Wed, 13 Sep 2017 04:35:39 +0000 (-0500)
Subject: ipmi_si: remove ipmi_smi_alloc() function
X-Git-Tag: v4.15-rc1~94^2~10
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=67f4fb025d8e2189f91f6ccfc8f62f76f56f889d;p=thirdparty%2Fkernel%2Flinux.git

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>
---

diff --git a/drivers/char/ipmi/ipmi_si_intf.c b/drivers/char/ipmi/ipmi_si_intf.c
index d24cd5de09d06..3758560a6ab2d 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;