From patchwork Sun Oct 11 20:13:40 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joe Perches X-Patchwork-Id: 528798 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id BEF5D1402A8 for ; Mon, 12 Oct 2015 07:13:49 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751477AbbJKUNp (ORCPT ); Sun, 11 Oct 2015 16:13:45 -0400 Received: from smtprelay0032.hostedemail.com ([216.40.44.32]:46967 "EHLO smtprelay.hostedemail.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751409AbbJKUNo (ORCPT ); Sun, 11 Oct 2015 16:13:44 -0400 Received: from filter.hostedemail.com (unknown [216.40.38.60]) by smtprelay01.hostedemail.com (Postfix) with ESMTP id 0C21723421; Sun, 11 Oct 2015 20:13:43 +0000 (UTC) X-Session-Marker: 6A6F6540706572636865732E636F6D X-Spam-Summary: 2, 0, 0, , d41d8cd98f00b204, joe@perches.com, :::::::::::, RULES_HIT:41:69:355:379:541:599:960:968:973:988:989:1260:1277:1311:1313:1314:1345:1359:1373:1437:1515:1516:1518:1534:1543:1593:1594:1711:1730:1747:1777:1792:2194:2199:2393:2559:2562:2828:3138:3139:3140:3141:3142:3354:3622:3865:3866:3867:3868:3871:4321:5007:6261:7904:10004:10400:10848:11026:11473:11657:11658:11914:12043:12050:12296:12438:12517:12519:12555:12683:12740:13972:21080, 0, RBL:none, CacheIP:none, Bayesian:0.5, 0.5, 0.5, Netcheck:none, DomainCache:0, MSF:not bulk, SPF:fn, MSBL:0, DNSBL:none, Custom_rules:0:0:0 X-HE-Tag: neck04_3d6288599d112 X-Filterd-Recvd-Size: 4405 Received: from joe-X200MA.home (pool-173-51-221-2.lsanca.fios.verizon.net [173.51.221.2]) (Authenticated sender: joe@perches.com) by omf02.hostedemail.com (Postfix) with ESMTPA; Sun, 11 Oct 2015 20:13:41 +0000 (UTC) Message-ID: <1444594420.8012.34.camel@perches.com> Subject: Re: [PATCH] net: nhs: fix 32-bit build warning From: Joe Perches To: Arnd Bergmann Cc: netdev@vger.kernel.org, davem@davemloft.net, huangdaode , Kenneth Lee , Yisen Zhuang Date: Sun, 11 Oct 2015 13:13:40 -0700 In-Reply-To: <8581924.9CPedieySC@wuerfel> References: <8581924.9CPedieySC@wuerfel> X-Mailer: Evolution 3.12.11-0ubuntu3 Mime-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org On Tue, 2015-10-06 at 23:53 +0200, Arnd Bergmann wrote: > diff --git a/drivers/net/ethernet/hisilicon/hns/hnae.c b/drivers/net/ethernet/hisilicon/hns/hnae.c [] > @@ -448,12 +448,12 @@ static ssize_t handles_show(struct device *dev, > s += sprintf(buf + s, "handle %d (eport_id=%u from %s):\n", > i++, h->eport_id, h->dev->name); > for (j = 0; j < h->q_num; j++) { > - s += sprintf(buf + s, "\tqueue[%d] on 0x%llx\n", > - j, (u64)h->qs[i]->io_base); > -#define HANDEL_TX_MSG "\t\ttx_ring on 0x%llx:%u,%u,%u,%u,%u,%llu,%llu\n" > + s += sprintf(buf + s, "\tqueue[%d] on %p\n", > + j, h->qs[i]->io_base); > +#define HANDEL_TX_MSG "\t\ttx_ring on %p:%u,%u,%u,%u,%u,%llu,%llu\n" > s += sprintf(buf + s, > HANDEL_TX_MSG, Maybe one day remove the misspelled and used once HANDEL_TX_MSG macro too. Another possibility is to use a generally smaller object code style like: char *s = buf; ... s += sprintf(s, ...) ... return s - buf; instead of ssize_t s = 0; ... s += sprintf(buf + s, ...) ... return s; --- drivers/net/ethernet/hisilicon/hns/hnae.c | 35 +++++++++++++++---------------- 1 file changed, 17 insertions(+), 18 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/drivers/net/ethernet/hisilicon/hns/hnae.c b/drivers/net/ethernet/hisilicon/hns/hnae.c index f52e99a..d2af46f 100644 --- a/drivers/net/ethernet/hisilicon/hns/hnae.c +++ b/drivers/net/ethernet/hisilicon/hns/hnae.c @@ -439,40 +439,39 @@ EXPORT_SYMBOL(hnae_ae_unregister); static ssize_t handles_show(struct device *dev, struct device_attribute *attr, char *buf) { - ssize_t s = 0; + char *s = buf; struct hnae_ae_dev *hdev = cls_to_ae_dev(dev); struct hnae_handle *h; int i = 0, j; list_for_each_entry_rcu(h, &hdev->handle_list, node) { - s += sprintf(buf + s, "handle %d (eport_id=%u from %s):\n", - i++, h->eport_id, h->dev->name); + s += sprintf(s, "handle %d (eport_id=%u from %s):\n", + i++, h->eport_id, h->dev->name); for (j = 0; j < h->q_num; j++) { - s += sprintf(buf + s, "\tqueue[%d] on %p\n", + s += sprintf(s, "\tqueue[%d] on %p\n", j, h->qs[i]->io_base); -#define HANDEL_TX_MSG "\t\ttx_ring on %p:%u,%u,%u,%u,%u,%llu,%llu\n" - s += sprintf(buf + s, - HANDEL_TX_MSG, + s += sprintf(s, + "\t\ttx_ring on %p:%u,%u,%u,%u,%u,%llu,%llu\n", h->qs[i]->tx_ring.io_base, h->qs[i]->tx_ring.buf_size, h->qs[i]->tx_ring.desc_num, h->qs[i]->tx_ring.max_desc_num_per_pkt, h->qs[i]->tx_ring.max_raw_data_sz_per_desc, h->qs[i]->tx_ring.max_pkt_size, - h->qs[i]->tx_ring.stats.sw_err_cnt, - h->qs[i]->tx_ring.stats.io_err_cnt); - s += sprintf(buf + s, - "\t\trx_ring on %p:%u,%u,%llu,%llu,%llu\n", - h->qs[i]->rx_ring.io_base, - h->qs[i]->rx_ring.buf_size, - h->qs[i]->rx_ring.desc_num, - h->qs[i]->rx_ring.stats.sw_err_cnt, - h->qs[i]->rx_ring.stats.io_err_cnt, - h->qs[i]->rx_ring.stats.seg_pkt_cnt); + h->qs[i]->tx_ring.stats.sw_err_cnt, + h->qs[i]->tx_ring.stats.io_err_cnt); + s += sprintf(s, + "\t\trx_ring on %p:%u,%u,%llu,%llu,%llu\n", + h->qs[i]->rx_ring.io_base, + h->qs[i]->rx_ring.buf_size, + h->qs[i]->rx_ring.desc_num, + h->qs[i]->rx_ring.stats.sw_err_cnt, + h->qs[i]->rx_ring.stats.io_err_cnt, + h->qs[i]->rx_ring.stats.seg_pkt_cnt); } } - return s; + return s - buf; } static DEVICE_ATTR_RO(handles);