Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6ae5cbc4 authored by Jia-Ju Bai's avatar Jia-Ju Bai Committed by David S. Miller
Browse files

net: nvidia: forcedeth: Replace GFP_ATOMIC with GFP_KERNEL in nv_probe() 



nv_probe() is never called in atomic context.
It calls dma_alloc_coherent() 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: default avatarJia-Ju Bai <baijiaju1990@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent d818c59a

drivers/net/ethernet/nvidia/forcedeth.c

+2 −2
Original line number Diff line number Diff line
@@ -5777,7 +5777,7 @@ static int nv_probe(struct pci_dev *pci_dev, const struct pci_device_id *id) 
						      (np->rx_ring_size +

						      np->tx_ring_size),

						      &np->ring_addr,

						      GFP_ATOMIC);

						      GFP_KERNEL);

		if (!np->rx_ring.orig)

			goto out_unmap;

		np->tx_ring.orig = &np->rx_ring.orig[np->rx_ring_size];
@@ -5786,7 +5786,7 @@ static int nv_probe(struct pci_dev *pci_dev, const struct pci_device_id *id) 
						    sizeof(struct ring_desc_ex) *

						    (np->rx_ring_size +

						    np->tx_ring_size),

						    &np->ring_addr, GFP_ATOMIC);

						    &np->ring_addr, GFP_KERNEL);

		if (!np->rx_ring.ex)

			goto out_unmap;

		np->tx_ring.ex = &np->rx_ring.ex[np->rx_ring_size];