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/caif | |
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/caif')
-rw-r--r-- | drivers/net/caif/caif_shmcore.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/net/caif/caif_shmcore.c b/drivers/net/caif/caif_shmcore.c index bce8bac311c9..cca2afc945af 100644 --- a/drivers/net/caif/caif_shmcore.c +++ b/drivers/net/caif/caif_shmcore.c | |||
@@ -338,11 +338,8 @@ static void shm_rx_work_func(struct work_struct *rx_work) | |||
338 | /* Get a suitable CAIF packet and copy in data. */ | 338 | /* Get a suitable CAIF packet and copy in data. */ |
339 | skb = netdev_alloc_skb(pshm_drv->pshm_dev->pshm_netdev, | 339 | skb = netdev_alloc_skb(pshm_drv->pshm_dev->pshm_netdev, |
340 | frm_pck_len + 1); | 340 | frm_pck_len + 1); |
341 | 341 | if (skb == NULL) | |
342 | if (skb == NULL) { | ||
343 | pr_info("OOM: Try next frame in descriptor\n"); | ||
344 | break; | 342 | break; |
345 | } | ||
346 | 343 | ||
347 | p = skb_put(skb, frm_pck_len); | 344 | p = skb_put(skb, frm_pck_len); |
348 | memcpy(p, pbuf->desc_vptr + frm_pck_ofs, frm_pck_len); | 345 | memcpy(p, pbuf->desc_vptr + frm_pck_ofs, frm_pck_len); |