]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
staging: vt6655: remove static inline alloc_rd_info.
authorMalcolm Priestley <tvboxspy@gmail.com>
Sat, 17 Oct 2015 10:32:59 +0000 (11:32 +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 only used 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 aca6e00a368b38b921acd37f59ba22b4fb604870..0002049e70e6f8ac33c3bf451dfa0b3e4d280893 100644 (file)
@@ -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);
index 8bca3fcf09be75b9056c6e6dc7c6bcb4beceb359..aa8f750ebf80d639378f662a9dd0bbf24afb0c2f 100644 (file)
@@ -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");