From: Malcolm Priestley <tvboxspy@gmail.com>
Date: Sat, 17 Oct 2015 10:33:00 +0000 (+0100)
Subject: staging: vt6655: remove static inline alloc_td_info.
X-Git-Tag: firefly_0821_release~176^2~802^2~458
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=068b998835168b5107d1e62a346f52b9f44ed10b;p=firefly-linux-kernel-4.4.55.git

staging: vt6655: remove static inline alloc_td_info.

Since this only contains one function and used only 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 0002049e70e6..8be3e212f86c 100644
--- a/drivers/staging/vt6655/device.h
+++ b/drivers/staging/vt6655/device.h
@@ -306,8 +306,4 @@ struct vnt_private {
 	struct ieee80211_low_level_stats low_stats;
 };
 
-static inline struct vnt_td_info *alloc_td_info(void)
-{
-	return kzalloc(sizeof(struct vnt_td_info), GFP_ATOMIC);
-}
 #endif
diff --git a/drivers/staging/vt6655/device_main.c b/drivers/staging/vt6655/device_main.c
index aa8f750ebf80..d305d7ab466f 100644
--- a/drivers/staging/vt6655/device_main.c
+++ b/drivers/staging/vt6655/device_main.c
@@ -633,7 +633,7 @@ static void device_init_td0_ring(struct vnt_private *priv)
 	for (i = 0; i < priv->sOpts.tx_descs[0];
 	     i++, curr += sizeof(struct vnt_tx_desc)) {
 		desc = &priv->apTD0Rings[i];
-		desc->td_info = alloc_td_info();
+		desc->td_info = kzalloc(sizeof(*desc->td_info), GFP_ATOMIC);
 
 		desc->td_info->buf = priv->tx0_bufs + i * PKT_BUF_SZ;
 		desc->td_info->buf_dma = priv->tx_bufs_dma0 + i * PKT_BUF_SZ;
@@ -658,7 +658,7 @@ static void device_init_td1_ring(struct vnt_private *priv)
 	for (i = 0; i < priv->sOpts.tx_descs[1];
 	     i++, curr += sizeof(struct vnt_tx_desc)) {
 		desc = &priv->apTD1Rings[i];
-		desc->td_info = alloc_td_info();
+		desc->td_info = kzalloc(sizeof(*desc->td_info), GFP_ATOMIC);
 
 		desc->td_info->buf = priv->tx1_bufs + i * PKT_BUF_SZ;
 		desc->td_info->buf_dma = priv->tx_bufs_dma1 + i * PKT_BUF_SZ;