]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
hinic: Use devm_kasprintf instead of hard coding it
authorChristophe JAILLET <christophe.jaillet@wanadoo.fr>
Thu, 13 Jun 2019 19:54:12 +0000 (21:54 +0200)
committerDavid S. Miller <davem@davemloft.net>
Sat, 15 Jun 2019 20:38:24 +0000 (13:38 -0700)
'devm_kasprintf' is less verbose than:
   snprintf(NULL, 0, ...);
   devm_kzalloc(...);
   sprintf
so use it instead.

Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
Signed-off-by: Zhao Chen <zhaochen6@huawei.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/ethernet/huawei/hinic/hinic_rx.c

index 04c887d138486733d53b30ed8358c9826c836a7b..1eadd99a7fad8e3ee2796937a936c3d7a3e66258 100644 (file)
@@ -502,7 +502,7 @@ int hinic_init_rxq(struct hinic_rxq *rxq, struct hinic_rq *rq,
                   struct net_device *netdev)
 {
        struct hinic_qp *qp = container_of(rq, struct hinic_qp, rq);
-       int err, pkts, irqname_len;
+       int err, pkts;
 
        rxq->netdev = netdev;
        rxq->rq = rq;
@@ -511,13 +511,11 @@ int hinic_init_rxq(struct hinic_rxq *rxq, struct hinic_rq *rq,
 
        rxq_stats_init(rxq);
 
-       irqname_len = snprintf(NULL, 0, "hinic_rxq%d", qp->q_id) + 1;
-       rxq->irq_name = devm_kzalloc(&netdev->dev, irqname_len, GFP_KERNEL);
+       rxq->irq_name = devm_kasprintf(&netdev->dev, GFP_KERNEL,
+                                      "hinic_rxq%d", qp->q_id);
        if (!rxq->irq_name)
                return -ENOMEM;
 
-       sprintf(rxq->irq_name, "hinic_rxq%d", qp->q_id);
-
        pkts = rx_alloc_pkts(rxq);
        if (!pkts) {
                err = -ENOMEM;