Move lis3lv02d drivers to drivers/misc

The lis3lv02d drivers aren't hardware monitoring drivers, so the don't
belong to drivers/hwmon. Move them to drivers/misc, short of a better
home.

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/misc-devices/lis3lv02d
similarity index 100%
rename from Documentation/hwmon/lis3lv02d
rename to Documentation/misc-devices/lis3lv02d

diff --git a/MAINTAINERS b/MAINTAINERS
index c7a41b1..4edb2a8 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -3913,8 +3913,8 @@ S:        Supported
 LIS3LV02D ACCELEROMETER DRIVER
 M:     Eric Piel <eric.piel@tremplin-utc.net>
 S:     Maintained
-F:     Documentation/hwmon/lis3lv02d
-F:     drivers/hwmon/lis3lv02d.*
+F:     Documentation/misc-devices/lis3lv02d
+F:     drivers/misc/lis3lv02d/
 
 LLC (802.2)
 M:     Arnaldo Carvalho de Melo <acme@ghostprotocols.net>

diff --git a/drivers/hwmon/Kconfig b/drivers/hwmon/Kconfig
index 3f8c895..47621ab 100644 (file)
--- a/drivers/hwmon/Kconfig
+++ b/drivers/hwmon/Kconfig
@@ -2,12 +2,6 @@
 # Hardware monitoring chip drivers configuration
 #
 
-config SENSORS_LIS3LV02D
-       tristate
-       depends on INPUT
-       select INPUT_POLLDEV
-       default n
-
 menuconfig HWMON
        tristate "Hardware Monitoring support"
        depends on HAS_IOMEM
@@ -1221,40 +1215,6 @@ config SENSORS_ULTRA45
          This driver provides support for the Ultra45 workstation environmental
          sensors.
 
-config SENSORS_LIS3_SPI
-       tristate "STMicroeletronics LIS3LV02Dx three-axis digital accelerometer (SPI)"
-       depends on !ACPI && SPI_MASTER && INPUT
-       select SENSORS_LIS3LV02D
-       default n
-       help
-         This driver provides support for the LIS3LV02Dx accelerometer connected
-         via SPI. The accelerometer data is readable via
-         /sys/devices/platform/lis3lv02d.
-
-         This driver also provides an absolute input class device, allowing
-         the laptop to act as a pinball machine-esque joystick.
-
-         This driver can also be built as modules.  If so, the core module
-         will be called lis3lv02d and a specific module for the SPI transport
-         is called lis3lv02d_spi.
-
-config SENSORS_LIS3_I2C
-       tristate "STMicroeletronics LIS3LV02Dx three-axis digital accelerometer (I2C)"
-       depends on I2C && INPUT
-       select SENSORS_LIS3LV02D
-       default n
-       help
-         This driver provides support for the LIS3LV02Dx accelerometer connected
-         via I2C. The accelerometer data is readable via
-         /sys/devices/platform/lis3lv02d.
-
-         This driver also provides an absolute input class device, allowing
-         the device to act as a pinball machine-esque joystick.
-
-         This driver can also be built as modules.  If so, the core module
-         will be called lis3lv02d and a specific module for the I2C transport
-         is called lis3lv02d_i2c.
-
 config SENSORS_APPLESMC
        tristate "Apple SMC (Motion sensor, light sensor, keyboard backlight)"
        depends on INPUT && X86

diff --git a/drivers/hwmon/Makefile b/drivers/hwmon/Makefile
index 55ba906..c068f82 100644 (file)
--- a/drivers/hwmon/Makefile
+++ b/drivers/hwmon/Makefile
@@ -5,9 +5,6 @@
 obj-$(CONFIG_HWMON)            += hwmon.o
 obj-$(CONFIG_HWMON_VID)                += hwmon-vid.o
 
-# Helper drivers
-obj-$(CONFIG_SENSORS_LIS3LV02D) += lis3lv02d.o
-
 # APCI drivers
 obj-$(CONFIG_SENSORS_ATK0110)  += asus_atk0110.o
 
@@ -66,8 +63,6 @@ obj-$(CONFIG_SENSORS_JZ4740)  += jz4740-hwmon.o
 obj-$(CONFIG_SENSORS_K8TEMP)   += k8temp.o
 obj-$(CONFIG_SENSORS_K10TEMP)  += k10temp.o
 obj-$(CONFIG_SENSORS_LINEAGE)  += lineage-pem.o
-obj-$(CONFIG_SENSORS_LIS3_SPI) += lis3lv02d_spi.o
-obj-$(CONFIG_SENSORS_LIS3_I2C) += lis3lv02d_i2c.o
 obj-$(CONFIG_SENSORS_LM63)     += lm63.o
 obj-$(CONFIG_SENSORS_LM70)     += lm70.o
 obj-$(CONFIG_SENSORS_LM73)     += lm73.o

diff --git a/drivers/misc/Kconfig b/drivers/misc/Kconfig
index b7d5ef2..203500d 100644 (file)
--- a/drivers/misc/Kconfig
+++ b/drivers/misc/Kconfig
@@ -2,6 +2,14 @@
 # Misc strange devices
 #
 
+# This one has to live outside of the MISC_DEVICES conditional,
+# because it may be selected by drivers/platform/x86/hp_accel.
+config SENSORS_LIS3LV02D
+       tristate
+       depends on INPUT
+       select INPUT_POLLDEV
+       default n
+
 menuconfig MISC_DEVICES
        bool "Misc devices"
        ---help---
@@ -462,5 +470,6 @@ source "drivers/misc/eeprom/Kconfig"
 source "drivers/misc/cb710/Kconfig"
 source "drivers/misc/iwmc3200top/Kconfig"
 source "drivers/misc/ti-st/Kconfig"
+source "drivers/misc/lis3lv02d/Kconfig"
 
 endif # MISC_DEVICES

diff --git a/drivers/misc/Makefile b/drivers/misc/Makefile
index 98009cc..804f421 100644 (file)
--- a/drivers/misc/Makefile
+++ b/drivers/misc/Makefile
@@ -42,3 +42,4 @@ obj-$(CONFIG_ARM_CHARLCD)     += arm-charlcd.o
 obj-$(CONFIG_PCH_PHUB)         += pch_phub.o
 obj-y                          += ti-st/
 obj-$(CONFIG_AB8500_PWM)       += ab8500-pwm.o
+obj-y                          += lis3lv02d/

diff --git a/drivers/misc/lis3lv02d/Kconfig b/drivers/misc/lis3lv02d/Kconfig
new file mode 100644 (file)
index 0000000..8f474e6
--- /dev/null
+++ b/drivers/misc/lis3lv02d/Kconfig
@@ -0,0 +1,37 @@
+#
+# STMicroelectonics LIS3LV02D and similar accelerometers
+#
+
+config SENSORS_LIS3_SPI
+       tristate "STMicroeletronics LIS3LV02Dx three-axis digital accelerometer (SPI)"
+       depends on !ACPI && SPI_MASTER && INPUT
+       select SENSORS_LIS3LV02D
+       default n
+       help
+         This driver provides support for the LIS3LV02Dx accelerometer connected
+         via SPI. The accelerometer data is readable via
+         /sys/devices/platform/lis3lv02d.
+
+         This driver also provides an absolute input class device, allowing
+         the laptop to act as a pinball machine-esque joystick.
+
+         This driver can also be built as modules.  If so, the core module
+         will be called lis3lv02d and a specific module for the SPI transport
+         is called lis3lv02d_spi.
+
+config SENSORS_LIS3_I2C
+       tristate "STMicroeletronics LIS3LV02Dx three-axis digital accelerometer (I2C)"
+       depends on I2C && INPUT
+       select SENSORS_LIS3LV02D
+       default n
+       help
+         This driver provides support for the LIS3LV02Dx accelerometer connected
+         via I2C. The accelerometer data is readable via
+         /sys/devices/platform/lis3lv02d.
+
+         This driver also provides an absolute input class device, allowing
+         the device to act as a pinball machine-esque joystick.
+
+         This driver can also be built as modules.  If so, the core module
+         will be called lis3lv02d and a specific module for the I2C transport
+         is called lis3lv02d_i2c.

diff --git a/drivers/misc/lis3lv02d/Makefile b/drivers/misc/lis3lv02d/Makefile
new file mode 100644 (file)
index 0000000..4bf58b1
--- /dev/null
+++ b/drivers/misc/lis3lv02d/Makefile
@@ -0,0 +1,7 @@
+#
+# STMicroelectonics LIS3LV02D and similar accelerometers
+#
+
+obj-$(CONFIG_SENSORS_LIS3LV02D) += lis3lv02d.o
+obj-$(CONFIG_SENSORS_LIS3_SPI) += lis3lv02d_spi.o
+obj-$(CONFIG_SENSORS_LIS3_I2C) += lis3lv02d_i2c.o

diff --git a/drivers/hwmon/lis3lv02d.c b/drivers/misc/lis3lv02d/lis3lv02d.c
similarity index 99%
rename from drivers/hwmon/lis3lv02d.c
rename to drivers/misc/lis3lv02d/lis3lv02d.c
index d805e8e..b928bc1 100644 (file)
--- a/drivers/hwmon/lis3lv02d.c
+++ b/drivers/misc/lis3lv02d/lis3lv02d.c
@@ -38,7 +38,7 @@
 #include <linux/uaccess.h>
 #include <linux/miscdevice.h>
 #include <linux/pm_runtime.h>
-#include <asm/atomic.h>
+#include <linux/atomic.h>
 #include "lis3lv02d.h"
 
 #define DRIVER_NAME     "lis3lv02d"
@@ -88,7 +88,6 @@
 struct lis3lv02d lis3_dev = {
        .misc_wait   = __WAIT_QUEUE_HEAD_INITIALIZER(lis3_dev.misc_wait),
 };
-
 EXPORT_SYMBOL_GPL(lis3_dev);
 
 /* just like param_set_int() but does sanity-check so that it won't point

diff --git a/drivers/hwmon/lis3lv02d.h b/drivers/misc/lis3lv02d/lis3lv02d.h
similarity index 100%
rename from drivers/hwmon/lis3lv02d.h
rename to drivers/misc/lis3lv02d/lis3lv02d.h

diff --git a/drivers/hwmon/lis3lv02d_i2c.c b/drivers/misc/lis3lv02d/lis3lv02d_i2c.c
similarity index 99%
rename from drivers/hwmon/lis3lv02d_i2c.c
rename to drivers/misc/lis3lv02d/lis3lv02d_i2c.c
index 8853afc..b20dfb4 100644 (file)
--- a/drivers/hwmon/lis3lv02d_i2c.c
+++ b/drivers/misc/lis3lv02d/lis3lv02d_i2c.c
@@ -33,7 +33,7 @@
 #include <linux/delay.h>
 #include "lis3lv02d.h"
 
-#define DRV_NAME       "lis3lv02d_i2c"
+#define DRV_NAME       "lis3lv02d_i2c"
 
 static const char reg_vdd[]    = "Vdd";
 static const char reg_vdd_io[] = "Vdd_IO";

diff --git a/drivers/hwmon/lis3lv02d_spi.c b/drivers/misc/lis3lv02d/lis3lv02d_spi.c
similarity index 100%
rename from drivers/hwmon/lis3lv02d_spi.c
rename to drivers/misc/lis3lv02d/lis3lv02d_spi.c

diff --git a/drivers/platform/x86/hp_accel.c b/drivers/platform/x86/hp_accel.c
index 23f09c1..0a52711 100644 (file)
--- a/drivers/platform/x86/hp_accel.c
+++ b/drivers/platform/x86/hp_accel.c
@@ -37,7 +37,7 @@
 #include <linux/leds.h>
 #include <linux/atomic.h>
 #include <acpi/acpi_drivers.h>
-#include "../../hwmon/lis3lv02d.h"
+#include "../../misc/lis3lv02d/lis3lv02d.h"
 
 #define DRIVER_NAME     "lis3lv02d"
 #define ACPI_MDPS_CLASS "accelerometer"