diff options
| -rw-r--r-- | drivers/staging/vt6655/device.h | 4 | ||||
| -rw-r--r-- | drivers/staging/vt6655/device_main.c | 4 |
2 files changed, 2 insertions, 6 deletions
diff --git a/drivers/staging/vt6655/device.h b/drivers/staging/vt6655/device.h index 0002049..8be3e21 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 aa8f750..d305d7a 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; |
