|
@@ -2593,7 +2593,7 @@ static void __mlx4_remove_one(struct pci_dev *pdev)
|
|
/* in SRIOV it is not allowed to unload the pf's
|
|
/* in SRIOV it is not allowed to unload the pf's
|
|
* driver while there are alive vf's */
|
|
* driver while there are alive vf's */
|
|
if (mlx4_is_master(dev) && mlx4_how_many_lives_vf(dev))
|
|
if (mlx4_is_master(dev) && mlx4_how_many_lives_vf(dev))
|
|
- printk(KERN_ERR "Removing PF when there are assigned VF's !!!\n");
|
|
|
|
|
|
+ pr_warn("Removing PF when there are assigned VF's !!!\n");
|
|
mlx4_stop_sense(dev);
|
|
mlx4_stop_sense(dev);
|
|
mlx4_unregister_device(dev);
|
|
mlx4_unregister_device(dev);
|
|
|
|
|
|
@@ -2764,25 +2764,26 @@ static struct pci_driver mlx4_driver = {
|
|
static int __init mlx4_verify_params(void)
|
|
static int __init mlx4_verify_params(void)
|
|
{
|
|
{
|
|
if ((log_num_mac < 0) || (log_num_mac > 7)) {
|
|
if ((log_num_mac < 0) || (log_num_mac > 7)) {
|
|
- pr_warning("mlx4_core: bad num_mac: %d\n", log_num_mac);
|
|
|
|
|
|
+ pr_warn("mlx4_core: bad num_mac: %d\n", log_num_mac);
|
|
return -1;
|
|
return -1;
|
|
}
|
|
}
|
|
|
|
|
|
if (log_num_vlan != 0)
|
|
if (log_num_vlan != 0)
|
|
- pr_warning("mlx4_core: log_num_vlan - obsolete module param, using %d\n",
|
|
|
|
- MLX4_LOG_NUM_VLANS);
|
|
|
|
|
|
+ pr_warn("mlx4_core: log_num_vlan - obsolete module param, using %d\n",
|
|
|
|
+ MLX4_LOG_NUM_VLANS);
|
|
|
|
|
|
if (use_prio != 0)
|
|
if (use_prio != 0)
|
|
pr_warn("mlx4_core: use_prio - obsolete module param, ignored\n");
|
|
pr_warn("mlx4_core: use_prio - obsolete module param, ignored\n");
|
|
|
|
|
|
if ((log_mtts_per_seg < 1) || (log_mtts_per_seg > 7)) {
|
|
if ((log_mtts_per_seg < 1) || (log_mtts_per_seg > 7)) {
|
|
- pr_warning("mlx4_core: bad log_mtts_per_seg: %d\n", log_mtts_per_seg);
|
|
|
|
|
|
+ pr_warn("mlx4_core: bad log_mtts_per_seg: %d\n",
|
|
|
|
+ log_mtts_per_seg);
|
|
return -1;
|
|
return -1;
|
|
}
|
|
}
|
|
|
|
|
|
/* Check if module param for ports type has legal combination */
|
|
/* Check if module param for ports type has legal combination */
|
|
if (port_type_array[0] == false && port_type_array[1] == true) {
|
|
if (port_type_array[0] == false && port_type_array[1] == true) {
|
|
- printk(KERN_WARNING "Module parameter configuration ETH/IB is not supported. Switching to default configuration IB/IB\n");
|
|
|
|
|
|
+ pr_warn("Module parameter configuration ETH/IB is not supported. Switching to default configuration IB/IB\n");
|
|
port_type_array[0] = true;
|
|
port_type_array[0] = true;
|
|
}
|
|
}
|
|
|
|
|