Skip to content

L
linux
Commit cece9296 authored by Len Brown's avatar Len Brown
Browse files
Options

ACPI: un-export ACPI_WARNING() -- use printk(KERN_WARNING...) 

Signed-off-by: default avatarLen Brown <len.brown@intel.com>
parent 64dedfb8
Hide whitespace changes
Inline Side-by-side
Showing with 54 additions and 54 deletions
drivers/acpi/bus.c
View file @ cece9296
......@@ -214,13 +214,13 @@ int acpi_bus_set_power(acpi_handle handle, int state)
}
}
if (!device->power.states[state].flags.valid) {
ACPI_WARNING((AE_INFO, "Device does not support D%d", state));
printk(KERN_WARNING PREFIX "Device does not support D%d\n", state);
return_VALUE(-ENODEV);
}
if (device->parent && (state < device->parent->power.state)) {
ACPI_WARNING((AE_INFO,
printk(KERN_WARNING PREFIX
"Cannot set device to a higher-powered"
" state than parent"));
" state than parent\n");
return_VALUE(-ENODEV);
}
......@@ -263,9 +263,9 @@ int acpi_bus_set_power(acpi_handle handle, int state)
end:
if (result)
ACPI_WARNING((AE_INFO,
"Transitioning device [%s] to D%d",
device->pnp.bus_id, state));
printk(KERN_WARNING PREFIX
"Transitioning device [%s] to D%d\n",
device->pnp.bus_id, state);
else
ACPI_DEBUG_PRINT((ACPI_DB_INFO,
"Device [%s] transitioned to D%d\n",
......
drivers/acpi/hotkey.c
View file @ cece9296
......@@ -983,7 +983,7 @@ static ssize_t hotkey_execute_aml_method(struct file *file,
}
} else {
ACPI_WARNING((AE_INFO, "Not supported"));
printk(KERN_WARNING "Not supported\n");
return_VALUE(-EINVAL);
}
return_VALUE(count);
......
drivers/acpi/pci_irq.c
View file @ cece9296
......@@ -269,8 +269,8 @@ acpi_pci_allocate_irq(struct acpi_prt_entry *entry,
entry->link.index, triggering,
polarity, link);
if (irq < 0) {
ACPI_WARNING((AE_INFO,
"Invalid IRQ link routing entry"));
printk(KERN_WARNING PREFIX
"Invalid IRQ link routing entry\n");
return_VALUE(-1);
}
} else {
......@@ -379,8 +379,8 @@ acpi_pci_irq_derive(struct pci_dev *dev,
}
if (irq < 0) {
ACPI_WARNING((AE_INFO, "Unable to derive IRQ for device %s",
pci_name(dev)));
printk(KERN_WARNING PREFIX "Unable to derive IRQ for device %s\n",
pci_name(dev));
return_VALUE(-1);
}
......
drivers/acpi/pci_link.c
View file @ cece9296
......@@ -116,15 +116,15 @@ acpi_pci_link_check_possible(struct acpi_resource *resource, void *context)
{
struct acpi_resource_irq *p = &resource->data.irq;
if (!p || !p->interrupt_count) {
ACPI_WARNING((AE_INFO, "Blank IRQ resource"));
printk(KERN_WARNING PREFIX "Blank IRQ resource\n");
return_ACPI_STATUS(AE_OK);
}
for (i = 0;
(i < p->interrupt_count
&& i < ACPI_PCI_LINK_MAX_POSSIBLE); i++) {
if (!p->interrupts[i]) {
ACPI_WARNING((AE_INFO, "Invalid IRQ %d",
p->interrupts[i]));
printk(KERN_WARNING PREFIX "Invalid IRQ %d\n",
p->interrupts[i]);
continue;
}
link->irq.possible[i] = p->interrupts[i];
......@@ -140,16 +140,16 @@ acpi_pci_link_check_possible(struct acpi_resource *resource, void *context)
struct acpi_resource_extended_irq *p =
&resource->data.extended_irq;
if (!p || !p->interrupt_count) {
ACPI_WARNING((AE_INFO,
"Blank EXT IRQ resource"));
printk(KERN_WARNING PREFIX
"Blank EXT IRQ resource\n");
return_ACPI_STATUS(AE_OK);
}
for (i = 0;
(i < p->interrupt_count
&& i < ACPI_PCI_LINK_MAX_POSSIBLE); i++) {
if (!p->interrupts[i]) {
ACPI_WARNING((AE_INFO, "Invalid IRQ %d",
p->interrupts[i]));
printk(KERN_WARNING PREFIX "Invalid IRQ %d\n",
p->interrupts[i]);
continue;
}
link->irq.possible[i] = p->interrupts[i];
......@@ -223,8 +223,8 @@ acpi_pci_link_check_current(struct acpi_resource *resource, void *context)
* extended IRQ descriptors must
* return at least 1 IRQ
*/
ACPI_WARNING((AE_INFO,
"Blank EXT IRQ resource"));
printk(KERN_WARNING PREFIX
"Blank EXT IRQ resource\n");
return_ACPI_STATUS(AE_OK);
}
*irq = p->interrupts[0];
......@@ -381,10 +381,10 @@ static int acpi_pci_link_set(struct acpi_pci_link *link, int irq)
goto end;
}
if (!link->device->status.enabled) {
ACPI_WARNING((AE_INFO,
"%s [%s] disabled and referenced, BIOS bug",
printk(KERN_WARNING PREFIX
"%s [%s] disabled and referenced, BIOS bug\n",
acpi_device_name(link->device),
acpi_device_bid(link->device)));
acpi_device_bid(link->device));
}
/* Query _CRS, set link->irq.active */
......@@ -402,10 +402,10 @@ static int acpi_pci_link_set(struct acpi_pci_link *link, int irq)
* policy: when _CRS doesn't return what we just _SRS
* assume _SRS worked and override _CRS value.
*/
ACPI_WARNING((AE_INFO,
"%s [%s] BIOS reported IRQ %d, using IRQ %d",
printk(KERN_WARNING PREFIX
"%s [%s] BIOS reported IRQ %d, using IRQ %d\n",
acpi_device_name(link->device),
acpi_device_bid(link->device), link->irq.active, irq));
acpi_device_bid(link->device), link->irq.active, irq);
link->irq.active = irq;
}
......@@ -555,8 +555,8 @@ static int acpi_pci_link_allocate(struct acpi_pci_link *link)
*/
if (i == link->irq.possible_count) {
if (acpi_strict)
ACPI_WARNING((AE_INFO, "_CRS %d not found"
" in _PRS", link->irq.active));
printk(KERN_WARNING PREFIX "_CRS %d not found"
" in _PRS\n", link->irq.active);
link->irq.active = 0;
}
......
drivers/acpi/power.c
View file @ cece9296
......@@ -105,7 +105,7 @@ acpi_power_get_context(acpi_handle handle,
result = acpi_bus_get_device(handle, &device);
if (result) {
ACPI_WARNING((AE_INFO, "Getting context [%p]", handle));
printk(KERN_WARNING PREFIX "Getting context [%p]\n", handle);
return_VALUE(result);
}
......@@ -441,8 +441,8 @@ int acpi_power_transition(struct acpi_device *device, int state)
device->power.state = state;
end:
if (result)
ACPI_WARNING((AE_INFO, "Transitioning device [%s] to D%d",
device->pnp.bus_id, state));
printk(KERN_WARNING PREFIX "Transitioning device [%s] to D%d\n",
device->pnp.bus_id, state);
return_VALUE(result);
}
......
drivers/acpi/processor_throttling.c
View file @ cece9296
......@@ -196,7 +196,7 @@ int acpi_processor_get_throttling_info(struct acpi_processor *pr)
}
/* TBD: Support duty_cycle values that span bit 4. */
else if ((pr->throttling.duty_offset + pr->throttling.duty_width) > 4) {
ACPI_WARNING((AE_INFO, "duty_cycle spans bit 4"));
printk(KERN_WARNING PREFIX "duty_cycle spans bit 4\n");
return_VALUE(0);
}
......
drivers/acpi/thermal.c
View file @ cece9296
......@@ -384,7 +384,7 @@ static int acpi_thermal_get_trip_points(struct acpi_thermal *tz)
tz->trips.passive.flags.valid = 0;
if (!tz->trips.passive.flags.valid)
ACPI_WARNING((AE_INFO, "Invalid passive threshold"));
printk(KERN_WARNING PREFIX "Invalid passive threshold\n");
else
ACPI_DEBUG_PRINT((ACPI_DB_INFO,
"Found passive threshold [%lu]\n",
......@@ -469,7 +469,7 @@ static int acpi_thermal_critical(struct acpi_thermal *tz)
return_VALUE(-EINVAL);
if (tz->temperature >= tz->trips.critical.temperature) {
ACPI_WARNING((AE_INFO, "Critical trip point"));
printk(KERN_WARNING PREFIX "Critical trip point\n");
tz->trips.critical.flags.enabled = 1;
} else if (tz->trips.critical.flags.enabled)
tz->trips.critical.flags.enabled = 0;
......@@ -500,7 +500,7 @@ static int acpi_thermal_hot(struct acpi_thermal *tz)
return_VALUE(-EINVAL);
if (tz->temperature >= tz->trips.hot.temperature) {
ACPI_WARNING((AE_INFO, "Hot trip point"));
printk(KERN_WARNING PREFIX "Hot trip point\n");
tz->trips.hot.flags.enabled = 1;
} else if (tz->trips.hot.flags.enabled)
tz->trips.hot.flags.enabled = 0;
......@@ -640,10 +640,10 @@ static void acpi_thermal_active(struct acpi_thermal *tz)
handles[j],
ACPI_STATE_D0);
if (result) {
ACPI_WARNING((AE_INFO,
"Unable to turn cooling device [%p] 'on'",
printk(KERN_WARNING PREFIX
"Unable to turn cooling device [%p] 'on'\n",
active->devices.
handles[j]));
handles[j]);
continue;
}
active->flags.enabled = 1;
......@@ -665,9 +665,9 @@ static void acpi_thermal_active(struct acpi_thermal *tz)
result = acpi_bus_set_power(active->devices.handles[j],
ACPI_STATE_D3);
if (result) {
ACPI_WARNING((AE_INFO,
"Unable to turn cooling device [%p] 'off'",
active->devices.handles[j]));
printk(KERN_WARNING PREFIX
"Unable to turn cooling device [%p] 'off'\n",
active->devices.handles[j]);
continue;
}
active->flags.enabled = 0;
......
drivers/acpi/utilities/utmisc.c
View file @ cece9296
......@@ -978,7 +978,7 @@ acpi_ut_warning(char *module_name, u32 line_number, char *format, ...)
acpi_os_vprintf(format, args);
acpi_os_printf(" [%X]\n", ACPI_CA_VERSION);
}
EXPORT_SYMBOL(acpi_ut_warning);
void ACPI_INTERNAL_VAR_XFACE
acpi_ut_info(char *module_name, u32 line_number, char *format, ...)
{
......
drivers/acpi/utils.c
View file @ cece9296
......@@ -62,25 +62,25 @@ acpi_extract_package(union acpi_object *package,
if (!package || (package->type != ACPI_TYPE_PACKAGE)
|| (package->package.count < 1)) {
ACPI_WARNING((AE_INFO, "Invalid package argument"));
printk(KERN_WARNING PREFIX "Invalid package argument\n");
return_ACPI_STATUS(AE_BAD_PARAMETER);
}
if (!format || !format->pointer || (format->length < 1)) {
ACPI_WARNING((AE_INFO, "Invalid format argument"));
printk(KERN_WARNING PREFIX "Invalid format argument\n");
return_ACPI_STATUS(AE_BAD_PARAMETER);
}
if (!buffer) {
ACPI_WARNING((AE_INFO, "Invalid buffer argument"));
printk(KERN_WARNING PREFIX "Invalid buffer argument\n");
return_ACPI_STATUS(AE_BAD_PARAMETER);
}
format_count = (format->length / sizeof(char)) - 1;
if (format_count > package->package.count) {
ACPI_WARNING((AE_INFO, "Format specifies more objects [%d]"
" than exist in package [%d].",
format_count, package->package.count));
printk(KERN_WARNING PREFIX "Format specifies more objects [%d]"
" than exist in package [%d].\n",
format_count, package->package.count);
return_ACPI_STATUS(AE_BAD_DATA);
}
......@@ -112,10 +112,10 @@ acpi_extract_package(union acpi_object *package,
tail_offset += sizeof(char *);
break;
default:
ACPI_WARNING((AE_INFO, "Invalid package element"
printk(KERN_WARNING PREFIX "Invalid package element"
" [%d]: got number, expecing"
" [%c]",
i, format_string[i]));
" [%c]\n",
i, format_string[i]);
return_ACPI_STATUS(AE_BAD_DATA);
break;
}
......@@ -138,10 +138,10 @@ acpi_extract_package(union acpi_object *package,
tail_offset += sizeof(u8 *);
break;
default:
ACPI_WARNING((AE_INFO, "Invalid package element"
printk(KERN_WARNING PREFIX "Invalid package element"
" [%d] got string/buffer,"
" expecing [%c]",
i, format_string[i]));
" expecing [%c]\n",
i, format_string[i]);
return_ACPI_STATUS(AE_BAD_DATA);
break;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7