From 288a5c43cd108e083d8ea180372d308e2eb155ce Mon Sep 17 00:00:00 2001 From: Marcin Slusarz Date: Sat, 5 Sep 2009 20:24:24 -0700 Subject: [PATCH] --- yaml --- r: 157375 b: refs/heads/master c: f1aa78b26e8dabc2956be94a93c40c6cc08eb4a3 h: refs/heads/master i: 157373: 3ee00ab231412285faba3d1fdaf08fcee9e11666 157371: 943d8831e870394d841caa1ee9311e3c6180dc90 157367: a010064df2cd275df5fa3b44e029280680ae31e1 157359: caf1376852b7f6a117052b620ff06e494cd4bb92 157343: 39d973eceff62b72f950e28d75f2b568790271a4 157311: a73562f22c3563ca81e62962a7d6dfecd007ffc2 v: v3 --- [refs] | 2 +- trunk/drivers/infiniband/hw/cxgb3/iwch.c | 4 +--- trunk/drivers/infiniband/hw/mlx4/main.c | 6 +----- trunk/drivers/infiniband/hw/mthca/mthca_main.c | 6 +----- 4 files changed, 4 insertions(+), 14 deletions(-) diff --git a/[refs] b/[refs] index b8d088e1752a..866b97e76ea9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 181c74e87eb93df447a759af93cf0a279875ea7d +refs/heads/master: f1aa78b26e8dabc2956be94a93c40c6cc08eb4a3 diff --git a/trunk/drivers/infiniband/hw/cxgb3/iwch.c b/trunk/drivers/infiniband/hw/cxgb3/iwch.c index 26fc0a4eaa74..9cc99df3d614 100644 --- a/trunk/drivers/infiniband/hw/cxgb3/iwch.c +++ b/trunk/drivers/infiniband/hw/cxgb3/iwch.c @@ -105,11 +105,9 @@ static void rnic_init(struct iwch_dev *rnicp) static void open_rnic_dev(struct t3cdev *tdev) { struct iwch_dev *rnicp; - static int vers_printed; PDBG("%s t3cdev %p\n", __func__, tdev); - if (!vers_printed++) - printk(KERN_INFO MOD "Chelsio T3 RDMA Driver - version %s\n", + printk_once(KERN_INFO MOD "Chelsio T3 RDMA Driver - version %s\n", DRV_VERSION); rnicp = (struct iwch_dev *)ib_alloc_device(sizeof(*rnicp)); if (!rnicp) { diff --git a/trunk/drivers/infiniband/hw/mlx4/main.c b/trunk/drivers/infiniband/hw/mlx4/main.c index ae3d7590346e..0b2f77a98e2c 100644 --- a/trunk/drivers/infiniband/hw/mlx4/main.c +++ b/trunk/drivers/infiniband/hw/mlx4/main.c @@ -540,15 +540,11 @@ static struct device_attribute *mlx4_class_attributes[] = { static void *mlx4_ib_add(struct mlx4_dev *dev) { - static int mlx4_ib_version_printed; struct mlx4_ib_dev *ibdev; int num_ports = 0; int i; - if (!mlx4_ib_version_printed) { - printk(KERN_INFO "%s", mlx4_ib_version); - ++mlx4_ib_version_printed; - } + printk_once(KERN_INFO "%s", mlx4_ib_version); mlx4_foreach_port(i, dev, MLX4_PORT_TYPE_IB) num_ports++; diff --git a/trunk/drivers/infiniband/hw/mthca/mthca_main.c b/trunk/drivers/infiniband/hw/mthca/mthca_main.c index 13da9f1d24c0..2e4e04303786 100644 --- a/trunk/drivers/infiniband/hw/mthca/mthca_main.c +++ b/trunk/drivers/infiniband/hw/mthca/mthca_main.c @@ -1215,15 +1215,11 @@ int __mthca_restart_one(struct pci_dev *pdev) static int __devinit mthca_init_one(struct pci_dev *pdev, const struct pci_device_id *id) { - static int mthca_version_printed = 0; int ret; mutex_lock(&mthca_device_mutex); - if (!mthca_version_printed) { - printk(KERN_INFO "%s", mthca_version); - ++mthca_version_printed; - } + printk_once(KERN_INFO "%s", mthca_version); if (id->driver_data >= ARRAY_SIZE(mthca_hca_table)) { printk(KERN_ERR PFX "%s has invalid driver data %lx\n",