Commit c199fdb8 authored by Daode Huang's avatar Daode Huang Committed by David S. Miller
Browse files

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: default avatarDaode Huang <huangdaode@huawei.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent a9d6df64

drivers/net/ethernet/huawei/hinic/hinic_hw_api_cmd.c

+2 −6
Original line number Diff line number Diff line
@@ -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;

drivers/net/ethernet/huawei/hinic/hinic_hw_mgmt.c

+1 −4
Original line number Diff line number Diff line
@@ -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;

		}

drivers/net/ethernet/huawei/hinic/hinic_hw_qp.c

+0 −1
Original line number Diff line number Diff line
@@ -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;

	}

drivers/net/ethernet/huawei/hinic/hinic_rx.c

+2 −6
Original line number Diff line number Diff line
@@ -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);