7 files changed, 39 insertions, 43 deletions

diff --git a/drivers/media/dvb/siano/Kconfig b/drivers/media/dvb/siano/Kconfig
index e520bceee0af..bc6456eb2c4f 100644
--- a/drivers/media/dvb/siano/Kconfig
+++ b/drivers/media/dvb/siano/Kconfig
@@ -4,7 +4,7 @@
 
 config SMS_SIANO_MDTV
         tristate "Siano SMS1xxx based MDTV receiver"
-        depends on DVB_CORE && IR_CORE && HAS_DMA
+        depends on DVB_CORE && RC_CORE && HAS_DMA
         ---help---
           Choose Y or M here if you have MDTV receiver with a Siano chipset.
 
diff --git a/drivers/media/dvb/siano/sms-cards.c b/drivers/media/dvb/siano/sms-cards.c
index 25b43e587fa6..af121db88ea0 100644
--- a/drivers/media/dvb/siano/sms-cards.c
+++ b/drivers/media/dvb/siano/sms-cards.c
@@ -64,7 +64,7 @@ static struct sms_board sms_boards[] = {
                 .type   = SMS_NOVA_B0,
                 .fw[DEVICE_MODE_ISDBT_BDA] = "sms1xxx-hcw-55xxx-isdbt-02.fw",
                 .fw[DEVICE_MODE_DVBT_BDA] = "sms1xxx-hcw-55xxx-dvbt-02.fw",
-                .rc_codes = RC_MAP_RC5_HAUPPAUGE_NEW,
+                .rc_codes = RC_MAP_HAUPPAUGE,
                 .board_cfg.leds_power = 26,
                 .board_cfg.led0 = 27,
                 .board_cfg.led1 = 28,
diff --git a/drivers/media/dvb/siano/smscoreapi.c b/drivers/media/dvb/siano/smscoreapi.c
index ff3b0fa901b3..78765ed28063 100644
--- a/drivers/media/dvb/siano/smscoreapi.c
+++ b/drivers/media/dvb/siano/smscoreapi.c
@@ -438,7 +438,7 @@ static int smscore_init_ir(struct smscore_device_t *coredev)
         int rc;
         void *buffer;
 
-        coredev->ir.input_dev = NULL;
+        coredev->ir.dev = NULL;
         ir_io = sms_get_board(smscore_get_board_id(coredev))->board_cfg.ir;
         if (ir_io) {/* only if IR port exist we use IR sub-module */
                 sms_info("IR loading");
@@ -1504,8 +1504,7 @@ int smscore_gpio_set_level(struct smscore_device_t *coredev, u8 PinNum,
                 u32 msgData[3]; /* keep it 3 ! */
         } *pMsg;
 
-        if ((NewLevel > 1) || (PinNum > MAX_GPIO_PIN_NUMBER) ||
-                        (PinNum > MAX_GPIO_PIN_NUMBER))
+        if ((NewLevel > 1) || (PinNum > MAX_GPIO_PIN_NUMBER))
                 return -EINVAL;
 
         totalLen = sizeof(struct SmsMsgHdr_ST) +
diff --git a/drivers/media/dvb/siano/smsdvb.c b/drivers/media/dvb/siano/smsdvb.c
index b80d09b035a1..37c594f82782 100644
--- a/drivers/media/dvb/siano/smsdvb.c
+++ b/drivers/media/dvb/siano/smsdvb.c
@@ -650,7 +650,7 @@ static int smsdvb_dvbt_set_frontend(struct dvb_frontend *fe,
                 if (status & FE_HAS_LOCK)
                         return ret;
 
-                /* previous tune didnt lock - enable LNA and tune again */
+                /* previous tune didn't lock - enable LNA and tune again */
                 sms_board_lna_control(client->coredev, 1);
         }
 
diff --git a/drivers/media/dvb/siano/smsir.c b/drivers/media/dvb/siano/smsir.c
index d0e4639ee9db..37bc5c4b8ad8 100644
--- a/drivers/media/dvb/siano/smsir.c
+++ b/drivers/media/dvb/siano/smsir.c
@@ -40,30 +40,29 @@ void sms_ir_event(struct smscore_device_t *coredev, const char *buf, int len)
         const s32 *samples = (const void *)buf;
 
         for (i = 0; i < len >> 2; i++) {
-                struct ir_raw_event ev;
+                DEFINE_IR_RAW_EVENT(ev);
 
                 ev.duration = abs(samples[i]) * 1000; /* Convert to ns */
                 ev.pulse = (samples[i] > 0) ? false : true;
 
-                ir_raw_event_store(coredev->ir.input_dev, &ev);
+                ir_raw_event_store(coredev->ir.dev, &ev);
         }
-        ir_raw_event_handle(coredev->ir.input_dev);
+        ir_raw_event_handle(coredev->ir.dev);
 }
 
 int sms_ir_init(struct smscore_device_t *coredev)
 {
-        struct input_dev *input_dev;
+        int err;
         int board_id = smscore_get_board_id(coredev);
+        struct rc_dev *dev;
 
-        sms_log("Allocating input device");
-        input_dev = input_allocate_device();
-        if (!input_dev) {
+        sms_log("Allocating rc device");
+        dev = rc_allocate_device();
+        if (!dev) {
                 sms_err("Not enough memory");
                 return -ENOMEM;
         }
 
-        coredev->ir.input_dev = input_dev;
-
         coredev->ir.controller = 0;     /* Todo: vega/nova SPI number */
         coredev->ir.timeout = IR_DEFAULT_TIMEOUT;
         sms_log("IR port %d, timeout %d ms",
@@ -75,38 +74,41 @@ int sms_ir_init(struct smscore_device_t *coredev)
         strlcpy(coredev->ir.phys, coredev->devpath, sizeof(coredev->ir.phys));
         strlcat(coredev->ir.phys, "/ir0", sizeof(coredev->ir.phys));
 
-        input_dev->name = coredev->ir.name;
-        input_dev->phys = coredev->ir.phys;
-        input_dev->dev.parent = coredev->device;
+        dev->input_name = coredev->ir.name;
+        dev->input_phys = coredev->ir.phys;
+        dev->dev.parent = coredev->device;
 
 #if 0
         /* TODO: properly initialize the parameters bellow */
-        input_dev->id.bustype = BUS_USB;
-        input_dev->id.version = 1;
-        input_dev->id.vendor = le16_to_cpu(dev->udev->descriptor.idVendor);
-        input_dev->id.product = le16_to_cpu(dev->udev->descriptor.idProduct);
+        dev->input_id.bustype = BUS_USB;
+        dev->input_id.version = 1;
+        dev->input_id.vendor = le16_to_cpu(dev->udev->descriptor.idVendor);
+        dev->input_id.product = le16_to_cpu(dev->udev->descriptor.idProduct);
 #endif
 
-        coredev->ir.props.priv = coredev;
-        coredev->ir.props.driver_type = RC_DRIVER_IR_RAW;
-        coredev->ir.props.allowed_protos = IR_TYPE_ALL;
+        dev->priv = coredev;
+        dev->driver_type = RC_DRIVER_IR_RAW;
+        dev->allowed_protos = RC_TYPE_ALL;
+        dev->map_name = sms_get_board(board_id)->rc_codes;
+        dev->driver_name = MODULE_NAME;
 
-        sms_log("Input device (IR) %s is set for key events", input_dev->name);
+        sms_log("Input device (IR) %s is set for key events", dev->input_name);
 
-        if (ir_input_register(input_dev, sms_get_board(board_id)->rc_codes,
-                              &coredev->ir.props, MODULE_NAME)) {
+        err = rc_register_device(dev);
+        if (err < 0) {
                 sms_err("Failed to register device");
-                input_free_device(input_dev);
-                return -EACCES;
+                rc_free_device(dev);
+                return err;
         }
 
+        coredev->ir.dev = dev;
         return 0;
 }
 
 void sms_ir_exit(struct smscore_device_t *coredev)
 {
-        if (coredev->ir.input_dev)
-                ir_input_unregister(coredev->ir.input_dev);
+        if (coredev->ir.dev)
+                rc_unregister_device(coredev->ir.dev);
 
         sms_log("");
 }
diff --git a/drivers/media/dvb/siano/smsir.h b/drivers/media/dvb/siano/smsir.h
index 926e247523bd..ae92b3a8587e 100644
--- a/drivers/media/dvb/siano/smsir.h
+++ b/drivers/media/dvb/siano/smsir.h
@@ -28,20 +28,19 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define __SMS_IR_H__
 
 #include <linux/input.h>
-#include <media/ir-core.h>
+#include <media/rc-core.h>
 
 #define IR_DEFAULT_TIMEOUT              100
 
 struct smscore_device_t;
 
 struct ir_t {
-        struct input_dev *input_dev;
+        struct rc_dev *dev;
         char name[40];
         char phys[32];
 
         char *rc_codes;
         u64 protocol;
-        struct ir_dev_props props;
 
         u32 timeout;
         u32 controller;
diff --git a/drivers/media/dvb/siano/smsusb.c b/drivers/media/dvb/siano/smsusb.c
index 50d4338610e0..0c8164a2cc36 100644
--- a/drivers/media/dvb/siano/smsusb.c
+++ b/drivers/media/dvb/siano/smsusb.c
@@ -288,8 +288,7 @@ static int smsusb1_setmode(void *context, int mode)
 
 static void smsusb_term_device(struct usb_interface *intf)
 {
-        struct smsusb_device_t *dev =
-                (struct smsusb_device_t *) usb_get_intfdata(intf);
+        struct smsusb_device_t *dev = usb_get_intfdata(intf);
 
         if (dev) {
                 smsusb_stop_streaming(dev);
@@ -298,9 +297,8 @@ static void smsusb_term_device(struct usb_interface *intf)
                 if (dev->coredev)
                         smscore_unregister_device(dev->coredev);
 
-                kfree(dev);
-
                 sms_info("device %p destroyed", dev);
+                kfree(dev);
         }
 
         usb_set_intfdata(intf, NULL);
@@ -445,8 +443,7 @@ static void smsusb_disconnect(struct usb_interface *intf)
 
 static int smsusb_suspend(struct usb_interface *intf, pm_message_t msg)
 {
-        struct smsusb_device_t *dev =
-                (struct smsusb_device_t *)usb_get_intfdata(intf);
+        struct smsusb_device_t *dev = usb_get_intfdata(intf);
         printk(KERN_INFO "%s: Entering status %d.\n", __func__, msg.event);
         smsusb_stop_streaming(dev);
         return 0;
@@ -455,8 +452,7 @@ static int smsusb_suspend(struct usb_interface *intf, pm_message_t msg)
 static int smsusb_resume(struct usb_interface *intf)
 {
         int rc, i;
-        struct smsusb_device_t *dev =
-                (struct smsusb_device_t *)usb_get_intfdata(intf);
+        struct smsusb_device_t *dev = usb_get_intfdata(intf);
         struct usb_device *udev = interface_to_usbdev(intf);
 
         printk(KERN_INFO "%s: Entering.\n", __func__);