Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 264891
b: refs/heads/master
c: ea83586
h: refs/heads/master
i:
  264889: 79c48b4
  264887: 8168637
v: v3
  • Loading branch information
Zack Parsons authored and Greg Kroah-Hartman committed Aug 22, 2011
1 parent 29da6ab commit 746667f
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 12 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 53e77df25f64567ee1f55e7d76b8843689c79d9e
refs/heads/master: ea835863950dce6f9c2bddc97d8fc67e1d01a2b9
25 changes: 14 additions & 11 deletions trunk/drivers/usb/misc/usbled.c
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,10 @@ static const struct usb_device_id id_table[] = {
.driver_info = DREAM_CHEEKY_WEBMAIL_NOTIFIER },
{ },
};
MODULE_DEVICE_TABLE (usb, id_table);
MODULE_DEVICE_TABLE(usb, id_table);

struct usb_led {
struct usb_device * udev;
struct usb_device *udev;
unsigned char blue;
unsigned char red;
unsigned char green;
Expand Down Expand Up @@ -113,14 +113,16 @@ static void change_color(struct usb_led *led)
}

#define show_set(value) \
static ssize_t show_##value(struct device *dev, struct device_attribute *attr, char *buf) \
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) \
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); \
Expand All @@ -135,7 +137,8 @@ show_set(blue);
show_set(red);
show_set(green);

static int led_probe(struct usb_interface *interface, const struct usb_device_id *id)
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;
Expand All @@ -150,7 +153,7 @@ static int led_probe(struct usb_interface *interface, const struct usb_device_id
dev->udev = usb_get_dev(udev);
dev->type = id->driver_info;

usb_set_intfdata (interface, dev);
usb_set_intfdata(interface, dev);

retval = device_create_file(&interface->dev, &dev_attr_blue);
if (retval)
Expand Down Expand Up @@ -194,7 +197,7 @@ static int led_probe(struct usb_interface *interface, const struct usb_device_id
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_set_intfdata(interface, NULL);
usb_put_dev(dev->udev);
kfree(dev);
error_mem:
Expand All @@ -205,14 +208,14 @@ static void led_disconnect(struct usb_interface *interface)
{
struct usb_led *dev;

dev = usb_get_intfdata (interface);
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_set_intfdata(interface, NULL);

usb_put_dev(dev->udev);

Expand Down Expand Up @@ -243,8 +246,8 @@ static void __exit usb_led_exit(void)
usb_deregister(&led_driver);
}

module_init (usb_led_init);
module_exit (usb_led_exit);
module_init(usb_led_init);
module_exit(usb_led_exit);

MODULE_AUTHOR(DRIVER_AUTHOR);
MODULE_DESCRIPTION(DRIVER_DESC);
Expand Down

0 comments on commit 746667f

Please sign in to comment.