summaryrefslogtreecommitdiffstats
path: root/drivers/acpi/fan.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/acpi/fan.c')
-rw-r--r--drivers/acpi/fan.c13
1 files changed, 6 insertions, 7 deletions
diff --git a/drivers/acpi/fan.c b/drivers/acpi/fan.c
index e007c4987be..caf9b76b7ef 100644
--- a/drivers/acpi/fan.c
+++ b/drivers/acpi/fan.c
@@ -27,7 +27,7 @@
#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>
#include <linux/platform_device.h>
@@ -221,8 +221,9 @@ static const struct thermal_cooling_device_ops fan_cooling_ops = {
};
/* --------------------------------------------------------------------------
- Driver Interface
- -------------------------------------------------------------------------- */
+ * Driver Interface
+ * --------------------------------------------------------------------------
+*/
static bool acpi_fan_is_acpi4(struct acpi_device *device)
{
@@ -359,15 +360,13 @@ static int acpi_fan_probe(struct platform_device *pdev)
&cdev->device.kobj,
"thermal_cooling");
if (result)
- dev_err(&pdev->dev, "Failed to create sysfs link "
- "'thermal_cooling'\n");
+ dev_err(&pdev->dev, "Failed to create sysfs link 'thermal_cooling'\n");
result = sysfs_create_link(&cdev->device.kobj,
&pdev->dev.kobj,
"device");
if (result)
- dev_err(&pdev->dev, "Failed to create sysfs link "
- "'device'\n");
+ dev_err(&pdev->dev, "Failed to create sysfs link 'device'\n");
end:
return result;