From: Malcolm Priestley <tvboxspy@gmail.com>
Date: Sat, 17 Oct 2015 10:32:59 +0000 (+0100)
Subject: staging: vt6655: remove static inline alloc_rd_info.
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=e06cf9aba8dadb92b1ec12a757d0a824c022176f;p=linux-beck.git

staging: vt6655: remove static inline alloc_rd_info.

Since this only contains one function and only used twice
remove inline altogether.

Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

diff --git a/drivers/staging/vt6655/device.h b/drivers/staging/vt6655/device.h
index aca6e00a368b..0002049e70e6 100644
--- a/drivers/staging/vt6655/device.h
+++ b/drivers/staging/vt6655/device.h
@@ -306,11 +306,6 @@ struct vnt_private {
 	struct ieee80211_low_level_stats low_stats;
 };
 
-static inline struct vnt_rd_info *alloc_rd_info(void)
-{
-	return kzalloc(sizeof(struct vnt_rd_info), GFP_ATOMIC);
-}
-
 static inline struct vnt_td_info *alloc_td_info(void)
 {
 	return kzalloc(sizeof(struct vnt_td_info), GFP_ATOMIC);
diff --git a/drivers/staging/vt6655/device_main.c b/drivers/staging/vt6655/device_main.c
index 8bca3fcf09be..aa8f750ebf80 100644
--- a/drivers/staging/vt6655/device_main.c
+++ b/drivers/staging/vt6655/device_main.c
@@ -551,7 +551,7 @@ static void device_init_rd0_ring(struct vnt_private *priv)
 	for (i = 0; i < priv->sOpts.rx_descs0;
 	     i ++, curr += sizeof(struct vnt_rx_desc)) {
 		desc = &priv->aRD0Ring[i];
-		desc->rd_info = alloc_rd_info();
+		desc->rd_info = kzalloc(sizeof(*desc->rd_info), GFP_ATOMIC);
 
 		if (!device_alloc_rx_buf(priv, desc))
 			dev_err(&priv->pcid->dev, "can not alloc rx bufs\n");
@@ -575,7 +575,7 @@ static void device_init_rd1_ring(struct vnt_private *priv)
 	for (i = 0; i < priv->sOpts.rx_descs1;
 	     i ++, curr += sizeof(struct vnt_rx_desc)) {
 		desc = &priv->aRD1Ring[i];
-		desc->rd_info = alloc_rd_info();
+		desc->rd_info = kzalloc(sizeof(*desc->rd_info), GFP_ATOMIC);
 
 		if (!device_alloc_rx_buf(priv, desc))
 			dev_err(&priv->pcid->dev, "can not alloc rx bufs\n");