[media] move ati_remote driver from input/misc to media/rc

The driver will be migrated to the RC driver API in a following
commit.

[mchehab@redhat.com: Fix some bad whitespacing]
Signed-off-by: Anssi Hannula <anssi.hannula@iki.fi>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

diff --git a/drivers/input/misc/Kconfig b/drivers/input/misc/Kconfig
index c9104bb..05cbdab 100644 (file)
--- a/drivers/input/misc/Kconfig
+++ b/drivers/input/misc/Kconfig
@@ -183,22 +183,6 @@ config INPUT_ATLAS_BTNS
          To compile this driver as a module, choose M here: the module will
          be called atlas_btns.
 
-config INPUT_ATI_REMOTE
-       tristate "ATI / X10 USB RF remote control"
-       depends on USB_ARCH_HAS_HCD
-       select USB
-       help
-         Say Y here if you want to use an ATI or X10 "Lola" USB remote control.
-         These are RF remotes with USB receivers.
-         The ATI remote comes with many of ATI's All-In-Wonder video cards.
-         The X10 "Lola" remote is available at:
-            <http://www.x10.com/products/lola_sg1.htm>
-         This driver provides mouse pointer, left and right mouse buttons,
-         and maps all the other remote buttons to keypress events.
-
-         To compile this driver as a module, choose M here: the module will be
-         called ati_remote.
-
 config INPUT_ATI_REMOTE2
        tristate "ATI / Philips USB RF remote control"
        depends on USB_ARCH_HAS_HCD

diff --git a/drivers/input/misc/Makefile b/drivers/input/misc/Makefile
index 299ad5e..9032d34 100644 (file)
--- a/drivers/input/misc/Makefile
+++ b/drivers/input/misc/Makefile
@@ -13,7 +13,6 @@ obj-$(CONFIG_INPUT_ADXL34X)           += adxl34x.o
 obj-$(CONFIG_INPUT_ADXL34X_I2C)                += adxl34x-i2c.o
 obj-$(CONFIG_INPUT_ADXL34X_SPI)                += adxl34x-spi.o
 obj-$(CONFIG_INPUT_APANEL)             += apanel.o
-obj-$(CONFIG_INPUT_ATI_REMOTE)         += ati_remote.o
 obj-$(CONFIG_INPUT_ATI_REMOTE2)                += ati_remote2.o
 obj-$(CONFIG_INPUT_ATLAS_BTNS)         += atlas_btns.o
 obj-$(CONFIG_INPUT_BFIN_ROTARY)                += bfin_rotary.o

diff --git a/drivers/media/rc/Kconfig b/drivers/media/rc/Kconfig
index 899f783..756884e 100644 (file)
--- a/drivers/media/rc/Kconfig
+++ b/drivers/media/rc/Kconfig
@@ -4,8 +4,8 @@ menuconfig RC_CORE
        default INPUT
        ---help---
          Enable support for Remote Controllers on Linux. This is
-         needed in order to support several video capture adapters.
-         Currently, all supported devices use InfraRed.
+         needed in order to support several video capture adapters,
+         standalone IR receivers/transmitters, and RF receivers.
 
          Enable this option if you have a video capture board even
          if you don't need IR, as otherwise, you may not be able to
@@ -108,6 +108,22 @@ config IR_LIRC_CODEC
           Enable this option to pass raw IR to and from userspace via
           the LIRC interface.
 
+config RC_ATI_REMOTE
+       tristate "ATI / X10 USB RF remote control"
+       depends on USB_ARCH_HAS_HCD
+       select USB
+       help
+          Say Y here if you want to use an ATI or X10 "Lola" USB remote control.
+          These are RF remotes with USB receivers.
+          The ATI remote comes with many of ATI's All-In-Wonder video cards.
+          The X10 "Lola" remote is available at:
+             <http://www.x10.com/products/lola_sg1.htm>
+          This driver provides mouse pointer, left and right mouse buttons,
+          and maps all the other remote buttons to keypress events.
+
+          To compile this driver as a module, choose M here: the module will be
+          called ati_remote.
+
 config IR_ENE
        tristate "ENE eHome Receiver/Transceiver (pnp id: ENE0100/ENE02xxx)"
        depends on PNP

diff --git a/drivers/media/rc/Makefile b/drivers/media/rc/Makefile
index f224db0..2156e78 100644 (file)
--- a/drivers/media/rc/Makefile
+++ b/drivers/media/rc/Makefile
@@ -14,6 +14,7 @@ obj-$(CONFIG_IR_MCE_KBD_DECODER) += ir-mce_kbd-decoder.o
 obj-$(CONFIG_IR_LIRC_CODEC) += ir-lirc-codec.o
 
 # stand-alone IR receivers/transmitters
+obj-$(CONFIG_RC_ATI_REMOTE) += ati_remote.o
 obj-$(CONFIG_IR_IMON) += imon.o
 obj-$(CONFIG_IR_ITE_CIR) += ite-cir.o
 obj-$(CONFIG_IR_MCEUSB) += mceusb.o

diff --git a/drivers/input/misc/ati_remote.c b/drivers/media/rc/ati_remote.c
similarity index 99%
rename from drivers/input/misc/ati_remote.c
rename to drivers/media/rc/ati_remote.c
index bce5712..53388a5 100644 (file)
--- a/drivers/input/misc/ati_remote.c
+++ b/drivers/media/rc/ati_remote.c
@@ -105,7 +105,7 @@
 #define NVIDIA_REMOTE_PRODUCT_ID       0x0005
 #define MEDION_REMOTE_PRODUCT_ID       0x0006
 
-#define DRIVER_VERSION         "2.2.1"
+#define DRIVER_VERSION         "2.2.1"
 #define DRIVER_AUTHOR           "Torrey Hoffman <thoffman@arnor.net>"
 #define DRIVER_DESC             "ATI/X10 RF USB Remote Control"
 
@@ -481,7 +481,7 @@ static void ati_remote_input_report(struct urb *urb)
        /* Mask unwanted remote channels.  */
        /* note: remote_num is 0-based, channel 1 on remote == 0 here */
        remote_num = (data[3] >> 4) & 0x0f;
-        if (channel_mask & (1 << (remote_num + 1))) {
+       if (channel_mask & (1 << (remote_num + 1))) {
                dbginfo(&ati_remote->interface->dev,
                        "Masked input from channel 0x%02x: data %02x,%02x, mask= 0x%02lx\n",
                        remote_num, data[1], data[2], channel_mask);
@@ -630,7 +630,7 @@ static int ati_remote_alloc_buffers(struct usb_device *udev,
                return -1;
 
        ati_remote->outbuf = usb_alloc_coherent(udev, DATA_BUFSIZE, GFP_ATOMIC,
-                                               &ati_remote->outbuf_dma);
+                                               &ati_remote->outbuf_dma);
        if (!ati_remote->outbuf)
                return -1;