Commit 933ca4e3 authored by Kefeng Wang's avatar Kefeng Wang Committed by Petr Mladek
Browse files

acpi: Use pr_warn instead of pr_warning 

As said in commit f2c2cbcc ("powerpc: Use pr_warn instead of
pr_warning"), removing pr_warning so all logging messages use a
consistent <prefix>_warn style. Let's do it.

Link: http://lkml.kernel.org/r/20191018031850.48498-8-wangkefeng.wang@huawei.com


To: linux-kernel@vger.kernel.org
Cc: "Rafael J. Wysocki" <rjw@rjwysocki.net>
Cc: Len Brown <lenb@kernel.org>
Cc: James Morse <james.morse@arm.com>
Signed-off-by: default avatarKefeng Wang <wangkefeng.wang@huawei.com>
Reviewed-by: default avatarSergey Senozhatsky <sergey.senozhatsky@gmail.com>
[pmladek@suse.com: two more indentation fixes]
Signed-off-by: default avatarPetr Mladek <pmladek@suse.com>
parent 8d3bcc44

drivers/acpi/apei/apei-base.c

+22 −22
Original line number Diff line number Diff line
@@ -170,7 +170,7 @@ int __apei_exec_run(struct apei_exec_context *ctx, u8 action, 
		if (ip == ctx->ip) {

			if (entry->instruction >= ctx->instructions ||

			    !ctx->ins_table[entry->instruction].run) {

				pr_warning(FW_WARN APEI_PFX

				pr_warn(FW_WARN APEI_PFX

					"Invalid action table, unknown instruction type: %d\n",

					entry->instruction);

				return -EINVAL;
@@ -211,7 +211,7 @@ static int apei_exec_for_each_entry(struct apei_exec_context *ctx, 
		if (end)

			*end = i;

		if (ins >= ctx->instructions || !ins_table[ins].run) {

			pr_warning(FW_WARN APEI_PFX

			pr_warn(FW_WARN APEI_PFX

				"Invalid action table, unknown instruction type: %d\n",

				ins);

			return -EINVAL;
@@ -579,7 +579,7 @@ static int apei_check_gar(struct acpi_generic_address *reg, u64 *paddr, 
	space_id = reg->space_id;

	*paddr = get_unaligned(&reg->address);

	if (!*paddr) {

		pr_warning(FW_BUG APEI_PFX

		pr_warn(FW_BUG APEI_PFX

			"Invalid physical address in GAR [0x%llx/%u/%u/%u/%u]\n",

			*paddr, bit_width, bit_offset, access_size_code,

			space_id);
@@ -587,7 +587,7 @@ static int apei_check_gar(struct acpi_generic_address *reg, u64 *paddr, 
	}



	if (access_size_code < 1 || access_size_code > 4) {

		pr_warning(FW_BUG APEI_PFX

		pr_warn(FW_BUG APEI_PFX

			"Invalid access size code in GAR [0x%llx/%u/%u/%u/%u]\n",

			*paddr, bit_width, bit_offset, access_size_code,

			space_id);
@@ -604,7 +604,7 @@ static int apei_check_gar(struct acpi_generic_address *reg, u64 *paddr, 
		*access_bit_width = 64;



	if ((bit_width + bit_offset) > *access_bit_width) {

		pr_warning(FW_BUG APEI_PFX

		pr_warn(FW_BUG APEI_PFX

			"Invalid bit width + offset in GAR [0x%llx/%u/%u/%u/%u]\n",

			*paddr, bit_width, bit_offset, access_size_code,

			space_id);
@@ -613,7 +613,7 @@ static int apei_check_gar(struct acpi_generic_address *reg, u64 *paddr, 


	if (space_id != ACPI_ADR_SPACE_SYSTEM_MEMORY &&

	    space_id != ACPI_ADR_SPACE_SYSTEM_IO) {

		pr_warning(FW_BUG APEI_PFX

		pr_warn(FW_BUG APEI_PFX

			"Invalid address space type in GAR [0x%llx/%u/%u/%u/%u]\n",

			*paddr, bit_width, bit_offset, access_size_code,

			space_id);

drivers/acpi/apei/einj.c

+2 −2
Original line number Diff line number Diff line
@@ -172,7 +172,7 @@ static int einj_get_available_error_type(u32 *type) 
static int einj_timedout(u64 *t)

{

	if ((s64)*t < SPIN_UNIT) {

		pr_warning(FW_WARN "Firmware does not respond in time\n");

		pr_warn(FW_WARN "Firmware does not respond in time\n");

		return 1;

	}

	*t -= SPIN_UNIT;
@@ -312,7 +312,7 @@ static int __einj_error_trigger(u64 trigger_paddr, u32 type, 
	}

	rc = einj_check_trigger_header(trigger_tab);

	if (rc) {

		pr_warning(FW_BUG "Invalid trigger error action table.\n");

		pr_warn(FW_BUG "Invalid trigger error action table.\n");

		goto out_rel_header;

	}

drivers/acpi/apei/erst-dbg.c

+2 −3
Original line number Diff line number Diff line
@@ -118,9 +118,8 @@ static ssize_t erst_dbg_read(struct file *filp, char __user *ubuf, 
	if (rc < 0)

		goto out;

	if (len > ERST_DBG_RECORD_LEN_MAX) {

		pr_warning(ERST_DBG_PFX

			   "Record (ID: 0x%llx) length is too long: %zd\n",

			   id, len);

		pr_warn(ERST_DBG_PFX

			"Record (ID: 0x%llx) length is too long: %zd\n", id, len);

		rc = -EIO;

		goto out;

	}

drivers/acpi/apei/ghes.c

+12 −13
Original line number Diff line number Diff line
@@ -222,7 +222,7 @@ static struct ghes *ghes_new(struct acpi_hest_generic *generic) 
		goto err_unmap_read_ack_addr;

	error_block_length = generic->error_block_length;

	if (error_block_length > GHES_ESTATUS_MAX_SIZE) {

		pr_warning(FW_WARN GHES_PFX

		pr_warn(FW_WARN GHES_PFX

			"Error status block length is too long: %u for "

			"generic hardware error source: %d.\n",

			error_block_length, generic->header.source_id);
@@ -735,7 +735,7 @@ static void ghes_add_timer(struct ghes *ghes) 
	unsigned long expire;



	if (!g->notify.poll_interval) {

		pr_warning(FW_WARN GHES_PFX "Poll interval is 0 for generic hardware error source: %d, disabled.\n",

		pr_warn(FW_WARN GHES_PFX "Poll interval is 0 for generic hardware error source: %d, disabled.\n",

			g->header.source_id);

		return;

	}
@@ -1142,11 +1142,11 @@ static int ghes_probe(struct platform_device *ghes_dev) 
		}

		break;

	case ACPI_HEST_NOTIFY_LOCAL:

		pr_warning(GHES_PFX "Generic hardware error source: %d notified via local interrupt is not supported!\n",

		pr_warn(GHES_PFX "Generic hardware error source: %d notified via local interrupt is not supported!\n",

			generic->header.source_id);

		goto err;

	default:

		pr_warning(FW_WARN GHES_PFX "Unknown notification type: %u for generic hardware error source: %d\n",

		pr_warn(FW_WARN GHES_PFX "Unknown notification type: %u for generic hardware error source: %d\n",

			generic->notify.type, generic->header.source_id);

		goto err;

	}
@@ -1154,9 +1154,8 @@ static int ghes_probe(struct platform_device *ghes_dev) 
	rc = -EIO;

	if (generic->error_block_length <

	    sizeof(struct acpi_hest_generic_status)) {

		pr_warning(FW_BUG GHES_PFX "Invalid error block length: %u for generic hardware error source: %d\n",

			   generic->error_block_length,

			   generic->header.source_id);

		pr_warn(FW_BUG GHES_PFX "Invalid error block length: %u for generic hardware error source: %d\n",

			generic->error_block_length, generic->header.source_id);

		goto err;

	}

	ghes = ghes_new(generic);

drivers/acpi/apei/hest.c

+7 −7
Original line number Diff line number Diff line
@@ -92,7 +92,7 @@ int apei_hest_parse(apei_hest_func_t func, void *data) 
	for (i = 0; i < hest_tab->error_source_count; i++) {

		len = hest_esrc_len(hest_hdr);

		if (!len) {

			pr_warning(FW_WARN HEST_PFX

			pr_warn(FW_WARN HEST_PFX

				"Unknown or unused hardware error source "

				"type: %d for hardware error source: %d.\n",

				hest_hdr->type, hest_hdr->source_id);
@@ -100,7 +100,7 @@ int apei_hest_parse(apei_hest_func_t func, void *data) 
		}

		if ((void *)hest_hdr + len >

		    (void *)hest_tab + hest_tab->header.length) {

			pr_warning(FW_BUG HEST_PFX

			pr_warn(FW_BUG HEST_PFX

		"Table contents overflow for hardware error source: %d.\n",

				hest_hdr->source_id);

			return -EINVAL;
@@ -164,7 +164,7 @@ static int __init hest_parse_ghes(struct acpi_hest_header *hest_hdr, void *data) 
		ghes_dev = ghes_arr->ghes_devs[i];

		hdr = *(struct acpi_hest_header **)ghes_dev->dev.platform_data;

		if (hdr->source_id == hest_hdr->source_id) {

			pr_warning(FW_WARN HEST_PFX "Duplicated hardware error source ID: %d.\n",

			pr_warn(FW_WARN HEST_PFX "Duplicated hardware error source ID: %d.\n",

				hdr->source_id);

			return -EIO;

		}