ACPI / fan: printk replacement (88989fd2) · Commits · 戴 / test

drivers/acpi/fan.c

+8 −10

Original line number	Diff line number	Diff line
		@@ -27,12 +27,10 @@
		#include <linux/module.h>
		#include <linux/init.h>
		#include <linux/types.h>
		#include <asm/uaccess.h>
		#include <linux/uaccess.h>
		#include <linux/thermal.h>
		#include <linux/acpi.h>

		#define PREFIX "ACPI: "

		#define ACPI_FAN_CLASS "fan"
		#define ACPI_FAN_FILE_STATE "state"

		@@ -127,8 +125,9 @@ static const struct thermal_cooling_device_ops fan_cooling_ops = {
		};

		/* --------------------------------------------------------------------------
		Driver Interface
		-------------------------------------------------------------------------- */
		* Driver Interface
		* --------------------------------------------------------------------------
		*/

		static int acpi_fan_add(struct acpi_device *device)
		{
		@@ -143,7 +142,7 @@ static int acpi_fan_add(struct acpi_device *device)

		result = acpi_bus_update_power(device->handle, NULL);
		if (result) {
		printk(KERN_ERR PREFIX "Setting initial power state\n");
		dev_err(&device->dev, "Setting initial power state\n");
		goto end;
		}

		@@ -168,10 +167,9 @@ static int acpi_fan_add(struct acpi_device *device)
		&device->dev.kobj,
		"device");
		if (result)
		dev_err(&device->dev, "Failed to create sysfs link "
		"'device'\n");
		dev_err(&device->dev, "Failed to create sysfs link 'device'\n");

		printk(KERN_INFO PREFIX "%s [%s] (%s)\n",
		dev_info(&device->dev, "ACPI: %s [%s] (%s)\n",
		acpi_device_name(device), acpi_device_bid(device),
		!device->power.state ? "on" : "off");

		@@ -217,7 +215,7 @@ static int acpi_fan_resume(struct device *dev)

		result = acpi_bus_update_power(to_acpi_device(dev)->handle, NULL);
		if (result)
		printk(KERN_ERR PREFIX "Error updating fan power state\n");
		dev_err(dev, "Error updating fan power state\n");

		return result;
		}

Admin message