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

Commit 6468463a authored by Len Brown's avatar Len Brown
Browse files

ACPI: un-export ACPI_ERROR() -- use printk(KERN_ERR...) 



Signed-off-by: default avatarLen Brown <len.brown@intel.com>
parent cece9296

drivers/acpi/acpi_memhotplug.c

+9 −9
Original line number Diff line number Diff line
@@ -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,14 +286,14 @@ 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:
@@ -301,12 +301,12 @@ static void acpi_memory_device_notify(acpi_handle handle, u32 event, void *data) 
				  "\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

		 */

drivers/acpi/button.c

+2 −2
Original line number Diff line number Diff line
@@ -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;

	}

drivers/acpi/container.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

	}

drivers/acpi/ec.c

+2 −2
Original line number Diff line number Diff line
@@ -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);

	}

drivers/acpi/fan.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

	}