Move hp_accel to drivers/platform/x86

The hp_accel driver isn't a hardware monitoring driver, so it doesn't
belong to drivers/hwmon. Move it to drivers/platform/x86, assuming HP
doesn't ship non-x86 laptops.

Signed-off-by: Jean Delvare <khali@linux-fr.org>
Acked-by: Guenter Roeck <guenter.roeck@ericsson.com>
Acked-by: Eric Piel <eric.piel@tremplin-utc.net>
Acked-by: Jonathan Cameron <jic23@cam.ac.uk>
Tested-by: Eric Piel <eric.piel@tremplin-utc.net>
Tested-by: Takashi Iwai <tiwai@suse.de>

diff --git a/Documentation/hwmon/lis3lv02d b/Documentation/hwmon/lis3lv02d
index 06534f25e643e15be91bb9eda118898a3241e5ed..f1a4ec840f86f2623ea53723286ed036532dc050 100644 (file)
--- a/Documentation/hwmon/lis3lv02d
+++ b/Documentation/hwmon/lis3lv02d
@@ -17,8 +17,8 @@ Description
 This driver provides support for the accelerometer found in various HP laptops
 sporting the feature officially called "HP Mobile Data Protection System 3D" or
 "HP 3D DriveGuard". It detects automatically laptops with this sensor. Known
-models (full list can be found in drivers/hwmon/hp_accel.c) will have their
-axis automatically oriented on standard way (eg: you can directly play
+models (full list can be found in drivers/platform/x86/hp_accel.c) will have
+their axis automatically oriented on standard way (eg: you can directly play
 neverball). The accelerometer data is readable via
 /sys/devices/platform/lis3lv02d. Reported values are scaled
 to mg values (1/1000th of earth gravity).

diff --git a/Documentation/hwmon/hpfall.c b/Documentation/laptops/hpfall.c
similarity index 100%
rename from Documentation/hwmon/hpfall.c
rename to Documentation/laptops/hpfall.c

diff --git a/drivers/hwmon/Kconfig b/drivers/hwmon/Kconfig
index c48101cf58f4b3ca8972d5ca063b8a4d92043c46..3f8c895417de40ac4fb18854554f68076d205e4a 100644 (file)
--- a/drivers/hwmon/Kconfig
+++ b/drivers/hwmon/Kconfig
@@ -1302,25 +1302,6 @@ config SENSORS_ATK0110
          This driver can also be built as a module. If so, the module
          will be called asus_atk0110.
 
-config HP_ACCEL
-       tristate "HP laptop accelerometer"
-       depends on INPUT
-       select SENSORS_LIS3LV02D
-       select NEW_LEDS
-       select LEDS_CLASS
-       default n
-       help
-         This driver provides support for the "Mobile Data Protection System 3D"
-         or "3D DriveGuard" feature of HP laptops. On such systems the driver
-         should load automatically (via ACPI alias).
-
-         Support for a led indicating disk protection will be provided as
-         hp::hddprotect. For more information on the feature, refer to
-         Documentation/hwmon/lis3lv02d.
-
-         To compile this driver as a module, choose M here: the module will
-         be called hp_accel.
-
 endif # ACPI
 
 endif # HWMON

diff --git a/drivers/hwmon/Makefile b/drivers/hwmon/Makefile
index 94bf2748297943b0aef269ed7c0b747df7ee7f26..55ba906def74aa523596d1eb6fe3bb856cd8f830 100644 (file)
--- a/drivers/hwmon/Makefile
+++ b/drivers/hwmon/Makefile
@@ -10,7 +10,6 @@ obj-$(CONFIG_SENSORS_LIS3LV02D) += lis3lv02d.o
 
 # APCI drivers
 obj-$(CONFIG_SENSORS_ATK0110)  += asus_atk0110.o
-obj-$(CONFIG_HP_ACCEL)         += hp_accel.o
 
 # Native drivers
 # asb100, then w83781d go first, as they can override other drivers' addresses.

diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig
index a59af5b24f0ac9d9f0e4ea7c88cc2ad00ddddbb0..222dfb737b11a699d559c12c23e26a7577ab99de 100644 (file)
--- a/drivers/platform/x86/Kconfig
+++ b/drivers/platform/x86/Kconfig
@@ -138,6 +138,24 @@ config TC1100_WMI
          This is a driver for the WMI extensions (wireless and bluetooth power
          control) of the HP Compaq TC1100 tablet.
 
+config HP_ACCEL
+       tristate "HP laptop accelerometer"
+       depends on INPUT && ACPI
+       select SENSORS_LIS3LV02D
+       select NEW_LEDS
+       select LEDS_CLASS
+       help
+         This driver provides support for the "Mobile Data Protection System 3D"
+         or "3D DriveGuard" feature of HP laptops. On such systems the driver
+         should load automatically (via ACPI alias).
+
+         Support for a led indicating disk protection will be provided as
+         hp::hddprotect. For more information on the feature, refer to
+         Documentation/hwmon/lis3lv02d.
+
+         To compile this driver as a module, choose M here: the module will
+         be called hp_accel.
+
 config HP_WMI
        tristate "HP WMI extras"
        depends on ACPI_WMI

diff --git a/drivers/platform/x86/Makefile b/drivers/platform/x86/Makefile
index 4ec4ff8f918240e657153d7bdd0a11202ba8d498..299aefb3e74ce222b0a146703b601fe73b1f933d 100644 (file)
--- a/drivers/platform/x86/Makefile
+++ b/drivers/platform/x86/Makefile
@@ -12,6 +12,7 @@ obj-$(CONFIG_DELL_LAPTOP)     += dell-laptop.o
 obj-$(CONFIG_DELL_WMI)         += dell-wmi.o
 obj-$(CONFIG_ACER_WMI)         += acer-wmi.o
 obj-$(CONFIG_ACERHDF)          += acerhdf.o
+obj-$(CONFIG_HP_ACCEL)         += hp_accel.o
 obj-$(CONFIG_HP_WMI)           += hp-wmi.o
 obj-$(CONFIG_TC1100_WMI)       += tc1100-wmi.o
 obj-$(CONFIG_SONY_LAPTOP)      += sony-laptop.o

diff --git a/drivers/hwmon/hp_accel.c b/drivers/platform/x86/hp_accel.c
similarity index 99%
rename from drivers/hwmon/hp_accel.c
rename to drivers/platform/x86/hp_accel.c
index 3d21fa2b97cd1d922119b17ea6a4780e89fc8a63..23f09c1b234b5bd24e0c98752f74e4297634a316 100644 (file)
--- a/drivers/hwmon/hp_accel.c
+++ b/drivers/platform/x86/hp_accel.c
@@ -35,9 +35,9 @@
 #include <linux/freezer.h>
 #include <linux/uaccess.h>
 #include <linux/leds.h>
+#include <linux/atomic.h>
 #include <acpi/acpi_drivers.h>
-#include <asm/atomic.h>
-#include "lis3lv02d.h"
+#include "../../hwmon/lis3lv02d.h"
 
 #define DRIVER_NAME     "lis3lv02d"
 #define ACPI_MDPS_CLASS "accelerometer"
@@ -402,4 +402,3 @@ MODULE_LICENSE("GPL");
 
 module_init(lis3lv02d_init_module);
 module_exit(lis3lv02d_exit_module);
-