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

Commit b6ec26fb authored by Sudeep Holla's avatar Sudeep Holla Committed by Rafael J. Wysocki
Browse files

ACPI / processor_idle: replace PREFIX with pr_fmt 



Like few of the other ACPI modules, replace PREFIX with pr_fmt and
change all the printk call sites to use pr_* companion functions
in processor_idle.

Signed-off-by: default avatarSudeep Holla <sudeep.holla@arm.com>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent 18558cae

drivers/acpi/processor_idle.c

+11 −14
Original line number Original line Diff line number Diff line
@@ -23,6 +23,7 @@ 
 *

 *

 * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

 * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

 */

 */

#define pr_fmt(fmt) "ACPI: " fmt





#include <linux/module.h>

#include <linux/module.h>

#include <linux/acpi.h>

#include <linux/acpi.h>
@@ -43,8 +44,6 @@ 
#include <asm/apic.h>

#include <asm/apic.h>

#endif

#endif





#define PREFIX "ACPI: "



#define ACPI_PROCESSOR_CLASS            "processor"

#define ACPI_PROCESSOR_CLASS            "processor"

#define _COMPONENT              ACPI_PROCESSOR_COMPONENT

#define _COMPONENT              ACPI_PROCESSOR_COMPONENT

ACPI_MODULE_NAME("processor_idle");

ACPI_MODULE_NAME("processor_idle");
@@ -81,7 +80,7 @@ static int set_max_cstate(const struct dmi_system_id *id) 
	if (max_cstate > ACPI_PROCESSOR_MAX_POWER)

	if (max_cstate > ACPI_PROCESSOR_MAX_POWER)

		return 0;

		return 0;





	printk(KERN_NOTICE PREFIX "%s detected - limiting to C%ld max_cstate."

	pr_notice("%s detected - limiting to C%ld max_cstate."

		  " Override with \"processor.max_cstate=%d\"\n", id->ident,

		  " Override with \"processor.max_cstate=%d\"\n", id->ident,

		  (long)id->driver_data, ACPI_PROCESSOR_MAX_POWER + 1);

		  (long)id->driver_data, ACPI_PROCESSOR_MAX_POWER + 1);
@@ -351,7 +350,7 @@ static int acpi_processor_get_power_info_cst(struct acpi_processor *pr) 




	/* There must be at least 2 elements */

	/* There must be at least 2 elements */

	if (!cst || (cst->type != ACPI_TYPE_PACKAGE) || cst->package.count < 2) {

	if (!cst || (cst->type != ACPI_TYPE_PACKAGE) || cst->package.count < 2) {

		printk(KERN_ERR PREFIX "not enough elements in _CST\n");

		pr_err("not enough elements in _CST\n");

		ret = -EFAULT;

		ret = -EFAULT;

		goto end;

		goto end;

	}

	}
@@ -360,7 +359,7 @@ static int acpi_processor_get_power_info_cst(struct acpi_processor *pr) 




	/* Validate number of power states. */

	/* Validate number of power states. */

	if (count < 1 || count != cst->package.count - 1) {

	if (count < 1 || count != cst->package.count - 1) {

		printk(KERN_ERR PREFIX "count given by _CST is not valid\n");

		pr_err("count given by _CST is not valid\n");

		ret = -EFAULT;

		ret = -EFAULT;

		goto end;

		goto end;

	}

	}
@@ -469,11 +468,9 @@ static int acpi_processor_get_power_info_cst(struct acpi_processor *pr) 
		 * (From 1 through ACPI_PROCESSOR_MAX_POWER - 1)

		 * (From 1 through ACPI_PROCESSOR_MAX_POWER - 1)

		 */

		 */

		if (current_count >= (ACPI_PROCESSOR_MAX_POWER - 1)) {

		if (current_count >= (ACPI_PROCESSOR_MAX_POWER - 1)) {

			printk(KERN_WARNING

			pr_warn("Limiting number of power states to max (%d)\n",

			       "Limiting number of power states to max (%d)\n",

				ACPI_PROCESSOR_MAX_POWER);

				ACPI_PROCESSOR_MAX_POWER);

			printk(KERN_WARNING

			pr_warn("Please increase ACPI_PROCESSOR_MAX_POWER if needed.\n");

			       "Please increase ACPI_PROCESSOR_MAX_POWER if needed.\n");

			break;

			break;

		}

		}

	}

	}
@@ -1097,7 +1094,7 @@ int acpi_processor_power_init(struct acpi_processor *pr) 
			retval = cpuidle_register_driver(&acpi_idle_driver);

			retval = cpuidle_register_driver(&acpi_idle_driver);

			if (retval)

			if (retval)

				return retval;

				return retval;

			printk(KERN_DEBUG "ACPI: %s registered with cpuidle\n",

			pr_debug("%s registered with cpuidle\n",

				 acpi_idle_driver.name);

				 acpi_idle_driver.name);

		}

		}