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

Commit 7699a6a3 authored by Dan Williams's avatar Dan Williams
Browse files

acpi, nfit: kill ACPI_NFIT_DEBUG 



Inevitably when one actually needs to debug a DSM issue it's on a
distribution kernel that has CONFIG_ACPI_NFIT_DEBUG=n. The config symbol
was only there to avoid the compile error due to the missing fallback for
print_hex_dump_debug in the CONFIG_DYNAMIC_DEBUG=n case. That was fixed
with commit cdf17449 "hexdump: do not print debug dumps for
!CONFIG_DEBUG", so the config symbol can just be dropped.

Cc: Joe Perches <joe@perches.com>
Signed-off-by: default avatarDan Williams <dan.j.williams@intel.com>
parent 8d13c029

drivers/acpi/nfit/Kconfig

+0 −12
Original line number Diff line number Diff line
@@ -12,15 +12,3 @@ config ACPI_NFIT 


	  To compile this driver as a module, choose M here:

	  the module will be called nfit.
 


config ACPI_NFIT_DEBUG

	bool "NFIT DSM debug"

	depends on ACPI_NFIT

	depends on DYNAMIC_DEBUG

	default n

	help

	  Enabling this option causes the nfit driver to dump the

	  input and output buffers of _DSM operations on the ACPI0012

	  device and its children.  This can be very verbose, so leave

	  it disabled unless you are debugging a hardware / firmware

	  issue.

drivers/acpi/nfit/core.c

+8 −13
Original line number Diff line number Diff line
@@ -268,14 +268,11 @@ int acpi_nfit_ctl(struct nvdimm_bus_descriptor *nd_desc, struct nvdimm *nvdimm, 
		in_buf.buffer.length = call_pkg->nd_size_in;

	}



	if (IS_ENABLED(CONFIG_ACPI_NFIT_DEBUG)) {

	dev_dbg(dev, "%s:%s cmd: %d: func: %d input length: %d\n",

				__func__, dimm_name, cmd, func,

				in_buf.buffer.length);

			__func__, dimm_name, cmd, func, in_buf.buffer.length);

	print_hex_dump_debug("nvdimm in  ", DUMP_PREFIX_OFFSET, 4, 4,

			in_buf.buffer.pointer,

			min_t(u32, 256, in_buf.buffer.length), true);

	}



	out_obj = acpi_evaluate_dsm(handle, uuid, 1, func, &in_obj);

	if (!out_obj) {
@@ -307,13 +304,11 @@ int acpi_nfit_ctl(struct nvdimm_bus_descriptor *nd_desc, struct nvdimm *nvdimm, 
		goto out;

	}



	if (IS_ENABLED(CONFIG_ACPI_NFIT_DEBUG)) {

		dev_dbg(dev, "%s:%s cmd: %s output length: %d\n", __func__,

				dimm_name, cmd_name, out_obj->buffer.length);

		print_hex_dump_debug(cmd_name, DUMP_PREFIX_OFFSET, 4,

				4, out_obj->buffer.pointer, min_t(u32, 128,

					out_obj->buffer.length), true);

	}

	dev_dbg(dev, "%s:%s cmd: %s output length: %d\n", __func__, dimm_name,

			cmd_name, out_obj->buffer.length);

	print_hex_dump_debug(cmd_name, DUMP_PREFIX_OFFSET, 4, 4,

			out_obj->buffer.pointer,

			min_t(u32, 128, out_obj->buffer.length), true);



	for (i = 0, offset = 0; i < desc->out_num; i++) {

		u32 out_size = nd_cmd_out_size(nvdimm, cmd, desc, i, buf,