OSDN Git Service

staging: vt6655: remove static inline alloc_td_info.
authorMalcolm Priestley <tvboxspy@gmail.com>
Sat, 17 Oct 2015 10:33:00 +0000 (11:33 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 17 Oct 2015 16:04:27 +0000 (09:04 -0700)
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>
drivers/staging/vt6655/device.h
drivers/staging/vt6655/device_main.c

index 0002049..8be3e21 100644 (file)
@@ -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
index aa8f750..d305d7a 100644 (file)
@@ -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;