---

yaml
---
r: 31433
b: refs/heads/master
c: 6468463
h: refs/heads/master
i:
  31431: efac34a
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cece92969762b8ed7930d4e23008b76b06411dee
+refs/heads/master: 6468463abd7051fcc29f3ee7c931f9bbbb26f5a4

trunk/drivers/acpi/acpi_memhotplug.c

@@ -187,7 +187,7 @@ static int acpi_memory_enable_device(struct acpi_memory_device *mem_device)
 	/* Get the range from the _CRS */
 	result = acpi_memory_get_device_resources(mem_device);
 	if (result) {
-		ACPI_ERROR((AE_INFO, "get_device_resources failed"));
+		printk(KERN_ERR PREFIX "get_device_resources failed\n");
 		mem_device->state = MEMORY_INVALID_STATE;
 		return result;
 	}
@@ -198,7 +198,7 @@ static int acpi_memory_enable_device(struct acpi_memory_device *mem_device)
 	 */
 	result = add_memory(mem_device->start_addr, mem_device->length);
 	if (result) {
-		ACPI_ERROR((AE_INFO, "add_memory failed"));
+		printk(KERN_ERR PREFIX "add_memory failed\n");
 		mem_device->state = MEMORY_INVALID_STATE;
 		return result;
 	}
@@ -286,27 +286,27 @@ static void acpi_memory_device_notify(acpi_handle handle, u32 event, void *data)
 			ACPI_DEBUG_PRINT((ACPI_DB_INFO,
 					  "\nReceived DEVICE CHECK notification for device\n"));
 		if (acpi_memory_get_device(handle, &mem_device)) {
-			ACPI_ERROR((AE_INFO, "Cannot find driver data"));
+			printk(KERN_ERR PREFIX "Cannot find driver data\n");
 			return_VOID;
 		}
 
 		if (!acpi_memory_check_device(mem_device)) {
 			if (acpi_memory_enable_device(mem_device))
-				ACPI_ERROR((AE_INFO,
-					    "Cannot enable memory device"));
+				printk(KERN_ERR PREFIX
+					    "Cannot enable memory device\n");
 		}
 		break;
 	case ACPI_NOTIFY_EJECT_REQUEST:
 		ACPI_DEBUG_PRINT((ACPI_DB_INFO,
 				  "\nReceived EJECT REQUEST notification for device\n"));
 
 		if (acpi_bus_get_device(handle, &device)) {
-			ACPI_ERROR((AE_INFO, "Device doesn't exist"));
+			printk(KERN_ERR PREFIX "Device doesn't exist\n");
 			break;
 		}
 		mem_device = acpi_driver_data(device);
 		if (!mem_device) {
-			ACPI_ERROR((AE_INFO, "Driver Data is NULL"));
+			printk(KERN_ERR PREFIX "Driver Data is NULL\n");
 			break;
 		}
 
@@ -317,8 +317,8 @@ static void acpi_memory_device_notify(acpi_handle handle, u32 event, void *data)
 		 *      with generic sysfs driver
 		 */
 		if (acpi_memory_disable_device(mem_device))
-			ACPI_ERROR((AE_INFO,
-				    "Disable memory device\n"));
+			printk(KERN_ERR PREFIX
+				    "Disable memory device\n");
 		/*
 		 * TBD: Invoke acpi_bus_remove to cleanup data structures
 		 */

trunk/drivers/acpi/button.c

@@ -345,8 +345,8 @@ static int acpi_button_add(struct acpi_device *device)
 		sprintf(acpi_device_class(device), "%s/%s",
 			ACPI_BUTTON_CLASS, ACPI_BUTTON_SUBCLASS_LID);
 	} else {
-		ACPI_ERROR((AE_INFO, "Unsupported hid [%s]",
-			    acpi_device_hid(device)));
+		printk(KERN_ERR PREFIX "Unsupported hid [%s]\n",
+			    acpi_device_hid(device));
 		result = -ENODEV;
 		goto end;
 	}

trunk/drivers/acpi/container.c

@@ -94,7 +94,7 @@ static int acpi_container_add(struct acpi_device *device)
 	ACPI_FUNCTION_TRACE("acpi_container_add");
 
 	if (!device) {
-		ACPI_ERROR((AE_INFO, "device is NULL"));
+		printk(KERN_ERR PREFIX "device is NULL\n");
 		return_VALUE(-EINVAL);
 	}
 

trunk/drivers/acpi/ec.c

@@ -1107,7 +1107,7 @@ static int acpi_ec_intr_add(struct acpi_device *device)
 	    acpi_evaluate_integer(ec->common.handle, "_GPE", NULL,
 				  &ec->common.gpe_bit);
 	if (ACPI_FAILURE(status)) {
-		ACPI_ERROR((AE_INFO, "Obtaining GPE bit assignment"));
+		printk(KERN_ERR PREFIX "Obtaining GPE bit assignment\n");
 		result = -ENODEV;
 		goto end;
 	}
@@ -1201,7 +1201,7 @@ static int acpi_ec_start(struct acpi_device *device)
 				     acpi_ec_io_ports, ec);
 	if (ACPI_FAILURE(status)
 	    || ec->common.command_addr.register_bit_width == 0) {
-		ACPI_ERROR((AE_INFO, "Error getting I/O port addresses"));
+		printk(KERN_ERR PREFIX "Error getting I/O port addresses\n");
 		return_VALUE(-ENODEV);
 	}
 

trunk/drivers/acpi/fan.c

@@ -203,7 +203,7 @@ static int acpi_fan_add(struct acpi_device *device)
 
 	result = acpi_bus_get_power(fan->handle, &state);
 	if (result) {
-		ACPI_ERROR((AE_INFO, "Reading power state"));
+		printk(KERN_ERR PREFIX "Reading power state\n");
 		goto end;
 	}
 

trunk/drivers/acpi/hotkey.c

@@ -768,7 +768,7 @@ static ssize_t hotkey_write_config(struct file *file,
 
 	if (copy_from_user(config_record, buffer, count)) {
 		kfree(config_record);
-		ACPI_ERROR((AE_INFO, "Invalid data"));
+		printk(KERN_ERR PREFIX "Invalid data\n");
 		return_VALUE(-EINVAL);
 	}
 	config_record[count] = 0;
@@ -789,7 +789,7 @@ static ssize_t hotkey_write_config(struct file *file,
 		kfree(bus_method);
 		kfree(action_handle);
 		kfree(method);
-		ACPI_ERROR((AE_INFO, "Invalid data format ret=%d", ret));
+		printk(KERN_ERR PREFIX "Invalid data format ret=%d\n", ret);
 		return_VALUE(-EINVAL);
 	}
 
@@ -802,7 +802,7 @@ static ssize_t hotkey_write_config(struct file *file,
 		tmp = get_hotkey_by_event(&global_hotkey_list,
 					  internal_event_num);
 		if (!tmp)
-			ACPI_ERROR((AE_INFO, "Invalid key"));
+			printk(KERN_ERR PREFIX "Invalid key\n");
 		else
 			memcpy(key, tmp, sizeof(union acpi_hotkey));
 		goto cont_cmd;
@@ -824,7 +824,7 @@ static ssize_t hotkey_write_config(struct file *file,
 		else
 			free_poll_hotkey_buffer(key);
 		kfree(key);
-		ACPI_ERROR((AE_INFO, "Invalid hotkey"));
+		printk(KERN_ERR PREFIX "Invalid hotkey\n");
 		return_VALUE(-EINVAL);
 	}
 
@@ -858,7 +858,7 @@ static ssize_t hotkey_write_config(struct file *file,
 	else
 		free_poll_hotkey_buffer(key);
 	kfree(key);
-	ACPI_ERROR((AE_INFO, "invalid key"));
+	printk(KERN_ERR PREFIX "invalid key\n");
 	return_VALUE(-EINVAL);
 }
 
@@ -903,7 +903,7 @@ static int read_acpi_int(acpi_handle handle, const char *method,
 		val->integer.value = out_obj.integer.value;
 		val->type = out_obj.type;
 	} else
-		ACPI_ERROR((AE_INFO, "null val pointer"));
+		printk(KERN_ERR PREFIX "null val pointer\n");
 	return_VALUE((status == AE_OK)
 		     && (out_obj.type == ACPI_TYPE_INTEGER));
 }
@@ -950,14 +950,14 @@ static ssize_t hotkey_execute_aml_method(struct file *file,
 
 	if (copy_from_user(arg, buffer, count)) {
 		kfree(arg);
-		ACPI_ERROR((AE_INFO, "Invalid argument 2"));
+		printk(KERN_ERR PREFIX "Invalid argument 2\n");
 		return_VALUE(-EINVAL);
 	}
 
 	if (sscanf(arg, "%d:%d:%d:%d", &event, &method_type, &type, &value) !=
 	    4) {
 		kfree(arg);
-		ACPI_ERROR((AE_INFO, "Invalid argument 3"));
+		printk(KERN_ERR PREFIX "Invalid argument 3\n");
 		return_VALUE(-EINVAL);
 	}
 	kfree(arg);

trunk/drivers/acpi/osl.c

@@ -591,7 +591,7 @@ static void acpi_os_execute_deferred(void *context)
 
 	dpc = (struct acpi_os_dpc *)context;
 	if (!dpc) {
-		ACPI_ERROR((AE_INFO, "Invalid (NULL) context"));
+		printk(KERN_ERR PREFIX "Invalid (NULL) context\n");
 		return_VOID;
 	}
 

trunk/drivers/acpi/pci_bind.c

@@ -75,9 +75,9 @@ acpi_status acpi_get_pci_id(acpi_handle handle, struct acpi_pci_id *id)
 
 	result = acpi_bus_get_device(handle, &device);
 	if (result) {
-		ACPI_ERROR((AE_INFO,
-			    "Invalid ACPI Bus context for device %s",
-			    acpi_device_bid(device)));
+		printk(KERN_ERR PREFIX
+			    "Invalid ACPI Bus context for device %s\n",
+			    acpi_device_bid(device));
 		return_ACPI_STATUS(AE_NOT_EXIST);
 	}
 
@@ -206,10 +206,10 @@ int acpi_pci_bind(struct acpi_device *device)
 		goto end;
 	}
 	if (!data->dev->bus) {
-		ACPI_ERROR((AE_INFO,
-			    "Device %02x:%02x:%02x.%02x has invalid 'bus' field",
+		printk(KERN_ERR PREFIX
+			    "Device %02x:%02x:%02x.%02x has invalid 'bus' field\n",
 			    data->id.segment, data->id.bus,
-			    data->id.device, data->id.function));
+			    data->id.device, data->id.function);
 		result = -ENODEV;
 		goto end;
 	}

trunk/drivers/acpi/pci_irq.c

@@ -420,7 +420,7 @@ int acpi_pci_irq_enable(struct pci_dev *dev)
 	pin--;
 
 	if (!dev->bus) {
-		ACPI_ERROR((AE_INFO, "Invalid (NULL) 'bus' field"));
+		printk(KERN_ERR PREFIX "Invalid (NULL) 'bus' field\n");
 		return_VALUE(-ENODEV);
 	}
 

trunk/drivers/acpi/pci_link.c

@@ -161,7 +161,7 @@ acpi_pci_link_check_possible(struct acpi_resource *resource, void *context)
 			break;
 		}
 	default:
-		ACPI_ERROR((AE_INFO, "Resource is not an IRQ entry\n"));
+		printk(KERN_ERR PREFIX "Resource is not an IRQ entry\n");
 		return_ACPI_STATUS(AE_OK);
 	}
 
@@ -232,7 +232,7 @@ acpi_pci_link_check_current(struct acpi_resource *resource, void *context)
 		}
 		break;
 	default:
-		ACPI_ERROR((AE_INFO, "Resource %d isn't an IRQ", resource->type));
+		printk(KERN_ERR PREFIX "Resource %d isn't an IRQ\n", resource->type);
 	case ACPI_RESOURCE_TYPE_END_TAG:
 		return_ACPI_STATUS(AE_OK);
 	}
@@ -264,7 +264,7 @@ static int acpi_pci_link_get_current(struct acpi_pci_link *link)
 		/* Query _STA, set link->device->status */
 		result = acpi_bus_get_status(link->device);
 		if (result) {
-			ACPI_ERROR((AE_INFO, "Unable to read status"));
+			printk(KERN_ERR PREFIX "Unable to read status\n");
 			goto end;
 		}
 
@@ -287,7 +287,7 @@ static int acpi_pci_link_get_current(struct acpi_pci_link *link)
 	}
 
 	if (acpi_strict && !irq) {
-		ACPI_ERROR((AE_INFO, "_CRS returned 0"));
+		printk(KERN_ERR PREFIX "_CRS returned 0\n");
 		result = -ENODEV;
 	}
 
@@ -357,7 +357,7 @@ static int acpi_pci_link_set(struct acpi_pci_link *link, int irq)
 		/* ignore resource_source, it's optional */
 		break;
 	default:
-		ACPI_ERROR((AE_INFO, "Invalid Resource_type %d\n", link->irq.resource_type));
+		printk(KERN_ERR PREFIX "Invalid Resource_type %d\n", link->irq.resource_type);
 		result = -EINVAL;
 		goto end;
 
@@ -377,7 +377,7 @@ static int acpi_pci_link_set(struct acpi_pci_link *link, int irq)
 	/* Query _STA, set device->status */
 	result = acpi_bus_get_status(link->device);
 	if (result) {
-		ACPI_ERROR((AE_INFO, "Unable to read status"));
+		printk(KERN_ERR PREFIX "Unable to read status\n");
 		goto end;
 	}
 	if (!link->device->status.enabled) {
@@ -496,7 +496,7 @@ int __init acpi_irq_penalty_init(void)
 
 		link = list_entry(node, struct acpi_pci_link, node);
 		if (!link) {
-			ACPI_ERROR((AE_INFO, "Invalid link context"));
+			printk(KERN_ERR PREFIX "Invalid link context\n");
 			continue;
 		}
 
@@ -583,10 +583,10 @@ static int acpi_pci_link_allocate(struct acpi_pci_link *link)
 
 	/* Attempt to enable the link device at this IRQ. */
 	if (acpi_pci_link_set(link, irq)) {
-		ACPI_ERROR((AE_INFO, "Unable to set IRQ for %s [%s]. "
-			    "Try pci=noacpi or acpi=off",
+		printk(KERN_ERR PREFIX "Unable to set IRQ for %s [%s]. "
+			    "Try pci=noacpi or acpi=off\n",
 			    acpi_device_name(link->device),
-			    acpi_device_bid(link->device)));
+			    acpi_device_bid(link->device));
 		return_VALUE(-ENODEV);
 	} else {
 		acpi_irq_penalty[link->irq.active] += PIRQ_PENALTY_PCI_USING;
@@ -619,19 +619,19 @@ acpi_pci_link_allocate_irq(acpi_handle handle,
 
 	result = acpi_bus_get_device(handle, &device);
 	if (result) {
-		ACPI_ERROR((AE_INFO, "Invalid link device"));
+		printk(KERN_ERR PREFIX "Invalid link device\n");
 		return_VALUE(-1);
 	}
 
 	link = (struct acpi_pci_link *)acpi_driver_data(device);
 	if (!link) {
-		ACPI_ERROR((AE_INFO, "Invalid link context"));
+		printk(KERN_ERR PREFIX "Invalid link context\n");
 		return_VALUE(-1);
 	}
 
 	/* TBD: Support multiple index (IRQ) entries per Link Device */
 	if (index) {
-		ACPI_ERROR((AE_INFO, "Invalid index %d", index));
+		printk(KERN_ERR PREFIX "Invalid index %d\n", index);
 		return_VALUE(-1);
 	}
 
@@ -643,7 +643,7 @@ acpi_pci_link_allocate_irq(acpi_handle handle,
 
 	if (!link->irq.active) {
 		mutex_unlock(&acpi_link_lock);
-		ACPI_ERROR((AE_INFO, "Link active IRQ is 0!"));
+		printk(KERN_ERR PREFIX "Link active IRQ is 0!\n");
 		return_VALUE(-1);
 	}
 	link->refcnt++;
@@ -675,20 +675,20 @@ int acpi_pci_link_free_irq(acpi_handle handle)
 
 	result = acpi_bus_get_device(handle, &device);
 	if (result) {
-		ACPI_ERROR((AE_INFO, "Invalid link device"));
+		printk(KERN_ERR PREFIX "Invalid link device\n");
 		return_VALUE(-1);
 	}
 
 	link = (struct acpi_pci_link *)acpi_driver_data(device);
 	if (!link) {
-		ACPI_ERROR((AE_INFO, "Invalid link context"));
+		printk(KERN_ERR PREFIX "Invalid link context\n");
 		return_VALUE(-1);
 	}
 
 	mutex_lock(&acpi_link_lock);
 	if (!link->irq.initialized) {
 		mutex_unlock(&acpi_link_lock);
-		ACPI_ERROR((AE_INFO, "Link isn't initialized"));
+		printk(KERN_ERR PREFIX "Link isn't initialized\n");
 		return_VALUE(-1);
 	}
 #ifdef	FUTURE_USE
@@ -813,7 +813,7 @@ static int irqrouter_resume(struct sys_device *dev)
 	list_for_each(node, &acpi_link.entries) {
 		link = list_entry(node, struct acpi_pci_link, node);
 		if (!link) {
-			ACPI_ERROR((AE_INFO, "Invalid link context"));
+			printk(KERN_ERR PREFIX "Invalid link context\n");
 			continue;
 		}
 		acpi_pci_link_resume(link);

trunk/drivers/acpi/pci_root.c

@@ -231,9 +231,9 @@ static int acpi_pci_root_add(struct acpi_device *device)
 			int bus = 0;
 			acpi_status status;
 
-			ACPI_ERROR((AE_INFO,
+			printk(KERN_ERR PREFIX
 				    "Wrong _BBN value, reboot"
-				    " and use option 'pci=noacpi'"));
+				    " and use option 'pci=noacpi'\n");
 
 			status = try_get_root_bridge_busnr(root->handle, &bus);
 			if (ACPI_FAILURE(status))
@@ -274,9 +274,9 @@ static int acpi_pci_root_add(struct acpi_device *device)
 	 */
 	root->bus = pci_acpi_scan_root(device, root->id.segment, root->id.bus);
 	if (!root->bus) {
-		ACPI_ERROR((AE_INFO,
-			    "Bus %04x:%02x not present in PCI namespace",
-			    root->id.segment, root->id.bus));
+		printk(KERN_ERR PREFIX
+			    "Bus %04x:%02x not present in PCI namespace\n",
+			    root->id.segment, root->id.bus);
 		result = -ENODEV;
 		goto end;
 	}