diff options
| author | Sebastian Andrzej Siewior <bigeasy@linutronix.de> | 2011-06-23 14:28:38 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-07-01 14:31:14 -0700 |
| commit | 019f976e8f268a63b2fcbb662aa2f77f6b07bac6 (patch) | |
| tree | ff073a99dc8a70cc5fe012eaf890931751167820 | |
| parent | aa0747394337e50533badd46e8fb7106bad3311e (diff) | |
usb: gadget: udc-core: wire up sysfs files
This was somehow forgotten.
Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Signed-off-by: Felipe Balbi <balbi@ti.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| -rw-r--r-- | drivers/usb/gadget/udc-core.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/drivers/usb/gadget/udc-core.c b/drivers/usb/gadget/udc-core.c index 2ddb7c8b5b3..05ba4721436 100644 --- a/drivers/usb/gadget/udc-core.c +++ b/drivers/usb/gadget/udc-core.c @@ -44,7 +44,6 @@ struct usb_udc { }; static struct class *udc_class; -static struct device_type udc_device_type; static LIST_HEAD(udc_list); static DEFINE_MUTEX(udc_lock); @@ -144,6 +143,7 @@ static void usb_udc_release(struct device *dev) kfree(udc); } +static const struct attribute_group *usb_udc_attr_groups[]; /** * usb_add_gadget_udc - adds a new gadget to the udc class driver list * @parent: the parent device to this udc. Usually the controller @@ -164,6 +164,7 @@ int usb_add_gadget_udc(struct device *parent, struct usb_gadget *gadget) device_initialize(&udc->dev); udc->dev.release = usb_udc_release; udc->dev.class = udc_class; + udc->dev.groups = usb_udc_attr_groups; udc->dev.parent = parent; ret = dev_set_name(&udc->dev, "%s", kobject_name(&parent->kobj)); if (ret) @@ -373,7 +374,7 @@ static DEVICE_ATTR(soft_connect, S_IWUSR, NULL, usb_udc_softconn_store); static ssize_t usb_udc_speed_show(struct device *dev, struct device_attribute *attr, char *buf) { - struct usb_udc *udc = dev_get_drvdata(dev); + struct usb_udc *udc = container_of(dev, struct usb_udc, dev); struct usb_gadget *gadget = udc->gadget; switch (gadget->speed) { @@ -398,7 +399,7 @@ static DEVICE_ATTR(speed, S_IRUSR, usb_udc_speed_show, NULL); ssize_t usb_udc_##name##_show(struct device *dev, \ struct device_attribute *attr, char *buf) \ { \ - struct usb_udc *udc = dev_get_drvdata(dev); \ + struct usb_udc *udc = container_of(dev, struct usb_udc, dev); \ struct usb_gadget *gadget = udc->gadget; \ \ return snprintf(buf, PAGE_SIZE, "%d\n", gadget->name); \ @@ -468,8 +469,6 @@ static int __init usb_udc_init(void) } udc_class->dev_uevent = usb_udc_uevent; - udc_device_type.groups = usb_udc_attr_groups; - return 0; } subsys_initcall(usb_udc_init); |