From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752731AbcFVSYG (ORCPT ); Wed, 22 Jun 2016 14:24:06 -0400 Received: from smtprelay0229.hostedemail.com ([216.40.44.229]:44684 "EHLO smtprelay.hostedemail.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751977AbcFVSYD (ORCPT ); Wed, 22 Jun 2016 14:24:03 -0400 X-Session-Marker: 6A6F6540706572636865732E636F6D X-Spam-Summary: 2,0,0,,d41d8cd98f00b204,joe@perches.com,:::::::::,RULES_HIT:41:355:379:541:800:960:973:988:989:1260:1277:1311:1313:1314:1345:1373:1437:1515:1516:1518:1534:1542:1593:1594:1711:1730:1747:1777:1792:2393:2553:2559:2562:2828:3138:3139:3140:3141:3142:3353:3865:3866:3867:3870:4321:5007:6119:8603:9592:10004:10400:10848:11026:11657:11658:11783:11914:12043:12291:12296:12438:12517:12519:12555:13161:13229:13439:13894:14181:14394:14659:14721:21080:21433,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,LFtime:2,LUA_SUMMARY:none X-HE-Tag: dirt84_7a49e9dc1c13b X-Filterd-Recvd-Size: 3600 Message-ID: <1466619839.13093.4.camel@perches.com> Subject: [PATCH] mellanox: mlx5: Use logging functions to reduce text ~10k/5% From: Joe Perches To: Matan Barak , Leon Romanovsky Cc: netdev@vger.kernel.org, linux-rdma@vger.kernel.org, linux-kernel Date: Wed, 22 Jun 2016 11:23:59 -0700 Content-Type: text/plain; charset="ISO-8859-1" X-Mailer: Evolution 3.18.5.2-0ubuntu3 Mime-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The logging macros create a bit of duplicated code/text. Use specialized functions to reduce the duplication. (defconfig/x86-64) $ size drivers/net/ethernet/mellanox/mlx5/core/built-in.o*    text    data     bss     dec     hex filename  178634    2059      16  180709   2c1e5 drivers/net/ethernet/mellanox/mlx5/core/built-in.o.new  188679    2059      16  190754   2e922 drivers/net/ethernet/mellanox/mlx5/core/built-in.o.old The output changes now do not include line #, but do include the function offset. Signed-off-by: Joe Perches ---  drivers/net/ethernet/mellanox/mlx5/core/main.c     | 34 ++++++++++++++++++++++  .../net/ethernet/mellanox/mlx5/core/mlx5_core.h    | 13 +++------  2 files changed, 38 insertions(+), 9 deletions(-) diff --git a/drivers/net/ethernet/mellanox/mlx5/core/main.c b/drivers/net/ethernet/mellanox/mlx5/core/main.c index a19b593..34cbaf0 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/main.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/main.c @@ -1557,3 +1557,37 @@ static void __exit cleanup(void)    module_init(init);  module_exit(cleanup); + +void mlx5_core_err(struct mlx5_core_dev *dev, const char *fmt, ...) +{ + struct va_format vaf; + va_list args; + + va_start(args, fmt); + + vaf.fmt = fmt; + vaf.va = &args; + + dev_err(&dev->pdev->dev, "%s:%pS:(pid %d): %pV", + dev->priv.name, __builtin_return_address(0), current->pid, + &vaf); + + va_end(args); +} + +void mlx5_core_warn(struct mlx5_core_dev *dev, const char *fmt, ...) +{ + struct va_format vaf; + va_list args; + + va_start(args, fmt); + + vaf.fmt = fmt; + vaf.va = &args; + + dev_warn(&dev->pdev->dev, "%s:%pS:(pid %d): %pV", +  dev->priv.name, __builtin_return_address(0), current->pid, +  &vaf); + + va_end(args); +} diff --git a/drivers/net/ethernet/mellanox/mlx5/core/mlx5_core.h b/drivers/net/ethernet/mellanox/mlx5/core/mlx5_core.h index 2f86ec6..31430a7 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/mlx5_core.h +++ b/drivers/net/ethernet/mellanox/mlx5/core/mlx5_core.h @@ -57,15 +57,10 @@ do { \   mlx5_core_dbg(__dev, format, ##__VA_ARGS__); \  } while (0)   -#define mlx5_core_err(__dev, format, ...) \ - dev_err(&(__dev)->pdev->dev, "%s:%s:%d:(pid %d): " format, \ -        (__dev)->priv.name, __func__, __LINE__, current->pid, \ -        ##__VA_ARGS__) - -#define mlx5_core_warn(__dev, format, ...) \ - dev_warn(&(__dev)->pdev->dev, "%s:%s:%d:(pid %d): " format, \ - (__dev)->priv.name, __func__, __LINE__, current->pid, \ - ##__VA_ARGS__) +__printf(2, 3) +void mlx5_core_err(struct mlx5_core_dev *dev, const char *fmt, ...); +__printf(2, 3) +void mlx5_core_warn(struct mlx5_core_dev *dev, const char *fmt, ...);    #define mlx5_core_info(__dev, format, ...) \   dev_info(&(__dev)->pdev->dev, format, ##__VA_ARGS__)