microsoft
/
WSL2-Linux-Kernel
зеркало из https://github.com/microsoft/WSL2-Linux-Kernel.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

ACPI / fan: printk replacement 

printk replaced with corresponding dev_err and dev_info
fixed one broken user-visible string
multiine comment edited for correct commenting style
asm/uaccess.h replaced with linux/uaccess.h
PREFIX removed

Signed-off-by: Sudip Mukherjee <sudip@vectorindia.org>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
This commit is contained in:
Sudip Mukherjee 2014-08-28 19:17:19 +05:30 коммит произвёл Rafael J. Wysocki
Родитель bfe01a5ba2
Коммит 88989fd26a
1 изменённых файлов: 8 добавлений и 10 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

18
drivers/acpi/fan.c
Просмотреть файл

@ -27,12 +27,10 @@
#include <linux/module.h> #include <linux/module.h>
#include <linux/init.h> #include <linux/init.h>
#include <linux/types.h> #include <linux/types.h>
#include <asm/uaccess.h> #include <linux/uaccess.h>
#include <linux/thermal.h> #include <linux/thermal.h>
#include <linux/acpi.h> #include <linux/acpi.h>
#define PREFIX "ACPI: "
#define ACPI_FAN_CLASS "fan" #define ACPI_FAN_CLASS "fan"
#define ACPI_FAN_FILE_STATE "state" #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) 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); result = acpi_bus_update_power(device->handle, NULL);
if (result) { if (result) {
printk(KERN_ERR PREFIX "Setting initial power state\n"); dev_err(&device->dev, "Setting initial power state\n");
goto end; goto end;
} }
@ -168,10 +167,9 @@ static int acpi_fan_add(struct acpi_device *device)
&device->dev.kobj, &device->dev.kobj,
"device"); "device");
if (result) if (result)
dev_err(&device->dev, "Failed to create sysfs link " dev_err(&device->dev, "Failed to create sysfs link 'device'\n");
"'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), acpi_device_name(device), acpi_device_bid(device),
!device->power.state ? "on" : "off"); !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); result = acpi_bus_update_power(to_acpi_device(dev)->handle, NULL);
if (result) if (result)
printk(KERN_ERR PREFIX "Error updating fan power state\n"); dev_err(dev, "Error updating fan power state\n");
return result; return result;
} }