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

Commit 426824d6 authored by Dan Williams's avatar Dan Williams
Browse files

libnvdimm: remove redundant __func__ in dev_dbg 



Dynamic debug can be instructed to add the function name to the debug
output using the +f switch, so there is no need for the libnvdimm
modules to do it again. If a user decides to add the +f switch for
libnvdimm's dynamic debug this results in double prints of the function
name.

Reported-by: default avatarJohannes Thumshirn <jthumshirn@suse.de>
Reported-by: default avatarRoss Zwisler <ross.zwisler@linux.intel.com>
Signed-off-by: default avatarDan Williams <dan.j.williams@intel.com>
parent b814735f

drivers/nvdimm/btt_devs.c

+10 −11
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ static void nd_btt_release(struct device *dev) 
	struct nd_region *nd_region = to_nd_region(dev->parent);

	struct nd_btt *nd_btt = to_nd_btt(dev);



	dev_dbg(dev, "%s\n", __func__);

	dev_dbg(dev, "trace\n");

	nd_detach_ndns(&nd_btt->dev, &nd_btt->ndns);

	ida_simple_remove(&nd_region->btt_ida, nd_btt->id);

	kfree(nd_btt->uuid);
@@ -74,8 +74,8 @@ static ssize_t sector_size_store(struct device *dev, 
	nvdimm_bus_lock(dev);

	rc = nd_size_select_store(dev, buf, &nd_btt->lbasize,

			btt_lbasize_supported);

	dev_dbg(dev, "%s: result: %zd wrote: %s%s", __func__,

			rc, buf, buf[len - 1] == '\n' ? "" : "\n");

	dev_dbg(dev, "result: %zd wrote: %s%s", rc, buf,

			buf[len - 1] == '\n' ? "" : "\n");

	nvdimm_bus_unlock(dev);

	device_unlock(dev);
@@ -101,8 +101,8 @@ static ssize_t uuid_store(struct device *dev, 


	device_lock(dev);

	rc = nd_uuid_store(dev, &nd_btt->uuid, buf, len);

	dev_dbg(dev, "%s: result: %zd wrote: %s%s", __func__,

			rc, buf, buf[len - 1] == '\n' ? "" : "\n");

	dev_dbg(dev, "result: %zd wrote: %s%s", rc, buf,

			buf[len - 1] == '\n' ? "" : "\n");

	device_unlock(dev);



	return rc ? rc : len;
@@ -131,8 +131,8 @@ static ssize_t namespace_store(struct device *dev, 
	device_lock(dev);

	nvdimm_bus_lock(dev);

	rc = nd_namespace_store(dev, &nd_btt->ndns, buf, len);

	dev_dbg(dev, "%s: result: %zd wrote: %s%s", __func__,

			rc, buf, buf[len - 1] == '\n' ? "" : "\n");

	dev_dbg(dev, "result: %zd wrote: %s%s", rc, buf,

			buf[len - 1] == '\n' ? "" : "\n");

	nvdimm_bus_unlock(dev);

	device_unlock(dev);
@@ -206,8 +206,8 @@ static struct device *__nd_btt_create(struct nd_region *nd_region, 
	dev->groups = nd_btt_attribute_groups;

	device_initialize(&nd_btt->dev);

	if (ndns && !__nd_attach_ndns(&nd_btt->dev, ndns, &nd_btt->ndns)) {

		dev_dbg(&ndns->dev, "%s failed, already claimed by %s\n",

				__func__, dev_name(ndns->claim));

		dev_dbg(&ndns->dev, "failed, already claimed by %s\n",

				dev_name(ndns->claim));

		put_device(dev);

		return NULL;

	}
@@ -346,8 +346,7 @@ int nd_btt_probe(struct device *dev, struct nd_namespace_common *ndns) 
		return -ENOMEM;

	btt_sb = devm_kzalloc(dev, sizeof(*btt_sb), GFP_KERNEL);

	rc = __nd_btt_probe(to_nd_btt(btt_dev), ndns, btt_sb);

	dev_dbg(dev, "%s: btt: %s\n", __func__,

			rc == 0 ? dev_name(btt_dev) : "<none>");

	dev_dbg(dev, "btt: %s\n", rc == 0 ? dev_name(btt_dev) : "<none>");

	if (rc < 0) {

		struct nd_btt *nd_btt = to_nd_btt(btt_dev);

drivers/nvdimm/bus.c

+6 −7
Original line number Diff line number Diff line
@@ -984,8 +984,8 @@ static int __nd_ioctl(struct nvdimm_bus *nvdimm_bus, struct nvdimm *nvdimm, 


	if (cmd == ND_CMD_CALL) {

		func = pkg.nd_command;

		dev_dbg(dev, "%s:%s, idx: %llu, in: %u, out: %u, len %llu\n",

				__func__, dimm_name, pkg.nd_command,

		dev_dbg(dev, "%s, idx: %llu, in: %u, out: %u, len %llu\n",

				dimm_name, pkg.nd_command,

				in_len, out_len, buf_len);

	}
@@ -996,8 +996,8 @@ static int __nd_ioctl(struct nvdimm_bus *nvdimm_bus, struct nvdimm *nvdimm, 
		u32 copy;



		if (out_size == UINT_MAX) {

			dev_dbg(dev, "%s:%s unknown output size cmd: %s field: %d\n",

					__func__, dimm_name, cmd_name, i);

			dev_dbg(dev, "%s unknown output size cmd: %s field: %d\n",

					dimm_name, cmd_name, i);

			return -EFAULT;

		}

		if (out_len < sizeof(out_env))
@@ -1012,9 +1012,8 @@ static int __nd_ioctl(struct nvdimm_bus *nvdimm_bus, struct nvdimm *nvdimm, 


	buf_len = (u64) out_len + (u64) in_len;

	if (buf_len > ND_IOCTL_MAX_BUFLEN) {

		dev_dbg(dev, "%s:%s cmd: %s buf_len: %llu > %d\n", __func__,

				dimm_name, cmd_name, buf_len,

				ND_IOCTL_MAX_BUFLEN);

		dev_dbg(dev, "%s cmd: %s buf_len: %llu > %d\n", dimm_name,

				cmd_name, buf_len, ND_IOCTL_MAX_BUFLEN);

		return -EINVAL;

	}

drivers/nvdimm/claim.c

+1 −1
Original line number Diff line number Diff line
@@ -148,7 +148,7 @@ ssize_t nd_namespace_store(struct device *dev, 
	char *name;



	if (dev->driver) {

		dev_dbg(dev, "%s: -EBUSY\n", __func__);

		dev_dbg(dev, "namespace already active\n");

		return -EBUSY;

	}

drivers/nvdimm/core.c

+3 −3
Original line number Diff line number Diff line
@@ -134,7 +134,7 @@ static void nvdimm_map_release(struct kref *kref) 
	nvdimm_map = container_of(kref, struct nvdimm_map, kref);

	nvdimm_bus = nvdimm_map->nvdimm_bus;



	dev_dbg(&nvdimm_bus->dev, "%s: %pa\n", __func__, &nvdimm_map->offset);

	dev_dbg(&nvdimm_bus->dev, "%pa\n", &nvdimm_map->offset);

	list_del(&nvdimm_map->list);

	if (nvdimm_map->flags)

		memunmap(nvdimm_map->mem);
@@ -230,8 +230,8 @@ static int nd_uuid_parse(struct device *dev, u8 *uuid_out, const char *buf, 


	for (i = 0; i < 16; i++) {

		if (!isxdigit(str[0]) || !isxdigit(str[1])) {

			dev_dbg(dev, "%s: pos: %d buf[%zd]: %c buf[%zd]: %c\n",

					__func__, i, str - buf, str[0],

			dev_dbg(dev, "pos: %d buf[%zd]: %c buf[%zd]: %c\n",

					i, str - buf, str[0],

					str + 1 - buf, str[1]);

			return -EINVAL;

		}

drivers/nvdimm/dax_devs.c

+2 −3
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ static void nd_dax_release(struct device *dev) 
	struct nd_dax *nd_dax = to_nd_dax(dev);

	struct nd_pfn *nd_pfn = &nd_dax->nd_pfn;



	dev_dbg(dev, "%s\n", __func__);

	dev_dbg(dev, "trace\n");

	nd_detach_ndns(dev, &nd_pfn->ndns);

	ida_simple_remove(&nd_region->dax_ida, nd_pfn->id);

	kfree(nd_pfn->uuid);
@@ -129,8 +129,7 @@ int nd_dax_probe(struct device *dev, struct nd_namespace_common *ndns) 
	pfn_sb = devm_kzalloc(dev, sizeof(*pfn_sb), GFP_KERNEL);

	nd_pfn->pfn_sb = pfn_sb;

	rc = nd_pfn_validate(nd_pfn, DAX_SIG);

	dev_dbg(dev, "%s: dax: %s\n", __func__,

			rc == 0 ? dev_name(dax_dev) : "<none>");

	dev_dbg(dev, "dax: %s\n", rc == 0 ? dev_name(dax_dev) : "<none>");

	if (rc < 0) {

		nd_detach_ndns(dax_dev, &nd_pfn->ndns);

		put_device(dax_dev);