linux-input.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Benjamin Tissoires <benjamin.tissoires@redhat.com>
To: Heiner Kallweit <hkallweit1@gmail.com>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
	Jiri Kosina <jikos@kernel.org>,
	linux-input@vger.kernel.org,
	Linux USB Mailing List <linux-usb@vger.kernel.org>
Subject: Re: [PATCH 2/2] usb: misc: remove outdated USB LED driver
Date: Fri, 17 Jun 2016 10:53:56 +0200	[thread overview]
Message-ID: <20160617085355.GF24234@mail.corp.redhat.com> (raw)
In-Reply-To: <2d50e14a-9ca4-b1ac-8e5e-62a466d97784@gmail.com>

On Jun 17 2016 or thereabouts, Heiner Kallweit wrote:
> The USB LED driver exposes a undocumented sysfs interface and doesn't
> use the standard kernel LED subsystem. It supports three devices:
> 
> Delcom Visual Signal Indicator
> The driver supports generation 1 of the device only which was
> manufactured until 2008. Remove support for this device completely.
> 
> Riso Kagaku RGB LED + Dream Cheeky Webmail Notifier
> These devices are HID compliant and are supported by a new USB LED
> driver under drivers/hid utilizing the kernel LED subsystem.
> 
> So let's remove the old USB LED driver.
> 
> Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
> Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

Acked-by: Benjamin Tissoires <benjamin.tissoires@redhat.com>

Cheers,
Benjamin

> ---
>  drivers/usb/misc/Kconfig  |   9 --
>  drivers/usb/misc/Makefile |   1 -
>  drivers/usb/misc/usbled.c | 273 ----------------------------------------------
>  3 files changed, 283 deletions(-)
>  delete mode 100644 drivers/usb/misc/usbled.c
> 
> diff --git a/drivers/usb/misc/Kconfig b/drivers/usb/misc/Kconfig
> index f7a7fc2..e9c5458 100644
> --- a/drivers/usb/misc/Kconfig
> +++ b/drivers/usb/misc/Kconfig
> @@ -79,15 +79,6 @@ config USB_LCD
>  	  To compile this driver as a module, choose M here: the
>  	  module will be called usblcd.
>  
> -config USB_LED
> -	tristate "USB LED driver support"
> -	help
> -	  Say Y here if you want to connect an USBLED device to your 
> -	  computer's USB port.
> -
> -	  To compile this driver as a module, choose M here: the
> -	  module will be called usbled.
> -
>  config USB_CYPRESS_CY7C63
>  	tristate "Cypress CY7C63xxx USB driver support"
>  	help
> diff --git a/drivers/usb/misc/Makefile b/drivers/usb/misc/Makefile
> index 45fd4ac..4bc755b 100644
> --- a/drivers/usb/misc/Makefile
> +++ b/drivers/usb/misc/Makefile
> @@ -15,7 +15,6 @@ obj-$(CONFIG_USB_IOWARRIOR)		+= iowarrior.o
>  obj-$(CONFIG_USB_ISIGHTFW)		+= isight_firmware.o
>  obj-$(CONFIG_USB_LCD)			+= usblcd.o
>  obj-$(CONFIG_USB_LD)			+= ldusb.o
> -obj-$(CONFIG_USB_LED)			+= usbled.o
>  obj-$(CONFIG_USB_LEGOTOWER)		+= legousbtower.o
>  obj-$(CONFIG_USB_RIO500)		+= rio500.o
>  obj-$(CONFIG_USB_TEST)			+= usbtest.o
> diff --git a/drivers/usb/misc/usbled.c b/drivers/usb/misc/usbled.c
> deleted file mode 100644
> index bdef0d6..0000000
> --- a/drivers/usb/misc/usbled.c
> +++ /dev/null
> @@ -1,273 +0,0 @@
> -/*
> - * USB LED driver
> - *
> - * Copyright (C) 2004 Greg Kroah-Hartman (greg@kroah.com)
> - *
> - *	This program is free software; you can redistribute it and/or
> - *	modify it under the terms of the GNU General Public License as
> - *	published by the Free Software Foundation, version 2.
> - *
> - */
> -
> -#include <linux/kernel.h>
> -#include <linux/errno.h>
> -#include <linux/slab.h>
> -#include <linux/module.h>
> -#include <linux/usb.h>
> -
> -
> -#define DRIVER_AUTHOR "Greg Kroah-Hartman, greg@kroah.com"
> -#define DRIVER_DESC "USB LED Driver"
> -
> -enum led_type {
> -	DELCOM_VISUAL_SIGNAL_INDICATOR,
> -	DREAM_CHEEKY_WEBMAIL_NOTIFIER,
> -	RISO_KAGAKU_LED
> -};
> -
> -/* the Webmail LED made by RISO KAGAKU CORP. decodes a color index
> -   internally, we want to keep the red+green+blue sysfs api, so we decode
> -   from 1-bit RGB to the riso kagaku color index according to this table... */
> -
> -static unsigned const char riso_kagaku_tbl[] = {
> -/* R+2G+4B -> riso kagaku color index */
> -	[0] = 0, /* black   */
> -	[1] = 2, /* red     */
> -	[2] = 1, /* green   */
> -	[3] = 5, /* yellow  */
> -	[4] = 3, /* blue    */
> -	[5] = 6, /* magenta */
> -	[6] = 4, /* cyan    */
> -	[7] = 7  /* white   */
> -};
> -
> -#define RISO_KAGAKU_IX(r,g,b) riso_kagaku_tbl[((r)?1:0)+((g)?2:0)+((b)?4:0)]
> -
> -/* table of devices that work with this driver */
> -static const struct usb_device_id id_table[] = {
> -	{ USB_DEVICE(0x0fc5, 0x1223),
> -			.driver_info = DELCOM_VISUAL_SIGNAL_INDICATOR },
> -	{ USB_DEVICE(0x1d34, 0x0004),
> -			.driver_info = DREAM_CHEEKY_WEBMAIL_NOTIFIER },
> -	{ USB_DEVICE(0x1d34, 0x000a),
> -			.driver_info = DREAM_CHEEKY_WEBMAIL_NOTIFIER },
> -	{ USB_DEVICE(0x1294, 0x1320),
> -			.driver_info = RISO_KAGAKU_LED },
> -	{ },
> -};
> -MODULE_DEVICE_TABLE(usb, id_table);
> -
> -struct usb_led {
> -	struct usb_device	*udev;
> -	unsigned char		blue;
> -	unsigned char		red;
> -	unsigned char		green;
> -	enum led_type		type;
> -};
> -
> -static void change_color(struct usb_led *led)
> -{
> -	int retval = 0;
> -	unsigned char *buffer;
> -	int actlength;
> -
> -	buffer = kmalloc(8, GFP_KERNEL);
> -	if (!buffer) {
> -		dev_err(&led->udev->dev, "out of memory\n");
> -		return;
> -	}
> -
> -	switch (led->type) {
> -	case DELCOM_VISUAL_SIGNAL_INDICATOR: {
> -		unsigned char color = 0x07;
> -
> -		if (led->blue)
> -			color &= ~0x04;
> -		if (led->red)
> -			color &= ~0x02;
> -		if (led->green)
> -			color &= ~0x01;
> -		dev_dbg(&led->udev->dev,
> -			"blue = %d, red = %d, green = %d, color = %.2x\n",
> -			led->blue, led->red, led->green, color);
> -
> -		retval = usb_control_msg(led->udev,
> -					usb_sndctrlpipe(led->udev, 0),
> -					0x12,
> -					0xc8,
> -					(0x02 * 0x100) + 0x0a,
> -					(0x00 * 0x100) + color,
> -					buffer,
> -					8,
> -					2000);
> -		break;
> -	}
> -
> -	case DREAM_CHEEKY_WEBMAIL_NOTIFIER:
> -		dev_dbg(&led->udev->dev,
> -			"red = %d, green = %d, blue = %d\n",
> -			led->red, led->green, led->blue);
> -
> -		buffer[0] = led->red;
> -		buffer[1] = led->green;
> -		buffer[2] = led->blue;
> -		buffer[3] = buffer[4] = buffer[5] = 0;
> -		buffer[6] = 0x1a;
> -		buffer[7] = 0x05;
> -
> -		retval = usb_control_msg(led->udev,
> -					usb_sndctrlpipe(led->udev, 0),
> -					0x09,
> -					0x21,
> -					0x200,
> -					0,
> -					buffer,
> -					8,
> -					2000);
> -		break;
> -
> -	case RISO_KAGAKU_LED:
> -		buffer[0] = RISO_KAGAKU_IX(led->red, led->green, led->blue);
> -		buffer[1] = 0;
> -		buffer[2] = 0;
> -		buffer[3] = 0;
> -		buffer[4] = 0;
> -
> -		retval = usb_interrupt_msg(led->udev,
> -			usb_sndctrlpipe(led->udev, 2),
> -			buffer, 5, &actlength, 1000 /*ms timeout*/);
> -		break;
> -
> -	default:
> -		dev_err(&led->udev->dev, "unknown device type %d\n", led->type);
> -	}
> -
> -	if (retval)
> -		dev_dbg(&led->udev->dev, "retval = %d\n", retval);
> -	kfree(buffer);
> -}
> -
> -#define show_set(value)	\
> -static ssize_t show_##value(struct device *dev, struct device_attribute *attr,\
> -			    char *buf)					\
> -{									\
> -	struct usb_interface *intf = to_usb_interface(dev);		\
> -	struct usb_led *led = usb_get_intfdata(intf);			\
> -									\
> -	return sprintf(buf, "%d\n", led->value);			\
> -}									\
> -static ssize_t set_##value(struct device *dev, struct device_attribute *attr,\
> -			   const char *buf, size_t count)		\
> -{									\
> -	struct usb_interface *intf = to_usb_interface(dev);		\
> -	struct usb_led *led = usb_get_intfdata(intf);			\
> -	int temp = simple_strtoul(buf, NULL, 10);			\
> -									\
> -	led->value = temp;						\
> -	change_color(led);						\
> -	return count;							\
> -}									\
> -static DEVICE_ATTR(value, S_IRUGO | S_IWUSR, show_##value, set_##value);
> -show_set(blue);
> -show_set(red);
> -show_set(green);
> -
> -static int led_probe(struct usb_interface *interface,
> -		     const struct usb_device_id *id)
> -{
> -	struct usb_device *udev = interface_to_usbdev(interface);
> -	struct usb_led *dev = NULL;
> -	int retval = -ENOMEM;
> -
> -	dev = kzalloc(sizeof(struct usb_led), GFP_KERNEL);
> -	if (dev == NULL) {
> -		dev_err(&interface->dev, "out of memory\n");
> -		goto error_mem;
> -	}
> -
> -	dev->udev = usb_get_dev(udev);
> -	dev->type = id->driver_info;
> -
> -	usb_set_intfdata(interface, dev);
> -
> -	retval = device_create_file(&interface->dev, &dev_attr_blue);
> -	if (retval)
> -		goto error;
> -	retval = device_create_file(&interface->dev, &dev_attr_red);
> -	if (retval)
> -		goto error;
> -	retval = device_create_file(&interface->dev, &dev_attr_green);
> -	if (retval)
> -		goto error;
> -
> -	if (dev->type == DREAM_CHEEKY_WEBMAIL_NOTIFIER) {
> -		unsigned char *enable;
> -
> -		enable = kmemdup("\x1f\x02\0\x5f\0\0\x1a\x03", 8, GFP_KERNEL);
> -		if (!enable) {
> -			dev_err(&interface->dev, "out of memory\n");
> -			retval = -ENOMEM;
> -			goto error;
> -		}
> -
> -		retval = usb_control_msg(udev,
> -					usb_sndctrlpipe(udev, 0),
> -					0x09,
> -					0x21,
> -					0x200,
> -					0,
> -					enable,
> -					8,
> -					2000);
> -
> -		kfree(enable);
> -		if (retval != 8)
> -			goto error;
> -	}
> -
> -	dev_info(&interface->dev, "USB LED device now attached\n");
> -	return 0;
> -
> -error:
> -	device_remove_file(&interface->dev, &dev_attr_blue);
> -	device_remove_file(&interface->dev, &dev_attr_red);
> -	device_remove_file(&interface->dev, &dev_attr_green);
> -	usb_set_intfdata(interface, NULL);
> -	usb_put_dev(dev->udev);
> -	kfree(dev);
> -error_mem:
> -	return retval;
> -}
> -
> -static void led_disconnect(struct usb_interface *interface)
> -{
> -	struct usb_led *dev;
> -
> -	dev = usb_get_intfdata(interface);
> -
> -	device_remove_file(&interface->dev, &dev_attr_blue);
> -	device_remove_file(&interface->dev, &dev_attr_red);
> -	device_remove_file(&interface->dev, &dev_attr_green);
> -
> -	/* first remove the files, then set the pointer to NULL */
> -	usb_set_intfdata(interface, NULL);
> -
> -	usb_put_dev(dev->udev);
> -
> -	kfree(dev);
> -
> -	dev_info(&interface->dev, "USB LED now disconnected\n");
> -}
> -
> -static struct usb_driver led_driver = {
> -	.name =		"usbled",
> -	.probe =	led_probe,
> -	.disconnect =	led_disconnect,
> -	.id_table =	id_table,
> -};
> -
> -module_usb_driver(led_driver);
> -
> -MODULE_AUTHOR(DRIVER_AUTHOR);
> -MODULE_DESCRIPTION(DRIVER_DESC);
> -MODULE_LICENSE("GPL");
> -- 
> 2.8.3
> 

  reply	other threads:[~2016-06-17  8:54 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-06-17  6:11 [PATCH 2/2] usb: misc: remove outdated USB LED driver Heiner Kallweit
2016-06-17  8:53 ` Benjamin Tissoires [this message]
     [not found] ` <2d50e14a-9ca4-b1ac-8e5e-62a466d97784-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2016-06-17 20:33   ` Jiri Kosina
2016-06-17 22:04     ` Greg Kroah-Hartman

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20160617085355.GF24234@mail.corp.redhat.com \
    --to=benjamin.tissoires@redhat.com \
    --cc=gregkh@linuxfoundation.org \
    --cc=hkallweit1@gmail.com \
    --cc=jikos@kernel.org \
    --cc=linux-input@vger.kernel.org \
    --cc=linux-usb@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).