xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

drivers:net: Remove dma_alloc_coherent OOM messages

Browse Source 
I believe these error messages are already logged
on allocation failure by warn_alloc_failed and so
get a dump_stack on OOM.

Remove the unnecessary additional error logging.

Around these deletions:

o Alignment neatening.
o Remove unnecessary casts of dma_alloc_coherent.
o Hoist assigns from ifs.

Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Joe Perches
2013-03-14 13:07:21 +00:00
committed by David S. Miller
parent 68c45a2da3
commit d0320f7500
42 changed files with 121 additions and 277 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
drivers/net/ethernet/nuvoton/w90p910_ether.c
View File

@@ -287,23 +287,16 @@ static int w90p910_init_desc(struct net_device *dev)
ether = netdev_priv(dev);
pdev = ether->pdev;
ether->tdesc = (struct tran_pdesc *)
dma_alloc_coherent(&pdev->dev, sizeof(struct tran_pdesc),
&ether->tdesc_phys, GFP_KERNEL);
if (!ether->tdesc) {
dev_err(&pdev->dev, "Failed to allocate memory for tx desc\n");
ether->tdesc = dma_alloc_coherent(&pdev->dev, sizeof(struct tran_pdesc),
&ether->tdesc_phys, GFP_KERNEL);
if (!ether->tdesc)
return -ENOMEM;
}
ether->rdesc = (struct recv_pdesc *)
dma_alloc_coherent(&pdev->dev, sizeof(struct recv_pdesc),
&ether->rdesc_phys, GFP_KERNEL);
ether->rdesc = dma_alloc_coherent(&pdev->dev, sizeof(struct recv_pdesc),
&ether->rdesc_phys, GFP_KERNEL);
if (!ether->rdesc) {
dev_err(&pdev->dev, "Failed to allocate memory for rx desc\n");
dma_free_coherent(&pdev->dev, sizeof(struct tran_pdesc),
ether->tdesc, ether->tdesc_phys);
ether->tdesc, ether->tdesc_phys);
return -ENOMEM;
}