diff options
author | Jia-Ju Bai <baijiaju1990@gmail.com> | 2018-07-27 03:57:58 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2018-07-27 16:45:14 -0400 |
commit | 2bcd619e6e7b992ddaa1caaeafd3eea6990de75c (patch) | |
tree | 1df773e9261113e5e8889a1d4f9e34d0ec20f7da | |
parent | 2db6dc2662bab14e59517ab4b86a164cc4d2db42 (diff) |
net: amd: pcnet32: Replace GFP_ATOMIC with GFP_KERNEL in pcnet32_alloc_ring()
pcnet32_alloc_ring() is never called in atomic context.
It calls kcalloc() with GFP_ATOMIC, which is not necessary.
GFP_ATOMIC can be replaced with GFP_KERNEL.
This is found by a static analysis tool named DCNS written by myself.
Signed-off-by: Jia-Ju Bai <baijiaju1990@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r-- | drivers/net/ethernet/amd/pcnet32.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/ethernet/amd/pcnet32.c b/drivers/net/ethernet/amd/pcnet32.c index be198cc0b10c..f5ad12c10934 100644 --- a/drivers/net/ethernet/amd/pcnet32.c +++ b/drivers/net/ethernet/amd/pcnet32.c | |||
@@ -2036,22 +2036,22 @@ static int pcnet32_alloc_ring(struct net_device *dev, const char *name) | |||
2036 | } | 2036 | } |
2037 | 2037 | ||
2038 | lp->tx_dma_addr = kcalloc(lp->tx_ring_size, sizeof(dma_addr_t), | 2038 | lp->tx_dma_addr = kcalloc(lp->tx_ring_size, sizeof(dma_addr_t), |
2039 | GFP_ATOMIC); | 2039 | GFP_KERNEL); |
2040 | if (!lp->tx_dma_addr) | 2040 | if (!lp->tx_dma_addr) |
2041 | return -ENOMEM; | 2041 | return -ENOMEM; |
2042 | 2042 | ||
2043 | lp->rx_dma_addr = kcalloc(lp->rx_ring_size, sizeof(dma_addr_t), | 2043 | lp->rx_dma_addr = kcalloc(lp->rx_ring_size, sizeof(dma_addr_t), |
2044 | GFP_ATOMIC); | 2044 | GFP_KERNEL); |
2045 | if (!lp->rx_dma_addr) | 2045 | if (!lp->rx_dma_addr) |
2046 | return -ENOMEM; | 2046 | return -ENOMEM; |
2047 | 2047 | ||
2048 | lp->tx_skbuff = kcalloc(lp->tx_ring_size, sizeof(struct sk_buff *), | 2048 | lp->tx_skbuff = kcalloc(lp->tx_ring_size, sizeof(struct sk_buff *), |
2049 | GFP_ATOMIC); | 2049 | GFP_KERNEL); |
2050 | if (!lp->tx_skbuff) | 2050 | if (!lp->tx_skbuff) |
2051 | return -ENOMEM; | 2051 | return -ENOMEM; |
2052 | 2052 | ||
2053 | lp->rx_skbuff = kcalloc(lp->rx_ring_size, sizeof(struct sk_buff *), | 2053 | lp->rx_skbuff = kcalloc(lp->rx_ring_size, sizeof(struct sk_buff *), |
2054 | GFP_ATOMIC); | 2054 | GFP_KERNEL); |
2055 | if (!lp->rx_skbuff) | 2055 | if (!lp->rx_skbuff) |
2056 | return -ENOMEM; | 2056 | return -ENOMEM; |
2057 | 2057 | ||