Merge branch 'hinic-cleanups'
Daode Huang says: ==================== net: hinic; make some cleanup for hinic This set try to remove the unnecessary output message, add a blank line, remove the dupliate word and change the deprecated strlcp functions in hinic driver, for details, please refer to each patch. ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
commit
3674d0539f
@ -543,8 +543,8 @@ static void hinic_get_drvinfo(struct net_device *netdev,
|
||||
struct hinic_hwif *hwif = hwdev->hwif;
|
||||
int err;
|
||||
|
||||
strlcpy(info->driver, HINIC_DRV_NAME, sizeof(info->driver));
|
||||
strlcpy(info->bus_info, pci_name(hwif->pdev), sizeof(info->bus_info));
|
||||
strscpy(info->driver, HINIC_DRV_NAME, sizeof(info->driver));
|
||||
strscpy(info->bus_info, pci_name(hwif->pdev), sizeof(info->bus_info));
|
||||
|
||||
err = hinic_get_mgmt_version(nic_dev, mgmt_ver);
|
||||
if (err)
|
||||
|
@ -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;
|
||||
|
||||
|
@ -334,7 +334,7 @@ static void set_dma_attr(struct hinic_hwif *hwif, u32 entry_idx,
|
||||
}
|
||||
|
||||
/**
|
||||
* dma_attr_table_init - initialize the the default dma attributes
|
||||
* dma_attr_table_init - initialize the default dma attributes
|
||||
* @hwif: the HW interface of a pci function device
|
||||
**/
|
||||
static void dma_attr_init(struct hinic_hwif *hwif)
|
||||
|
@ -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;
|
||||
}
|
||||
|
@ -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;
|
||||
}
|
||||
|
@ -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);
|
||||
|
||||
|
@ -377,6 +377,7 @@ static int offload_csum(struct hinic_sq_task *task, u32 *queue_info,
|
||||
} else if (ip.v4->version == 6) {
|
||||
unsigned char *exthdr;
|
||||
__be16 frag_off;
|
||||
|
||||
l3_type = IPV6_PKT;
|
||||
tunnel_type = TUNNEL_UDP_CSUM;
|
||||
exthdr = ip.hdr + sizeof(*ip.v6);
|
||||
|
Loading…
x
Reference in New Issue
Block a user