Commit 56216359 authored by Liu Shixin's avatar Liu Shixin Committed by Rafael J. Wysocki
Browse files

ACPI: HMAT: Drop unused dev_fmt() and redundant 'HMAT' prefix 



Remove unused macro dev_pmt() and redundant 'HMAT' prefix from
pr_*() calls.

Signed-off-by: default avatarLiu Shixin <liushixin2@huawei.com>
[ rjw: Subject and changelog edits ]
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent 211391bf

drivers/acpi/numa/hmat.c

+12 −13
Original line number Diff line number Diff line
@@ -9,7 +9,6 @@ 
 */



#define pr_fmt(fmt) "acpi/hmat: " fmt

#define dev_fmt(fmt) "acpi/hmat: " fmt



#include <linux/acpi.h>

#include <linux/bitops.h>
@@ -302,7 +301,7 @@ static __init int hmat_parse_locality(union acpi_subtable_headers *header, 
	u8 type, mem_hier;



	if (hmat_loc->header.length < sizeof(*hmat_loc)) {

		pr_notice("HMAT: Unexpected locality header length: %u\n",

		pr_notice("Unexpected locality header length: %u\n",

			 hmat_loc->header.length);

		return -EINVAL;

	}
@@ -314,12 +313,12 @@ static __init int hmat_parse_locality(union acpi_subtable_headers *header, 
	total_size = sizeof(*hmat_loc) + sizeof(*entries) * ipds * tpds +

		     sizeof(*inits) * ipds + sizeof(*targs) * tpds;

	if (hmat_loc->header.length < total_size) {

		pr_notice("HMAT: Unexpected locality header length:%u, minimum required:%u\n",

		pr_notice("Unexpected locality header length:%u, minimum required:%u\n",

			 hmat_loc->header.length, total_size);

		return -EINVAL;

	}



	pr_info("HMAT: Locality: Flags:%02x Type:%s Initiator Domains:%u Target Domains:%u Base:%lld\n",

	pr_info("Locality: Flags:%02x Type:%s Initiator Domains:%u Target Domains:%u Base:%lld\n",

		hmat_loc->flags, hmat_data_type(type), ipds, tpds,

		hmat_loc->entry_base_unit);
@@ -363,13 +362,13 @@ static __init int hmat_parse_cache(union acpi_subtable_headers *header, 
	u32 attrs;



	if (cache->header.length < sizeof(*cache)) {

		pr_notice("HMAT: Unexpected cache header length: %u\n",

		pr_notice("Unexpected cache header length: %u\n",

			 cache->header.length);

		return -EINVAL;

	}



	attrs = cache->cache_attributes;

	pr_info("HMAT: Cache: Domain:%u Size:%llu Attrs:%08x SMBIOS Handles:%d\n",

	pr_info("Cache: Domain:%u Size:%llu Attrs:%08x SMBIOS Handles:%d\n",

		cache->memory_PD, cache->cache_size, attrs,

		cache->number_of_SMBIOShandles);
@@ -424,24 +423,24 @@ static int __init hmat_parse_proximity_domain(union acpi_subtable_headers *heade 
	struct memory_target *target = NULL;



	if (p->header.length != sizeof(*p)) {

		pr_notice("HMAT: Unexpected address range header length: %u\n",

		pr_notice("Unexpected address range header length: %u\n",

			 p->header.length);

		return -EINVAL;

	}



	if (hmat_revision == 1)

		pr_info("HMAT: Memory (%#llx length %#llx) Flags:%04x Processor Domain:%u Memory Domain:%u\n",

		pr_info("Memory (%#llx length %#llx) Flags:%04x Processor Domain:%u Memory Domain:%u\n",

			p->reserved3, p->reserved4, p->flags, p->processor_PD,

			p->memory_PD);

	else

		pr_info("HMAT: Memory Flags:%04x Processor Domain:%u Memory Domain:%u\n",

		pr_info("Memory Flags:%04x Processor Domain:%u Memory Domain:%u\n",

			p->flags, p->processor_PD, p->memory_PD);



	if ((hmat_revision == 1 && p->flags & ACPI_HMAT_MEMORY_PD_VALID) ||

	    hmat_revision > 1) {

		target = find_mem_target(p->memory_PD);

		if (!target) {

			pr_debug("HMAT: Memory Domain missing from SRAT\n");

			pr_debug("Memory Domain missing from SRAT\n");

			return -EINVAL;

		}

	}
@@ -449,7 +448,7 @@ static int __init hmat_parse_proximity_domain(union acpi_subtable_headers *heade 
		int p_node = pxm_to_node(p->processor_PD);



		if (p_node == NUMA_NO_NODE) {

			pr_debug("HMAT: Invalid Processor Domain\n");

			pr_debug("Invalid Processor Domain\n");

			return -EINVAL;

		}

		target->processor_pxm = p->processor_PD;
@@ -840,7 +839,7 @@ static __init int hmat_init(void) 
	case 2:

		break;

	default:

		pr_notice("Ignoring HMAT: Unknown revision:%d\n", hmat_revision);

		pr_notice("Ignoring: Unknown revision:%d\n", hmat_revision);

		goto out_put;

	}
@@ -848,7 +847,7 @@ static __init int hmat_init(void) 
		if (acpi_table_parse_entries(ACPI_SIG_HMAT,

					     sizeof(struct acpi_table_hmat), i,

					     hmat_parse_subtable, 0) < 0) {

			pr_notice("Ignoring HMAT: Invalid table");

			pr_notice("Ignoring: Invalid table");

			goto out_put;

		}

	}