summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorMalcolm Priestley <tvboxspy@gmail.com>2015-10-17 10:32:59 (GMT)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2015-10-17 16:04:27 (GMT)
commite06cf9aba8dadb92b1ec12a757d0a824c022176f (patch)
tree6a6d617b6c4479937732796efcaabf2403779bf8 /drivers
parentbed02d93a1e3d6880982f9429aa75334afd29851 (diff)
downloadlinux-e06cf9aba8dadb92b1ec12a757d0a824c022176f.tar.xz
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>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/staging/vt6655/device.h5
-rw-r--r--drivers/staging/vt6655/device_main.c4
2 files changed, 2 insertions, 7 deletions
diff --git a/drivers/staging/vt6655/device.h b/drivers/staging/vt6655/device.h
index aca6e00..0002049 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 8bca3fc..aa8f750 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");