diff options
author | Joe Perches <joe@perches.com> | 2013-03-08 10:03:25 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2013-03-09 16:09:19 -0500 |
commit | 720a43efd30f04a0a492c85fb997361c44fbae05 (patch) | |
tree | 430e9488e00413655b7947f67e82c4fd2c07e951 /drivers/net/ethernet/adi | |
parent | e8f83e5ec7450b85b101a774e165e70a18e9c3ab (diff) |
drivers:net: Remove unnecessary OOM messages after netdev_alloc_skb
Emitting netdev_alloc_skb and netdev_alloc_skb_ip_align OOM
messages is unnecessary as there is already a dump_stack
after allocation failures.
Other trivial changes around these removals:
Convert a few comparisons of pointer to 0 to !pointer.
Change flow to remove unnecessary label.
Remove now unused variable.
Hoist assignment from if.
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/adi')
-rw-r--r-- | drivers/net/ethernet/adi/bfin_mac.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/net/ethernet/adi/bfin_mac.c b/drivers/net/ethernet/adi/bfin_mac.c index a175d0be1ae1..ee705771bd2c 100644 --- a/drivers/net/ethernet/adi/bfin_mac.c +++ b/drivers/net/ethernet/adi/bfin_mac.c | |||
@@ -188,10 +188,9 @@ static int desc_list_init(struct net_device *dev) | |||
188 | 188 | ||
189 | /* allocate a new skb for next time receive */ | 189 | /* allocate a new skb for next time receive */ |
190 | new_skb = netdev_alloc_skb(dev, PKT_BUF_SZ + NET_IP_ALIGN); | 190 | new_skb = netdev_alloc_skb(dev, PKT_BUF_SZ + NET_IP_ALIGN); |
191 | if (!new_skb) { | 191 | if (!new_skb) |
192 | pr_notice("init: low on mem - packet dropped\n"); | ||
193 | goto init_error; | 192 | goto init_error; |
194 | } | 193 | |
195 | skb_reserve(new_skb, NET_IP_ALIGN); | 194 | skb_reserve(new_skb, NET_IP_ALIGN); |
196 | /* Invidate the data cache of skb->data range when it is write back | 195 | /* Invidate the data cache of skb->data range when it is write back |
197 | * cache. It will prevent overwritting the new data from DMA | 196 | * cache. It will prevent overwritting the new data from DMA |
@@ -1236,7 +1235,6 @@ static void bfin_mac_rx(struct net_device *dev) | |||
1236 | 1235 | ||
1237 | new_skb = netdev_alloc_skb(dev, PKT_BUF_SZ + NET_IP_ALIGN); | 1236 | new_skb = netdev_alloc_skb(dev, PKT_BUF_SZ + NET_IP_ALIGN); |
1238 | if (!new_skb) { | 1237 | if (!new_skb) { |
1239 | netdev_notice(dev, "rx: low on mem - packet dropped\n"); | ||
1240 | dev->stats.rx_dropped++; | 1238 | dev->stats.rx_dropped++; |
1241 | goto out; | 1239 | goto out; |
1242 | } | 1240 | } |