ACPI: un-export ACPI_WARNING() -- use printk(KERN_WARNING...) (cece9296) · Commits · e / devices / android_kernel_teracube_emerald

drivers/acpi/bus.c

+6 −6

Original line number	Original line	Diff line number	Diff line
	@@ -214,13 +214,13 @@ int acpi_bus_set_power(acpi_handle handle, int state)
	}		}
	}		}
	if (!device->power.states[state].flags.valid) {		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);		return_VALUE(-ENODEV);
	}		}
	if (device->parent && (state < device->parent->power.state)) {		if (device->parent && (state < device->parent->power.state)) {
	ACPI_WARNING((AE_INFO,		printk(KERN_WARNING PREFIX
	"Cannot set device to a higher-powered"		"Cannot set device to a higher-powered"
	" state than parent"));		" state than parent\n");
	return_VALUE(-ENODEV);		return_VALUE(-ENODEV);
	}		}

	@@ -263,9 +263,9 @@ int acpi_bus_set_power(acpi_handle handle, int state)

	end:		end:
	if (result)		if (result)
	ACPI_WARNING((AE_INFO,		printk(KERN_WARNING PREFIX
	"Transitioning device [%s] to D%d",		"Transitioning device [%s] to D%d\n",
	device->pnp.bus_id, state));		device->pnp.bus_id, state);
	else		else
	ACPI_DEBUG_PRINT((ACPI_DB_INFO,		ACPI_DEBUG_PRINT((ACPI_DB_INFO,
	"Device [%s] transitioned to D%d\n",		"Device [%s] transitioned to D%d\n",

drivers/acpi/hotkey.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -983,7 +983,7 @@ static ssize_t hotkey_execute_aml_method(struct file *file,

	}		}
	} else {		} else {
	ACPI_WARNING((AE_INFO, "Not supported"));		printk(KERN_WARNING "Not supported\n");
	return_VALUE(-EINVAL);		return_VALUE(-EINVAL);
	}		}
	return_VALUE(count);		return_VALUE(count);

drivers/acpi/pci_irq.c

+4 −4

Original line number	Original line	Diff line number	Diff line
	@@ -269,8 +269,8 @@ acpi_pci_allocate_irq(struct acpi_prt_entry *entry,
	entry->link.index, triggering,		entry->link.index, triggering,
	polarity, link);		polarity, link);
	if (irq < 0) {		if (irq < 0) {
	ACPI_WARNING((AE_INFO,		printk(KERN_WARNING PREFIX
	"Invalid IRQ link routing entry"));		"Invalid IRQ link routing entry\n");
	return_VALUE(-1);		return_VALUE(-1);
	}		}
	} else {		} else {
	@@ -379,8 +379,8 @@ acpi_pci_irq_derive(struct pci_dev *dev,
	}		}

	if (irq < 0) {		if (irq < 0) {
	ACPI_WARNING((AE_INFO, "Unable to derive IRQ for device %s",		printk(KERN_WARNING PREFIX "Unable to derive IRQ for device %s\n",
	pci_name(dev)));		pci_name(dev));
	return_VALUE(-1);		return_VALUE(-1);
	}		}

drivers/acpi/pci_link.c

+17 −17

Original line number	Original line	Diff line number	Diff line
	@@ -116,15 +116,15 @@ acpi_pci_link_check_possible(struct acpi_resource resource, void context)
	{		{
	struct acpi_resource_irq *p = &resource->data.irq;		struct acpi_resource_irq *p = &resource->data.irq;
	if (!p \|\| !p->interrupt_count) {		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);		return_ACPI_STATUS(AE_OK);
	}		}
	for (i = 0;		for (i = 0;
	(i < p->interrupt_count		(i < p->interrupt_count
	&& i < ACPI_PCI_LINK_MAX_POSSIBLE); i++) {		&& i < ACPI_PCI_LINK_MAX_POSSIBLE); i++) {
	if (!p->interrupts[i]) {		if (!p->interrupts[i]) {
	ACPI_WARNING((AE_INFO, "Invalid IRQ %d",		printk(KERN_WARNING PREFIX "Invalid IRQ %d\n",
	p->interrupts[i]));		p->interrupts[i]);
	continue;		continue;
	}		}
	link->irq.possible[i] = p->interrupts[i];		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 =		struct acpi_resource_extended_irq *p =
	&resource->data.extended_irq;		&resource->data.extended_irq;
	if (!p \|\| !p->interrupt_count) {		if (!p \|\| !p->interrupt_count) {
	ACPI_WARNING((AE_INFO,		printk(KERN_WARNING PREFIX
	"Blank EXT IRQ resource"));		"Blank EXT IRQ resource\n");
	return_ACPI_STATUS(AE_OK);		return_ACPI_STATUS(AE_OK);
	}		}
	for (i = 0;		for (i = 0;
	(i < p->interrupt_count		(i < p->interrupt_count
	&& i < ACPI_PCI_LINK_MAX_POSSIBLE); i++) {		&& i < ACPI_PCI_LINK_MAX_POSSIBLE); i++) {
	if (!p->interrupts[i]) {		if (!p->interrupts[i]) {
	ACPI_WARNING((AE_INFO, "Invalid IRQ %d",		printk(KERN_WARNING PREFIX "Invalid IRQ %d\n",
	p->interrupts[i]));		p->interrupts[i]);
	continue;		continue;
	}		}
	link->irq.possible[i] = p->interrupts[i];		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		* extended IRQ descriptors must
	* return at least 1 IRQ		* return at least 1 IRQ
	*/		*/
	ACPI_WARNING((AE_INFO,		printk(KERN_WARNING PREFIX
	"Blank EXT IRQ resource"));		"Blank EXT IRQ resource\n");
	return_ACPI_STATUS(AE_OK);		return_ACPI_STATUS(AE_OK);
	}		}
	*irq = p->interrupts[0];		*irq = p->interrupts[0];
	@@ -381,10 +381,10 @@ static int acpi_pci_link_set(struct acpi_pci_link *link, int irq)
	goto end;		goto end;
	}		}
	if (!link->device->status.enabled) {		if (!link->device->status.enabled) {
	ACPI_WARNING((AE_INFO,		printk(KERN_WARNING PREFIX
	"%s [%s] disabled and referenced, BIOS bug",		"%s [%s] disabled and referenced, BIOS bug\n",
	acpi_device_name(link->device),		acpi_device_name(link->device),
	acpi_device_bid(link->device)));		acpi_device_bid(link->device));
	}		}

	/* Query _CRS, set link->irq.active */		/* 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		* policy: when _CRS doesn't return what we just _SRS
	* assume _SRS worked and override _CRS value.		* assume _SRS worked and override _CRS value.
	*/		*/
	ACPI_WARNING((AE_INFO,		printk(KERN_WARNING PREFIX
	"%s [%s] BIOS reported IRQ %d, using IRQ %d",		"%s [%s] BIOS reported IRQ %d, using IRQ %d\n",
	acpi_device_name(link->device),		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;		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 (i == link->irq.possible_count) {
	if (acpi_strict)		if (acpi_strict)
	ACPI_WARNING((AE_INFO, "_CRS %d not found"		printk(KERN_WARNING PREFIX "_CRS %d not found"
	" in _PRS", link->irq.active));		" in _PRS\n", link->irq.active);
	link->irq.active = 0;		link->irq.active = 0;
	}		}

drivers/acpi/power.c

+3 −3

Original line number	Original line	Diff line number	Diff line
	@@ -105,7 +105,7 @@ acpi_power_get_context(acpi_handle handle,

	result = acpi_bus_get_device(handle, &device);		result = acpi_bus_get_device(handle, &device);
	if (result) {		if (result) {
	ACPI_WARNING((AE_INFO, "Getting context [%p]", handle));		printk(KERN_WARNING PREFIX "Getting context [%p]\n", handle);
	return_VALUE(result);		return_VALUE(result);
	}		}

	@@ -441,8 +441,8 @@ int acpi_power_transition(struct acpi_device *device, int state)
	device->power.state = state;		device->power.state = state;
	end:		end:
	if (result)		if (result)
	ACPI_WARNING((AE_INFO, "Transitioning device [%s] to D%d",		printk(KERN_WARNING PREFIX "Transitioning device [%s] to D%d\n",
	device->pnp.bus_id, state));		device->pnp.bus_id, state);

	return_VALUE(result);		return_VALUE(result);
	}		}