[media] redrat3: wire up rc feedback led

Signed-off-by: Sean Young <sean@mess.org>
Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>

diff --git a/drivers/media/rc/Kconfig b/drivers/media/rc/Kconfig
index 5a79c333d45e66308e5b0f75cbc91ed9d60ce329..0bf4ac7276d6a9e6ce311e6a7180f5c079d472e4 100644 (file)
--- a/drivers/media/rc/Kconfig
+++ b/drivers/media/rc/Kconfig
@@ -223,6 +223,8 @@ config IR_REDRAT3
        tristate "RedRat3 IR Transceiver"
        depends on USB_ARCH_HAS_HCD
        depends on RC_CORE
+       select NEW_LEDS
+       select LEDS_CLASS
        select USB
        ---help---
           Say Y here if you want to use a RedRat3 Infrared Transceiver.

diff --git a/drivers/media/rc/redrat3.c b/drivers/media/rc/redrat3.c
index ccd267f131fafc6bddb8a85ebe8ff7859fa4b7b2..094484fac94cdbe52f7832f140f87895e922e631 100644 (file)
--- a/drivers/media/rc/redrat3.c
+++ b/drivers/media/rc/redrat3.c
@@ -47,6 +47,7 @@
 
 #include <asm/unaligned.h>
 #include <linux/device.h>
+#include <linux/leds.h>
 #include <linux/module.h>
 #include <linux/slab.h>
 #include <linux/usb.h>
@@ -186,6 +187,13 @@ struct redrat3_dev {
        struct rc_dev *rc;
        struct device *dev;
 
+       /* led control */
+       struct led_classdev led;
+       atomic_t flash;
+       struct usb_ctrlrequest flash_control;
+       struct urb *flash_urb;
+       u8 flash_in_buf;
+
        /* save off the usb device pointer */
        struct usb_device *udev;
 
@@ -480,9 +488,9 @@ static inline void redrat3_delete(struct redrat3_dev *rr3,
 {
        rr3_ftr(rr3->dev, "%s cleaning up\n", __func__);
        usb_kill_urb(rr3->read_urb);
-
+       usb_kill_urb(rr3->flash_urb);
        usb_free_urb(rr3->read_urb);
-
+       usb_free_urb(rr3->flash_urb);
        usb_free_coherent(udev, le16_to_cpu(rr3->ep_in->wMaxPacketSize),
                          rr3->bulk_in_buf, rr3->dma_in);
 
@@ -850,6 +858,44 @@ out:
        return ret;
 }
 
+static void redrat3_brightness_set(struct led_classdev *led_dev, enum
+                                               led_brightness brightness)
+{
+       struct redrat3_dev *rr3 = container_of(led_dev, struct redrat3_dev,
+                                                                       led);
+
+       if (brightness != LED_OFF && atomic_cmpxchg(&rr3->flash, 0, 1) == 0) {
+               int ret = usb_submit_urb(rr3->flash_urb, GFP_ATOMIC);
+               if (ret != 0) {
+                       dev_dbg(rr3->dev, "%s: unexpected ret of %d\n",
+                               __func__, ret);
+                       atomic_set(&rr3->flash, 0);
+               }
+       }
+}
+
+static void redrat3_led_complete(struct urb *urb)
+{
+       struct redrat3_dev *rr3 = urb->context;
+
+       switch (urb->status) {
+       case 0:
+               break;
+       case -ECONNRESET:
+       case -ENOENT:
+       case -ESHUTDOWN:
+               usb_unlink_urb(urb);
+               return;
+       case -EPIPE:
+       default:
+               dev_dbg(rr3->dev, "Error: urb status = %d\n", urb->status);
+               break;
+       }
+
+       rr3->led.brightness = LED_OFF;
+       atomic_dec(&rr3->flash);
+}
+
 static struct rc_dev *redrat3_init_rc_dev(struct redrat3_dev *rr3)
 {
        struct device *dev = rr3->dev;
@@ -993,10 +1039,35 @@ static int redrat3_dev_probe(struct usb_interface *intf,
        /* default.. will get overridden by any sends with a freq defined */
        rr3->carrier = 38000;
 
+       /* led control */
+       rr3->led.name = "redrat3:red:feedback";
+       rr3->led.default_trigger = "rc-feedback";
+       rr3->led.brightness_set = redrat3_brightness_set;
+       retval = led_classdev_register(&intf->dev, &rr3->led);
+       if (retval)
+               goto error;
+
+       atomic_set(&rr3->flash, 0);
+       rr3->flash_urb = usb_alloc_urb(0, GFP_KERNEL);
+       if (!rr3->flash_urb) {
+               retval = -ENOMEM;
+               goto led_free_error;
+       }
+
+       /* setup packet is 'c0 b9 0000 0000 0001' */
+       rr3->flash_control.bRequestType = 0xc0;
+       rr3->flash_control.bRequest = RR3_BLINK_LED;
+       rr3->flash_control.wLength = cpu_to_le16(1);
+
+       usb_fill_control_urb(rr3->flash_urb, udev, usb_rcvctrlpipe(udev, 0),
+                       (unsigned char *)&rr3->flash_control,
+                       &rr3->flash_in_buf, sizeof(rr3->flash_in_buf),
+                       redrat3_led_complete, rr3);
+
        rr3->rc = redrat3_init_rc_dev(rr3);
        if (!rr3->rc) {
                retval = -ENOMEM;
-               goto error;
+               goto led_free_error;
        }
        setup_timer(&rr3->rx_timeout, redrat3_rx_timeout, (unsigned long)rr3);
 
@@ -1006,6 +1077,8 @@ static int redrat3_dev_probe(struct usb_interface *intf,
        rr3_ftr(dev, "Exiting %s\n", __func__);
        return 0;
 
+led_free_error:
+       led_classdev_unregister(&rr3->led);
 error:
        redrat3_delete(rr3, rr3->udev);
 
@@ -1027,6 +1100,7 @@ static void redrat3_dev_disconnect(struct usb_interface *intf)
 
        usb_set_intfdata(intf, NULL);
        rc_unregister_device(rr3->rc);
+       led_classdev_unregister(&rr3->led);
        del_timer_sync(&rr3->rx_timeout);
        redrat3_delete(rr3, udev);
 
@@ -1037,7 +1111,9 @@ static int redrat3_dev_suspend(struct usb_interface *intf, pm_message_t message)
 {
        struct redrat3_dev *rr3 = usb_get_intfdata(intf);
        rr3_ftr(rr3->dev, "suspend\n");
+       led_classdev_suspend(&rr3->led);
        usb_kill_urb(rr3->read_urb);
+       usb_kill_urb(rr3->flash_urb);
        return 0;
 }
 
@@ -1047,6 +1123,7 @@ static int redrat3_dev_resume(struct usb_interface *intf)
        rr3_ftr(rr3->dev, "resume\n");
        if (usb_submit_urb(rr3->read_urb, GFP_ATOMIC))
                return -EIO;
+       led_classdev_resume(&rr3->led);
        return 0;
 }