Commit 603fadf3 authored by Bjorn Helgaas's avatar Bjorn Helgaas Committed by Rafael J. Wysocki
Browse files

ACPI: Fix comment typos 



Fix some misspellings in comments.  No functional change intended.

Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent 8c2ffd91

drivers/acpi/acpi_dbg.c

+1 −1
Original line number Diff line number Diff line
@@ -390,7 +390,7 @@ again: 
	return size > 0 ? size : ret;

}



static int acpi_aml_thread(void *unsed)

static int acpi_aml_thread(void *unused)

{

	acpi_osd_exec_callback function = NULL;

	void *context;

drivers/acpi/acpi_lpat.c

+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ 
 * LPAT conversion table

 *

 * @lpat_table: the temperature_raw mapping table structure

 * @raw: the raw value, used as a key to get the temerature from the

 * @raw: the raw value, used as a key to get the temperature from the

 *       above mapping table

 *

 * A positive converted temperature value will be returned on success,

drivers/acpi/cppc_acpi.c

+17 −17
Original line number Diff line number Diff line
@@ -81,9 +81,9 @@ struct cppc_pcc_data { 
	int refcount;

};



/* Array  to represent the PCC channel per subspace id */

/* Array to represent the PCC channel per subspace ID */

static struct cppc_pcc_data *pcc_data[MAX_PCC_SUBSPACES];

/* The cpu_pcc_subspace_idx containsper CPU subspace id */

/* The cpu_pcc_subspace_idx contains per CPU subspace ID */

static DEFINE_PER_CPU(int, cpu_pcc_subspace_idx);



/*
@@ -436,7 +436,7 @@ int acpi_get_psd_map(struct cppc_cpudata **all_cpu_data) 
		return -ENOMEM;



	/*

	 * Now that we have _PSD data from all CPUs, lets setup P-state

	 * Now that we have _PSD data from all CPUs, let's setup P-state

	 * domain info.

	 */

	for_each_possible_cpu(i) {
@@ -588,7 +588,7 @@ static int register_pcc_channel(int pcc_ss_idx) 
			return -ENOMEM;

		}



		/* Set flag so that we dont come here for each CPU. */

		/* Set flag so that we don't come here for each CPU. */

		pcc_data[pcc_ss_idx]->pcc_channel_acquired = true;

	}
@@ -613,7 +613,7 @@ bool __weak cpc_ffh_supported(void) 
 *

 * Check and allocate the cppc_pcc_data memory.

 * In some processor configurations it is possible that same subspace

 * is shared between multiple CPU's. This is seen especially in CPU's

 * is shared between multiple CPUs. This is seen especially in CPUs

 * with hardware multi-threading support.

 *

 * Return: 0 for success, errno for failure
@@ -711,7 +711,7 @@ static bool is_cppc_supported(int revision, int num_ent) 


/**

 * acpi_cppc_processor_probe - Search for per CPU _CPC objects.

 * @pr: Ptr to acpi_processor containing this CPUs logical Id.

 * @pr: Ptr to acpi_processor containing this CPU's logical ID.

 *

 *	Return: 0 for success or negative value for err.

 */
@@ -728,7 +728,7 @@ int acpi_cppc_processor_probe(struct acpi_processor *pr) 
	acpi_status status;

	int ret = -EFAULT;



	/* Parse the ACPI _CPC table for this cpu. */

	/* Parse the ACPI _CPC table for this CPU. */

	status = acpi_evaluate_object_typed(handle, "_CPC", NULL, &output,

			ACPI_TYPE_PACKAGE);

	if (ACPI_FAILURE(status)) {
@@ -840,7 +840,7 @@ int acpi_cppc_processor_probe(struct acpi_processor *pr) 
	if (ret)

		goto out_free;



	/* Register PCC channel once for all PCC subspace id. */

	/* Register PCC channel once for all PCC subspace ID. */

	if (pcc_subspace_id >= 0 && !pcc_data[pcc_subspace_id]->pcc_channel_acquired) {

		ret = register_pcc_channel(pcc_subspace_id);

		if (ret)
@@ -860,7 +860,7 @@ int acpi_cppc_processor_probe(struct acpi_processor *pr) 
		goto out_free;

	}



	/* Plug PSD data into this CPUs CPC descriptor. */

	/* Plug PSD data into this CPU's CPC descriptor. */

	per_cpu(cpc_desc_ptr, pr->id) = cpc_ptr;



	ret = kobject_init_and_add(&cpc_ptr->kobj, &cppc_ktype, &cpu_dev->kobj,
@@ -891,7 +891,7 @@ EXPORT_SYMBOL_GPL(acpi_cppc_processor_probe); 


/**

 * acpi_cppc_processor_exit - Cleanup CPC structs.

 * @pr: Ptr to acpi_processor containing this CPUs logical Id.

 * @pr: Ptr to acpi_processor containing this CPU's logical ID.

 *

 * Return: Void

 */
@@ -931,7 +931,7 @@ EXPORT_SYMBOL_GPL(acpi_cppc_processor_exit); 


/**

 * cpc_read_ffh() - Read FFH register

 * @cpunum:	cpu number to read

 * @cpunum:	CPU number to read

 * @reg:	cppc register information

 * @val:	place holder for return value

 *
@@ -946,7 +946,7 @@ int __weak cpc_read_ffh(int cpunum, struct cpc_reg *reg, u64 *val) 


/**

 * cpc_write_ffh() - Write FFH register

 * @cpunum:	cpu number to write

 * @cpunum:	CPU number to write

 * @reg:	cppc register information

 * @val:	value to write

 *
@@ -1093,7 +1093,7 @@ int cppc_get_desired_perf(int cpunum, u64 *desired_perf) 
EXPORT_SYMBOL_GPL(cppc_get_desired_perf);



/**

 * cppc_get_perf_caps - Get a CPUs performance capabilities.

 * cppc_get_perf_caps - Get a CPU's performance capabilities.

 * @cpunum: CPU from which to get capabilities info.

 * @perf_caps: ptr to cppc_perf_caps. See cppc_acpi.h

 *
@@ -1178,7 +1178,7 @@ out_err: 
EXPORT_SYMBOL_GPL(cppc_get_perf_caps);



/**

 * cppc_get_perf_ctrs - Read a CPUs performance feedback counters.

 * cppc_get_perf_ctrs - Read a CPU's performance feedback counters.

 * @cpunum: CPU from which to read counters.

 * @perf_fb_ctrs: ptr to cppc_perf_fb_ctrs. See cppc_acpi.h

 *
@@ -1205,7 +1205,7 @@ int cppc_get_perf_ctrs(int cpunum, struct cppc_perf_fb_ctrs *perf_fb_ctrs) 
	ctr_wrap_reg = &cpc_desc->cpc_regs[CTR_WRAP_TIME];



	/*

	 * If refernce perf register is not supported then we should

	 * If reference perf register is not supported then we should

	 * use the nominal perf value

	 */

	if (!CPC_SUPPORTED(ref_perf_reg))
@@ -1258,7 +1258,7 @@ out_err: 
EXPORT_SYMBOL_GPL(cppc_get_perf_ctrs);



/**

 * cppc_set_perf - Set a CPUs performance controls.

 * cppc_set_perf - Set a CPU's performance controls.

 * @cpu: CPU for which to set performance controls.

 * @perf_ctrls: ptr to cppc_perf_ctrls. See cppc_acpi.h

 *

drivers/acpi/power.c

+2 −2
Original line number Diff line number Diff line
@@ -535,12 +535,12 @@ int acpi_device_sleep_wake(struct acpi_device *dev, 
	/*

	 * Try to execute _DSW first.

	 *

	 * Three agruments are needed for the _DSW object:

	 * Three arguments are needed for the _DSW object:

	 * Argument 0: enable/disable the wake capabilities

	 * Argument 1: target system state

	 * Argument 2: target device state

	 * When _DSW object is called to disable the wake capabilities, maybe

	 * the first argument is filled. The values of the other two agruments

	 * the first argument is filled. The values of the other two arguments

	 * are meaningless.

	 */

	in_arg[0].type = ACPI_TYPE_INTEGER;

drivers/acpi/pptt.c

+24 −24
Original line number Diff line number Diff line
@@ -164,7 +164,7 @@ static struct acpi_pptt_cache *acpi_find_cache_level(struct acpi_table_header *t 
}



/**

 * acpi_count_levels() - Given a PPTT table, and a cpu node, count the caches

 * acpi_count_levels() - Given a PPTT table, and a CPU node, count the caches

 * @table_hdr: Pointer to the head of the PPTT table

 * @cpu_node: processor node we wish to count caches for

 *
@@ -235,7 +235,7 @@ static int acpi_pptt_leaf_node(struct acpi_table_header *table_hdr, 
/**

 * acpi_find_processor_node() - Given a PPTT table find the requested processor

 * @table_hdr:  Pointer to the head of the PPTT table

 * @acpi_cpu_id: cpu we are searching for

 * @acpi_cpu_id: CPU we are searching for

 *

 * Find the subtable entry describing the provided processor.

 * This is done by iterating the PPTT table looking for processor nodes
@@ -456,21 +456,21 @@ static struct acpi_pptt_processor *acpi_find_processor_package_id(struct acpi_ta 


static void acpi_pptt_warn_missing(void)

{

	pr_warn_once("No PPTT table found, cpu and cache topology may be inaccurate\n");

	pr_warn_once("No PPTT table found, CPU and cache topology may be inaccurate\n");

}



/**

 * topology_get_acpi_cpu_tag() - Find a unique topology value for a feature

 * @table: Pointer to the head of the PPTT table

 * @cpu: Kernel logical cpu number

 * @cpu: Kernel logical CPU number

 * @level: A level that terminates the search

 * @flag: A flag which terminates the search

 *

 * Get a unique value given a cpu, and a topology level, that can be

 * Get a unique value given a CPU, and a topology level, that can be

 * matched to determine which cpus share common topological features

 * at that level.

 *

 * Return: Unique value, or -ENOENT if unable to locate cpu

 * Return: Unique value, or -ENOENT if unable to locate CPU

 */

static int topology_get_acpi_cpu_tag(struct acpi_table_header *table,

				     unsigned int cpu, int level, int flag)
@@ -510,7 +510,7 @@ static int find_acpi_cpu_topology_tag(unsigned int cpu, int level, int flag) 
		return -ENOENT;

	}

	retval = topology_get_acpi_cpu_tag(table, cpu, level, flag);

	pr_debug("Topology Setup ACPI cpu %d, level %d ret = %d\n",

	pr_debug("Topology Setup ACPI CPU %d, level %d ret = %d\n",

		 cpu, level, retval);

	acpi_put_table(table);
@@ -519,9 +519,9 @@ static int find_acpi_cpu_topology_tag(unsigned int cpu, int level, int flag) 


/**

 * acpi_find_last_cache_level() - Determines the number of cache levels for a PE

 * @cpu: Kernel logical cpu number

 * @cpu: Kernel logical CPU number

 *

 * Given a logical cpu number, returns the number of levels of cache represented

 * Given a logical CPU number, returns the number of levels of cache represented

 * in the PPTT. Errors caused by lack of a PPTT table, or otherwise, return 0

 * indicating we didn't find any cache levels.

 *
@@ -534,7 +534,7 @@ int acpi_find_last_cache_level(unsigned int cpu) 
	int number_of_levels = 0;

	acpi_status status;



	pr_debug("Cache Setup find last level cpu=%d\n", cpu);

	pr_debug("Cache Setup find last level CPU=%d\n", cpu);



	acpi_cpu_id = get_acpi_id_for_cpu(cpu);

	status = acpi_get_table(ACPI_SIG_PPTT, 0, &table);
@@ -551,14 +551,14 @@ int acpi_find_last_cache_level(unsigned int cpu) 


/**

 * cache_setup_acpi() - Override CPU cache topology with data from the PPTT

 * @cpu: Kernel logical cpu number

 * @cpu: Kernel logical CPU number

 *

 * Updates the global cache info provided by cpu_get_cacheinfo()

 * when there are valid properties in the acpi_pptt_cache nodes. A

 * successful parse may not result in any updates if none of the

 * cache levels have any valid flags set.  Futher, a unique value is

 * cache levels have any valid flags set.  Further, a unique value is

 * associated with each known CPU cache entry. This unique value

 * can be used to determine whether caches are shared between cpus.

 * can be used to determine whether caches are shared between CPUs.

 *

 * Return: -ENOENT on failure to find table, or 0 on success

 */
@@ -567,7 +567,7 @@ int cache_setup_acpi(unsigned int cpu) 
	struct acpi_table_header *table;

	acpi_status status;



	pr_debug("Cache Setup ACPI cpu %d\n", cpu);

	pr_debug("Cache Setup ACPI CPU %d\n", cpu);



	status = acpi_get_table(ACPI_SIG_PPTT, 0, &table);

	if (ACPI_FAILURE(status)) {
@@ -582,8 +582,8 @@ int cache_setup_acpi(unsigned int cpu) 
}



/**

 * find_acpi_cpu_topology() - Determine a unique topology value for a given cpu

 * @cpu: Kernel logical cpu number

 * find_acpi_cpu_topology() - Determine a unique topology value for a given CPU

 * @cpu: Kernel logical CPU number

 * @level: The topological level for which we would like a unique ID

 *

 * Determine a topology unique ID for each thread/core/cluster/mc_grouping
@@ -596,7 +596,7 @@ int cache_setup_acpi(unsigned int cpu) 
 * other levels beyond this use a generated value to uniquely identify

 * a topological feature.

 *

 * Return: -ENOENT if the PPTT doesn't exist, or the cpu cannot be found.

 * Return: -ENOENT if the PPTT doesn't exist, or the CPU cannot be found.

 * Otherwise returns a value which represents a unique topological feature.

 */

int find_acpi_cpu_topology(unsigned int cpu, int level)
@@ -606,12 +606,12 @@ int find_acpi_cpu_topology(unsigned int cpu, int level) 


/**

 * find_acpi_cpu_cache_topology() - Determine a unique cache topology value

 * @cpu: Kernel logical cpu number

 * @cpu: Kernel logical CPU number

 * @level: The cache level for which we would like a unique ID

 *

 * Determine a unique ID for each unified cache in the system

 *

 * Return: -ENOENT if the PPTT doesn't exist, or the cpu cannot be found.

 * Return: -ENOENT if the PPTT doesn't exist, or the CPU cannot be found.

 * Otherwise returns a value which represents a unique topological feature.

 */

int find_acpi_cpu_cache_topology(unsigned int cpu, int level)
@@ -643,17 +643,17 @@ int find_acpi_cpu_cache_topology(unsigned int cpu, int level) 




/**

 * find_acpi_cpu_topology_package() - Determine a unique cpu package value

 * @cpu: Kernel logical cpu number

 * find_acpi_cpu_topology_package() - Determine a unique CPU package value

 * @cpu: Kernel logical CPU number

 *

 * Determine a topology unique package ID for the given cpu.

 * Determine a topology unique package ID for the given CPU.

 * This ID can then be used to group peers, which will have matching ids.

 *

 * The search terminates when either a level is found with the PHYSICAL_PACKAGE

 * flag set or we reach a root node.

 *

 * Return: -ENOENT if the PPTT doesn't exist, or the cpu cannot be found.

 * Otherwise returns a value which represents the package for this cpu.

 * Return: -ENOENT if the PPTT doesn't exist, or the CPU cannot be found.

 * Otherwise returns a value which represents the package for this CPU.

 */

int find_acpi_cpu_topology_package(unsigned int cpu)

{

CRA Git | Maintained and supported by SUSTech CRA and CCSE