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

Commit 55ac9a01 authored by Lin Ming's avatar Lin Ming Committed by Len Brown
Browse files

ACPI: replace ACPI_DEBUG_PRINT((ACPI_DB_ERROR, ...) with printk 



ACPI_DB_ERROR and ACPI_DB_WARN were removed from ACPICA core.
So replace ACPI_DEBUG_PRINT((ACPI_DB_ERROR, ...) with printk(KERN_ERR PREFIX ...)
and ACPI_DEBUG_PRINT((ACPI_DB_WARN, ...) with printk(KERN_WARNING PREFIX ...)

We do not use ACPI_ERROR/ACPI_WARNING since they're not exported, see
-------------------------------------------------------------
commit 6468463a
Author: Len Brown <len.brown@intel.com>
Date:   Mon Jun 26 23:41:38 2006 -0400

    ACPI: un-export ACPI_ERROR() -- use printk(KERN_ERR...)

    Signed-off-by: default avatarLen Brown <len.brown@intel.com>
-------------------------------------------------------------

Signed-off-by: default avatarLin Ming <ming.m.lin@intel.com>
Signed-off-by: default avatarLen Brown <len.brown@intel.com>
parent 8bd108d1

drivers/acpi/acpi_memhotplug.c

+2 −2
Original line number Diff line number Diff line
@@ -454,8 +454,8 @@ static int acpi_memory_device_start (struct acpi_device *device) 
		/* call add_memory func */

		result = acpi_memory_enable_device(mem_device);

		if (result)

			ACPI_DEBUG_PRINT((ACPI_DB_ERROR,

				"Error in acpi_memory_enable_device\n"));

			printk(KERN_ERR PREFIX

				"Error in acpi_memory_enable_device\n");

	}

	return result;

}

drivers/acpi/cm_sbs.c

+4 −4
Original line number Diff line number Diff line
@@ -52,8 +52,8 @@ struct proc_dir_entry *acpi_lock_ac_dir(void) 
	if (acpi_ac_dir) {

		lock_ac_dir_cnt++;

	} else {

		ACPI_DEBUG_PRINT((ACPI_DB_ERROR,

				  "Cannot create %s\n", ACPI_AC_CLASS));

		printk(KERN_ERR PREFIX

				  "Cannot create %s\n", ACPI_AC_CLASS);

	}

	mutex_unlock(&cm_sbs_mutex);

	return acpi_ac_dir;
@@ -83,8 +83,8 @@ struct proc_dir_entry *acpi_lock_battery_dir(void) 
	if (acpi_battery_dir) {

		lock_battery_dir_cnt++;

	} else {

		ACPI_DEBUG_PRINT((ACPI_DB_ERROR,

				  "Cannot create %s\n", ACPI_BATTERY_CLASS));

		printk(KERN_ERR PREFIX

				  "Cannot create %s\n", ACPI_BATTERY_CLASS);

	}

	mutex_unlock(&cm_sbs_mutex);

	return acpi_battery_dir;

drivers/acpi/fan.c

+2 −2
Original line number Diff line number Diff line
@@ -327,8 +327,8 @@ static int acpi_fan_resume(struct acpi_device *device) 


	result = acpi_bus_get_power(device->handle, &power_state);

	if (result) {

		ACPI_DEBUG_PRINT((ACPI_DB_ERROR,

				  "Error reading fan power state\n"));

		printk(KERN_ERR PREFIX

				  "Error reading fan power state\n");

		return result;

	}

drivers/acpi/osl.c

+2 −2
Original line number Diff line number Diff line
@@ -729,8 +729,8 @@ acpi_status acpi_os_execute(acpi_execute_type type, 
	INIT_WORK(&dpc->work, acpi_os_execute_deferred);

	queue = (type == OSL_NOTIFY_HANDLER) ? kacpi_notify_wq : kacpid_wq;

	if (!queue_work(queue, &dpc->work)) {

		ACPI_DEBUG_PRINT((ACPI_DB_ERROR,

			  "Call to queue_work() failed.\n"));

		printk(KERN_ERR PREFIX

			  "Call to queue_work() failed.\n");

		status = AE_ERROR;

		kfree(dpc);

	}

drivers/acpi/processor_perflib.c

+5 −5
Original line number Diff line number Diff line
@@ -524,13 +524,13 @@ static int acpi_processor_get_psd(struct acpi_processor *pr) 


	psd = buffer.pointer;

	if (!psd || (psd->type != ACPI_TYPE_PACKAGE)) {

		ACPI_DEBUG_PRINT((ACPI_DB_ERROR, "Invalid _PSD data\n"));

		printk(KERN_ERR PREFIX "Invalid _PSD data\n");

		result = -EFAULT;

		goto end;

	}



	if (psd->package.count != 1) {

		ACPI_DEBUG_PRINT((ACPI_DB_ERROR, "Invalid _PSD data\n"));

		printk(KERN_ERR PREFIX "Invalid _PSD data\n");

		result = -EFAULT;

		goto end;

	}
@@ -543,19 +543,19 @@ static int acpi_processor_get_psd(struct acpi_processor *pr) 
	status = acpi_extract_package(&(psd->package.elements[0]),

		&format, &state);

	if (ACPI_FAILURE(status)) {

		ACPI_DEBUG_PRINT((ACPI_DB_ERROR, "Invalid _PSD data\n"));

		printk(KERN_ERR PREFIX "Invalid _PSD data\n");

		result = -EFAULT;

		goto end;

	}



	if (pdomain->num_entries != ACPI_PSD_REV0_ENTRIES) {

		ACPI_DEBUG_PRINT((ACPI_DB_ERROR, "Unknown _PSD:num_entries\n"));

		printk(KERN_ERR PREFIX "Unknown _PSD:num_entries\n");

		result = -EFAULT;

		goto end;

	}



	if (pdomain->revision != ACPI_PSD_REV0_REVISION) {

		ACPI_DEBUG_PRINT((ACPI_DB_ERROR, "Unknown _PSD:revision\n"));

		printk(KERN_ERR PREFIX "Unknown _PSD:revision\n");

		result = -EFAULT;

		goto end;

	}