net: hinic: Remove unnecessary 'out of memory' message

This patch removes unnecessary out of memory message in hinic driver,
fixes the following checkpatch.pl warning:
"WARNING: Possible unnecessary 'out of memory' message"

Signed-off-by: Daode Huang <huangdaode@huawei.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/huawei/hinic/hinic_hw_api_cmd.c b/drivers/net/ethernet/huawei/hinic/hinic_hw_api_cmd.c
index 4e4029d5c8e117c6bc00e550a8e07374057c1283..06586173add77278dda952ba9d928e5246766396 100644 (file)
--- a/drivers/net/ethernet/huawei/hinic/hinic_hw_api_cmd.c
+++ b/drivers/net/ethernet/huawei/hinic/hinic_hw_api_cmd.c
@@ -629,10 +629,8 @@ static int alloc_cmd_buf(struct hinic_api_cmd_chain *chain,
 
        cmd_vaddr = dma_alloc_coherent(&pdev->dev, API_CMD_BUF_SIZE,
                                       &cmd_paddr, GFP_KERNEL);
-       if (!cmd_vaddr) {
-               dev_err(&pdev->dev, "Failed to allocate API CMD DMA memory\n");
+       if (!cmd_vaddr)
                return -ENOMEM;
-       }
 
        cell_ctxt = &chain->cell_ctxt[cell_idx];
 
@@ -679,10 +677,8 @@ static int api_cmd_create_cell(struct hinic_api_cmd_chain *chain,
 
        node = dma_alloc_coherent(&pdev->dev, chain->cell_size, &node_paddr,
                                  GFP_KERNEL);
-       if (!node) {
-               dev_err(&pdev->dev, "Failed to allocate dma API CMD cell\n");
+       if (!node)
                return -ENOMEM;
-       }
 
        node->read.hw_wb_resp_paddr = 0;
 

diff --git a/drivers/net/ethernet/huawei/hinic/hinic_hw_mgmt.c b/drivers/net/ethernet/huawei/hinic/hinic_hw_mgmt.c
index 819fa13034c0595bf6afa9b45490512dd51d0ee9..6b9b94a8925da1f8defd7ce1fb9e518d2d859c34 100644 (file)
--- a/drivers/net/ethernet/huawei/hinic/hinic_hw_mgmt.c
+++ b/drivers/net/ethernet/huawei/hinic/hinic_hw_mgmt.c
@@ -443,15 +443,12 @@ static void mgmt_recv_msg_handler(struct hinic_pf_to_mgmt *pf_to_mgmt,
        struct pci_dev *pdev = pf_to_mgmt->hwif->pdev;
 
        mgmt_work = kzalloc(sizeof(*mgmt_work), GFP_KERNEL);
-       if (!mgmt_work) {
-               dev_err(&pdev->dev, "Allocate mgmt work memory failed\n");
+       if (!mgmt_work)
                return;
-       }
 
        if (recv_msg->msg_len) {
                mgmt_work->msg = kzalloc(recv_msg->msg_len, GFP_KERNEL);
                if (!mgmt_work->msg) {
-                       dev_err(&pdev->dev, "Allocate mgmt msg memory failed\n");
                        kfree(mgmt_work);
                        return;
                }

diff --git a/drivers/net/ethernet/huawei/hinic/hinic_hw_qp.c b/drivers/net/ethernet/huawei/hinic/hinic_hw_qp.c
index fcf7bfe4aa4761efc708f9cbe7e6e997462b2192..dcba4d009badc60372e7f437077d209c456f98ec 100644 (file)
--- a/drivers/net/ethernet/huawei/hinic/hinic_hw_qp.c
+++ b/drivers/net/ethernet/huawei/hinic/hinic_hw_qp.c
@@ -414,7 +414,6 @@ int hinic_init_rq(struct hinic_rq *rq, struct hinic_hwif *hwif,
        rq->pi_virt_addr = dma_alloc_coherent(&pdev->dev, pi_size,
                                              &rq->pi_dma_addr, GFP_KERNEL);
        if (!rq->pi_virt_addr) {
-               dev_err(&pdev->dev, "Failed to allocate PI address\n");
                err = -ENOMEM;
                goto err_pi_virt;
        }

diff --git a/drivers/net/ethernet/huawei/hinic/hinic_rx.c b/drivers/net/ethernet/huawei/hinic/hinic_rx.c
index 070a7cc6392e8e3346b80d956c873c1bd70daf70..cce08647b9b27cfce09120ad84e67337d4292f83 100644 (file)
--- a/drivers/net/ethernet/huawei/hinic/hinic_rx.c
+++ b/drivers/net/ethernet/huawei/hinic/hinic_rx.c
@@ -137,10 +137,8 @@ static struct sk_buff *rx_alloc_skb(struct hinic_rxq *rxq,
        int err;
 
        skb = netdev_alloc_skb_ip_align(rxq->netdev, rxq->rq->buf_sz);
-       if (!skb) {
-               netdev_err(rxq->netdev, "Failed to allocate Rx SKB\n");
+       if (!skb)
                return NULL;
-       }
 
        addr = dma_map_single(&pdev->dev, skb->data, rxq->rq->buf_sz,
                              DMA_FROM_DEVICE);
@@ -212,10 +210,8 @@ static int rx_alloc_pkts(struct hinic_rxq *rxq)
 
        for (i = 0; i < free_wqebbs; i++) {
                skb = rx_alloc_skb(rxq, &dma_addr);
-               if (!skb) {
-                       netdev_err(rxq->netdev, "Failed to alloc Rx skb\n");
+               if (!skb)
                        goto skb_out;
-               }
 
                hinic_set_sge(&sge, dma_addr, skb->len);