diff options
Diffstat (limited to 'drivers/infiniband/hw/mlx4/main.c')
-rw-r--r-- | drivers/infiniband/hw/mlx4/main.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/infiniband/hw/mlx4/main.c b/drivers/infiniband/hw/mlx4/main.c index b948b6dd5d55..a739d2738331 100644 --- a/drivers/infiniband/hw/mlx4/main.c +++ b/drivers/infiniband/hw/mlx4/main.c | |||
@@ -789,7 +789,7 @@ static int mlx4_ib_mcg_detach(struct ib_qp *ibqp, union ib_gid *gid, u16 lid) | |||
789 | list_del(&ge->list); | 789 | list_del(&ge->list); |
790 | kfree(ge); | 790 | kfree(ge); |
791 | } else | 791 | } else |
792 | printk(KERN_WARNING "could not find mgid entry\n"); | 792 | pr_warn("could not find mgid entry\n"); |
793 | 793 | ||
794 | mutex_unlock(&mqp->mutex); | 794 | mutex_unlock(&mqp->mutex); |
795 | 795 | ||
@@ -902,7 +902,7 @@ static void update_gids_task(struct work_struct *work) | |||
902 | 902 | ||
903 | mailbox = mlx4_alloc_cmd_mailbox(dev); | 903 | mailbox = mlx4_alloc_cmd_mailbox(dev); |
904 | if (IS_ERR(mailbox)) { | 904 | if (IS_ERR(mailbox)) { |
905 | printk(KERN_WARNING "update gid table failed %ld\n", PTR_ERR(mailbox)); | 905 | pr_warn("update gid table failed %ld\n", PTR_ERR(mailbox)); |
906 | return; | 906 | return; |
907 | } | 907 | } |
908 | 908 | ||
@@ -913,7 +913,7 @@ static void update_gids_task(struct work_struct *work) | |||
913 | 1, MLX4_CMD_SET_PORT, MLX4_CMD_TIME_CLASS_B, | 913 | 1, MLX4_CMD_SET_PORT, MLX4_CMD_TIME_CLASS_B, |
914 | MLX4_CMD_NATIVE); | 914 | MLX4_CMD_NATIVE); |
915 | if (err) | 915 | if (err) |
916 | printk(KERN_WARNING "set port command failed\n"); | 916 | pr_warn("set port command failed\n"); |
917 | else { | 917 | else { |
918 | memcpy(gw->dev->iboe.gid_table[gw->port - 1], gw->gids, sizeof gw->gids); | 918 | memcpy(gw->dev->iboe.gid_table[gw->port - 1], gw->gids, sizeof gw->gids); |
919 | event.device = &gw->dev->ib_dev; | 919 | event.device = &gw->dev->ib_dev; |
@@ -1084,10 +1084,10 @@ static void *mlx4_ib_add(struct mlx4_dev *dev) | |||
1084 | int err; | 1084 | int err; |
1085 | struct mlx4_ib_iboe *iboe; | 1085 | struct mlx4_ib_iboe *iboe; |
1086 | 1086 | ||
1087 | printk_once(KERN_INFO "%s", mlx4_ib_version); | 1087 | pr_info_once("%s", mlx4_ib_version); |
1088 | 1088 | ||
1089 | if (mlx4_is_mfunc(dev)) { | 1089 | if (mlx4_is_mfunc(dev)) { |
1090 | printk(KERN_WARNING "IB not yet supported in SRIOV\n"); | 1090 | pr_warn("IB not yet supported in SRIOV\n"); |
1091 | return NULL; | 1091 | return NULL; |
1092 | } | 1092 | } |
1093 | 1093 | ||
@@ -1253,7 +1253,7 @@ static void *mlx4_ib_add(struct mlx4_dev *dev) | |||
1253 | 1253 | ||
1254 | err_notif: | 1254 | err_notif: |
1255 | if (unregister_netdevice_notifier(&ibdev->iboe.nb)) | 1255 | if (unregister_netdevice_notifier(&ibdev->iboe.nb)) |
1256 | printk(KERN_WARNING "failure unregistering notifier\n"); | 1256 | pr_warn("failure unregistering notifier\n"); |
1257 | flush_workqueue(wq); | 1257 | flush_workqueue(wq); |
1258 | 1258 | ||
1259 | err_reg: | 1259 | err_reg: |
@@ -1288,7 +1288,7 @@ static void mlx4_ib_remove(struct mlx4_dev *dev, void *ibdev_ptr) | |||
1288 | ib_unregister_device(&ibdev->ib_dev); | 1288 | ib_unregister_device(&ibdev->ib_dev); |
1289 | if (ibdev->iboe.nb.notifier_call) { | 1289 | if (ibdev->iboe.nb.notifier_call) { |
1290 | if (unregister_netdevice_notifier(&ibdev->iboe.nb)) | 1290 | if (unregister_netdevice_notifier(&ibdev->iboe.nb)) |
1291 | printk(KERN_WARNING "failure unregistering notifier\n"); | 1291 | pr_warn("failure unregistering notifier\n"); |
1292 | ibdev->iboe.nb.notifier_call = NULL; | 1292 | ibdev->iboe.nb.notifier_call = NULL; |
1293 | } | 1293 | } |
1294 | iounmap(ibdev->uar_map); | 1294 | iounmap(ibdev->uar_map); |