Commit 0a645e80 authored by Joe Perches's avatar Joe Perches Committed by David S. Miller
Browse files

drivers/net/mlx4: Use %pV, pr_<level>, printk_once 



Remove near duplication of format string constants by using the newly
introduced vsprintf extention %pV to reduce text by 20k or so.

$ size drivers/net/mlx4/built-in.o*
   text	   data	    bss	    dec	    hex	filename
 161367	   1866	  48784	 212017	  33c31	drivers/net/mlx4/built-in.o
 142621	   1866	  46248	 190735	  2e90f	drivers/net/mlx4/built-in.o.new

Use printk_once as appropriate.
Convert printks to pr_<level>, some bare printks now use pr_cont.
Remove now unused #define PFX.

Signed-off-by: default avatarJoe Perches <joe@perches.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 54874868

drivers/net/mlx4/catas.c

+2 −2
Original line number Diff line number Diff line
@@ -101,7 +101,7 @@ static void catas_reset(struct work_struct *work) 
		ret = mlx4_restart_one(priv->dev.pdev);

		/* 'priv' now is not valid */

		if (ret)

			printk(KERN_ERR "mlx4 %s: Reset failed (%d)\n",

			pr_err("mlx4 %s: Reset failed (%d)\n",

			       pci_name(pdev), ret);

		else {

			dev  = pci_get_drvdata(pdev);

drivers/net/mlx4/en_main.c

+24 −5
Original line number Diff line number Diff line
@@ -79,6 +79,29 @@ MLX4_EN_PARM_INT(pfctx, 0, "Priority based Flow Control policy on TX[7:0]." 
MLX4_EN_PARM_INT(pfcrx, 0, "Priority based Flow Control policy on RX[7:0]."

			   " Per priority bit mask");



int en_print(const char *level, const struct mlx4_en_priv *priv,

	     const char *format, ...)

{

	va_list args;

	struct va_format vaf;

	int i;



	va_start(args, format);



	vaf.fmt = format;

	vaf.va = &args;

	if (priv->registered)

		i = printk("%s%s: %s: %pV",

			   level, DRV_NAME, priv->dev->name, &vaf);

	else

		i = printk("%s%s: %s: Port %d: %pV",

			   level, DRV_NAME, dev_name(&priv->mdev->pdev->dev),

			   priv->port, &vaf);

	va_end(args);



	return i;

}



static int mlx4_en_get_profile(struct mlx4_en_dev *mdev)

{

	struct mlx4_en_profile *params = &mdev->profile;
@@ -152,15 +175,11 @@ static void mlx4_en_remove(struct mlx4_dev *dev, void *endev_ptr) 


static void *mlx4_en_add(struct mlx4_dev *dev)

{

	static int mlx4_en_version_printed;

	struct mlx4_en_dev *mdev;

	int i;

	int err;



	if (!mlx4_en_version_printed) {

		printk(KERN_INFO "%s", mlx4_en_version);

		mlx4_en_version_printed++;

	}

	printk_once(KERN_INFO "%s", mlx4_en_version);



	mdev = kzalloc(sizeof *mdev, GFP_KERNEL);

	if (!mdev) {

drivers/net/mlx4/eq.c

+3 −3
Original line number Diff line number Diff line
@@ -475,10 +475,10 @@ static void mlx4_free_eq(struct mlx4_dev *dev, 
		mlx4_dbg(dev, "Dumping EQ context %02x:\n", eq->eqn);

		for (i = 0; i < sizeof (struct mlx4_eq_context) / 4; ++i) {

			if (i % 4 == 0)

				printk("[%02x] ", i * 4);

			printk(" %08x", be32_to_cpup(mailbox->buf + i * 4));

				pr_cont("[%02x] ", i * 4);

			pr_cont(" %08x", be32_to_cpup(mailbox->buf + i * 4));

			if ((i + 1) % 4 == 0)

				printk("\n");

				pr_cont("\n");

		}

	}

drivers/net/mlx4/main.c

+5 −11
Original line number Diff line number Diff line
@@ -1050,8 +1050,7 @@ static int __mlx4_init_one(struct pci_dev *pdev, const struct pci_device_id *id) 
	int err;

	int port;



	printk(KERN_INFO PFX "Initializing %s\n",

	       pci_name(pdev));

	pr_info(DRV_NAME ": Initializing %s\n", pci_name(pdev));



	err = pci_enable_device(pdev);

	if (err) {
@@ -1216,12 +1215,7 @@ err_disable_pdev: 
static int __devinit mlx4_init_one(struct pci_dev *pdev,

				   const struct pci_device_id *id)

{

	static int mlx4_version_printed;



	if (!mlx4_version_printed) {

		printk(KERN_INFO "%s", mlx4_version);

		++mlx4_version_printed;

	}

	printk_once(KERN_INFO "%s", mlx4_version);



	return __mlx4_init_one(pdev, id);

}
@@ -1301,17 +1295,17 @@ static struct pci_driver mlx4_driver = { 
static int __init mlx4_verify_params(void)

{

	if ((log_num_mac < 0) || (log_num_mac > 7)) {

		printk(KERN_WARNING "mlx4_core: bad num_mac: %d\n", log_num_mac);

		pr_warning("mlx4_core: bad num_mac: %d\n", log_num_mac);

		return -1;

	}



	if ((log_num_vlan < 0) || (log_num_vlan > 7)) {

		printk(KERN_WARNING "mlx4_core: bad num_vlan: %d\n", log_num_vlan);

		pr_warning("mlx4_core: bad num_vlan: %d\n", log_num_vlan);

		return -1;

	}



	if ((log_mtts_per_seg < 1) || (log_mtts_per_seg > 5)) {

		printk(KERN_WARNING "mlx4_core: bad log_mtts_per_seg: %d\n", log_mtts_per_seg);

		pr_warning("mlx4_core: bad log_mtts_per_seg: %d\n", log_mtts_per_seg);

		return -1;

	}

drivers/net/mlx4/mlx4.h

+7 −8
Original line number Diff line number Diff line
@@ -48,7 +48,6 @@ 
#include <linux/mlx4/doorbell.h>



#define DRV_NAME	"mlx4_core"

#define PFX		DRV_NAME ": "

#define DRV_VERSION	"0.01"

#define DRV_RELDATE	"May 1, 2007"

CRA Git | Maintained and supported by SUSTech CRA and CCSE