Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit aba25a3e authored by Parav Pandit's avatar Parav Pandit Committed by Doug Ledford
Browse files

IB/core: trivial prink cleanup. 



1. Replaced printk with appropriate pr_warn, pr_err, pr_info.
2. Removed unnecessary prints around memory allocation failure
which are not required, as reported by the checkpatch script.

Signed-off-by: default avatarParav Pandit <pandit.parav@gmail.com>
Reviewed-by: default avatarHaggai Eran <haggaie@mellanox.com>
Reviewed-by: default avatarSagi Grimberg <sagig@mellanox.com>
Signed-off-by: default avatarDoug Ledford <dledford@redhat.com>
parent db9314cd

drivers/infiniband/core/cache.c

+7 −8
Original line number Diff line number Diff line
@@ -1043,7 +1043,7 @@ static void ib_cache_update(struct ib_device *device, 


	ret = ib_query_port(device, port, tprops);

	if (ret) {

		printk(KERN_WARNING "ib_query_port failed (%d) for %s\n",

		pr_warn("ib_query_port failed (%d) for %s\n",

			ret, device->name);

		goto err;

	}
@@ -1067,7 +1067,7 @@ static void ib_cache_update(struct ib_device *device, 
	for (i = 0; i < pkey_cache->table_len; ++i) {

		ret = ib_query_pkey(device, port, i, pkey_cache->table + i);

		if (ret) {

			printk(KERN_WARNING "ib_query_pkey failed (%d) for %s (index %d)\n",

			pr_warn("ib_query_pkey failed (%d) for %s (index %d)\n",

				ret, device->name, i);

			goto err;

		}
@@ -1078,7 +1078,7 @@ static void ib_cache_update(struct ib_device *device, 
			ret = ib_query_gid(device, port, i,

					   gid_cache->table + i, NULL);

			if (ret) {

				printk(KERN_WARNING "ib_query_gid failed (%d) for %s (index %d)\n",

				pr_warn("ib_query_gid failed (%d) for %s (index %d)\n",

					ret, device->name, i);

				goto err;

			}
@@ -1161,8 +1161,7 @@ int ib_cache_setup_one(struct ib_device *device) 
					  GFP_KERNEL);

	if (!device->cache.pkey_cache ||

	    !device->cache.lmc_cache) {

		printk(KERN_WARNING "Couldn't allocate cache "

		       "for %s\n", device->name);

		pr_warn("Couldn't allocate cache for %s\n", device->name);

		return -ENOMEM;

	}

drivers/infiniband/core/cma.c

+7 −7
Original line number Diff line number Diff line
@@ -1713,7 +1713,7 @@ static int cma_ib_handler(struct ib_cm_id *cm_id, struct ib_cm_event *ib_event) 
		event.param.conn.private_data_len = IB_CM_REJ_PRIVATE_DATA_SIZE;

		break;

	default:

		printk(KERN_ERR "RDMA CMA: unexpected IB CM event: %d\n",

		pr_err("RDMA CMA: unexpected IB CM event: %d\n",

		       ib_event->event);

		goto out;

	}
@@ -2186,8 +2186,8 @@ static void cma_listen_on_dev(struct rdma_id_private *id_priv, 


	ret = rdma_listen(id, id_priv->backlog);

	if (ret)

		printk(KERN_WARNING "RDMA CMA: cma_listen_on_dev, error %d, "

		       "listening on device %s\n", ret, cma_dev->device->name);

		pr_warn("RDMA CMA: cma_listen_on_dev, error %d, listening on device %s\n",

			ret, cma_dev->device->name);

}



static void cma_listen_on_all(struct rdma_id_private *id_priv)
@@ -3239,7 +3239,7 @@ static int cma_sidr_rep_handler(struct ib_cm_id *cm_id, 
		event.status = 0;

		break;

	default:

		printk(KERN_ERR "RDMA CMA: unexpected IB CM event: %d\n",

		pr_err("RDMA CMA: unexpected IB CM event: %d\n",

		       ib_event->event);

		goto out;

	}
@@ -4003,7 +4003,7 @@ static int cma_netdev_change(struct net_device *ndev, struct rdma_id_private *id 
	if ((dev_addr->bound_dev_if == ndev->ifindex) &&

	    (net_eq(dev_net(ndev), dev_addr->net)) &&

	    memcmp(dev_addr->src_dev_addr, ndev->dev_addr, ndev->addr_len)) {

		printk(KERN_INFO "RDMA CM addr change for ndev %s used by id %p\n",

		pr_info("RDMA CM addr change for ndev %s used by id %p\n",

			ndev->name, &id_priv->id);

		work = kzalloc(sizeof *work, GFP_KERNEL);

		if (!work)
@@ -4287,7 +4287,7 @@ static int __init cma_init(void) 
		goto err;



	if (ibnl_add_client(RDMA_NL_RDMA_CM, RDMA_NL_RDMA_CM_NUM_OPS, cma_cb_table))

		printk(KERN_WARNING "RDMA CMA: failed to add netlink callback\n");

		pr_warn("RDMA CMA: failed to add netlink callback\n");

	cma_configfs_init();



	return 0;

drivers/infiniband/core/device.c

+14 −14
Original line number Diff line number Diff line
@@ -115,7 +115,7 @@ static int ib_device_check_mandatory(struct ib_device *device) 


	for (i = 0; i < ARRAY_SIZE(mandatory_table); ++i) {

		if (!*(void **) ((void *) device + mandatory_table[i].offset)) {

			printk(KERN_WARNING "Device %s is missing mandatory function %s\n",

			pr_warn("Device %s is missing mandatory function %s\n",

				device->name, mandatory_table[i].name);

			return -EINVAL;

		}
@@ -255,7 +255,7 @@ static int add_client_context(struct ib_device *device, struct ib_client *client 


	context = kmalloc(sizeof *context, GFP_KERNEL);

	if (!context) {

		printk(KERN_WARNING "Couldn't allocate client context for %s/%s\n",

		pr_warn("Couldn't allocate client context for %s/%s\n",

			device->name, client->name);

		return -ENOMEM;

	}
@@ -343,28 +343,28 @@ int ib_register_device(struct ib_device *device, 


	ret = read_port_immutable(device);

	if (ret) {

		printk(KERN_WARNING "Couldn't create per port immutable data %s\n",

		pr_warn("Couldn't create per port immutable data %s\n",

			device->name);

		goto out;

	}



	ret = ib_cache_setup_one(device);

	if (ret) {

		printk(KERN_WARNING "Couldn't set up InfiniBand P_Key/GID cache\n");

		pr_warn("Couldn't set up InfiniBand P_Key/GID cache\n");

		goto out;

	}



	memset(&device->attrs, 0, sizeof(device->attrs));

	ret = device->query_device(device, &device->attrs, &uhw);

	if (ret) {

		printk(KERN_WARNING "Couldn't query the device attributes\n");

		pr_warn("Couldn't query the device attributes\n");

		ib_cache_cleanup_one(device);

		goto out;

	}



	ret = ib_device_register_sysfs(device, port_callback);

	if (ret) {

		printk(KERN_WARNING "Couldn't register device %s with driver model\n",

		pr_warn("Couldn't register device %s with driver model\n",

			device->name);

		ib_cache_cleanup_one(device);

		goto out;
@@ -566,7 +566,7 @@ void ib_set_client_data(struct ib_device *device, struct ib_client *client, 
			goto out;

		}



	printk(KERN_WARNING "No client context found for %s/%s\n",

	pr_warn("No client context found for %s/%s\n",

		device->name, client->name);



out:
@@ -960,13 +960,13 @@ static int __init ib_core_init(void) 


	ret = class_register(&ib_class);

	if (ret) {

		printk(KERN_WARNING "Couldn't create InfiniBand device class\n");

		pr_warn("Couldn't create InfiniBand device class\n");

		goto err_comp;

	}



	ret = ibnl_init();

	if (ret) {

		printk(KERN_WARNING "Couldn't init IB netlink interface\n");

		pr_warn("Couldn't init IB netlink interface\n");

		goto err_sysfs;

	}

drivers/infiniband/core/fmr_pool.c

+15 −22
Original line number Diff line number Diff line
@@ -150,7 +150,7 @@ static void ib_fmr_batch_release(struct ib_fmr_pool *pool) 


#ifdef DEBUG

		if (fmr->ref_count !=0) {

			printk(KERN_WARNING PFX "Unmapping FMR 0x%08x with ref count %d\n",

			pr_warn(PFX "Unmapping FMR 0x%08x with ref count %d\n",

				fmr, fmr->ref_count);

		}

#endif
@@ -167,7 +167,7 @@ static void ib_fmr_batch_release(struct ib_fmr_pool *pool) 


	ret = ib_unmap_fmr(&fmr_list);

	if (ret)

		printk(KERN_WARNING PFX "ib_unmap_fmr returned %d\n", ret);

		pr_warn(PFX "ib_unmap_fmr returned %d\n", ret);



	spin_lock_irq(&pool->pool_lock);

	list_splice(&unmap_list, &pool->free_list);
@@ -222,8 +222,7 @@ struct ib_fmr_pool *ib_create_fmr_pool(struct ib_pd *pd, 
	device = pd->device;

	if (!device->alloc_fmr    || !device->dealloc_fmr  ||

	    !device->map_phys_fmr || !device->unmap_fmr) {

		printk(KERN_INFO PFX "Device %s does not support FMRs\n",

		       device->name);

		pr_info(PFX "Device %s does not support FMRs\n", device->name);

		return ERR_PTR(-ENOSYS);

	}
@@ -233,13 +232,10 @@ struct ib_fmr_pool *ib_create_fmr_pool(struct ib_pd *pd, 
		max_remaps = device->attrs.max_map_per_fmr;



	pool = kmalloc(sizeof *pool, GFP_KERNEL);

	if (!pool) {

		printk(KERN_WARNING PFX "couldn't allocate pool struct\n");

	if (!pool)

		return ERR_PTR(-ENOMEM);

	}



	pool->cache_bucket   = NULL;



	pool->flush_function = params->flush_function;

	pool->flush_arg      = params->flush_arg;
@@ -251,7 +247,7 @@ struct ib_fmr_pool *ib_create_fmr_pool(struct ib_pd *pd, 
			kmalloc(IB_FMR_HASH_SIZE * sizeof *pool->cache_bucket,

				GFP_KERNEL);

		if (!pool->cache_bucket) {

			printk(KERN_WARNING PFX "Failed to allocate cache in pool\n");

			pr_warn(PFX "Failed to allocate cache in pool\n");

			ret = -ENOMEM;

			goto out_free_pool;

		}
@@ -275,7 +271,7 @@ struct ib_fmr_pool *ib_create_fmr_pool(struct ib_pd *pd, 
				   "ib_fmr(%s)",

				   device->name);

	if (IS_ERR(pool->thread)) {

		printk(KERN_WARNING PFX "couldn't start cleanup thread\n");

		pr_warn(PFX "couldn't start cleanup thread\n");

		ret = PTR_ERR(pool->thread);

		goto out_free_pool;

	}
@@ -294,11 +290,8 @@ struct ib_fmr_pool *ib_create_fmr_pool(struct ib_pd *pd, 


		for (i = 0; i < params->pool_size; ++i) {

			fmr = kmalloc(bytes_per_fmr, GFP_KERNEL);

			if (!fmr) {

				printk(KERN_WARNING PFX "failed to allocate fmr "

				       "struct for FMR %d\n", i);

			if (!fmr)

				goto out_fail;

			}



			fmr->pool             = pool;

			fmr->remap_count      = 0;
@@ -307,8 +300,8 @@ struct ib_fmr_pool *ib_create_fmr_pool(struct ib_pd *pd, 


			fmr->fmr = ib_alloc_fmr(pd, params->access, &fmr_attr);

			if (IS_ERR(fmr->fmr)) {

				printk(KERN_WARNING PFX "fmr_create failed "

				       "for FMR %d\n", i);

				pr_warn(PFX "fmr_create failed for FMR %d\n",

					i);

				kfree(fmr);

				goto out_fail;

			}
@@ -363,7 +356,7 @@ void ib_destroy_fmr_pool(struct ib_fmr_pool *pool) 
	}



	if (i < pool->pool_size)

		printk(KERN_WARNING PFX "pool still has %d regions registered\n",

		pr_warn(PFX "pool still has %d regions registered\n",

			pool->pool_size - i);



	kfree(pool->cache_bucket);
@@ -463,7 +456,7 @@ struct ib_pool_fmr *ib_fmr_pool_map_phys(struct ib_fmr_pool *pool_handle, 
		list_add(&fmr->list, &pool->free_list);

		spin_unlock_irqrestore(&pool->pool_lock, flags);



		printk(KERN_WARNING PFX "fmr_map returns %d\n", result);

		pr_warn(PFX "fmr_map returns %d\n", result);



		return ERR_PTR(result);

	}
@@ -517,7 +510,7 @@ int ib_fmr_pool_unmap(struct ib_pool_fmr *fmr) 


#ifdef DEBUG

	if (fmr->ref_count < 0)

		printk(KERN_WARNING PFX "FMR %p has ref count %d < 0\n",

		pr_warn(PFX "FMR %p has ref count %d < 0\n",

			fmr, fmr->ref_count);

#endif

drivers/infiniband/core/packer.c

+6 −8
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ static u64 value_read(int offset, int size, void *structure) 
	case 4: return be32_to_cpup((__be32 *) (structure + offset));

	case 8: return be64_to_cpup((__be64 *) (structure + offset));

	default:

		printk(KERN_WARNING "Field size %d bits not handled\n", size * 8);

		pr_warn("Field size %d bits not handled\n", size * 8);

		return 0;

	}

}
@@ -104,8 +104,7 @@ void ib_pack(const struct ib_field *desc, 
		} else {

			if (desc[i].offset_bits % 8 ||

			    desc[i].size_bits   % 8) {

				printk(KERN_WARNING "Structure field %s of size %d "

				       "bits is not byte-aligned\n",

				pr_warn("Structure field %s of size %d bits is not byte-aligned\n",

					desc[i].field_name, desc[i].size_bits);

			}
@@ -132,7 +131,7 @@ static void value_write(int offset, int size, u64 val, void *structure) 
	case 32: *(__be32 *) (structure + offset) = cpu_to_be32(val); break;

	case 64: *(__be64 *) (structure + offset) = cpu_to_be64(val); break;

	default:

		printk(KERN_WARNING "Field size %d bits not handled\n", size * 8);

		pr_warn("Field size %d bits not handled\n", size * 8);

	}

}
@@ -188,8 +187,7 @@ void ib_unpack(const struct ib_field *desc, 
		} else {

			if (desc[i].offset_bits % 8 ||

			    desc[i].size_bits   % 8) {

				printk(KERN_WARNING "Structure field %s of size %d "

				       "bits is not byte-aligned\n",

				pr_warn("Structure field %s of size %d bits is not byte-aligned\n",

					desc[i].field_name, desc[i].size_bits);

			}