Merge branch 'acpi-bind'

[karo-tx-linux.git] / drivers / usb / gadget / composite.c

diff --git a/drivers/usb/gadget/composite.c b/drivers/usb/gadget/composite.c
index 55f4df60f327a654bf5863bdc68d2e79d82a8530..d4f0f3305759876a2fc1e81cb96e0ade69918eca 100644 (file)
--- a/drivers/usb/gadget/composite.c
+++ b/drivers/usb/gadget/composite.c
@@ -1497,17 +1497,15 @@ void composite_disconnect(struct usb_gadget *gadget)
 
 /*-------------------------------------------------------------------------*/
 
-static ssize_t composite_show_suspended(struct device *dev,
-                                       struct device_attribute *attr,
-                                       char *buf)
+static ssize_t suspended_show(struct device *dev, struct device_attribute *attr,
+                             char *buf)
 {
        struct usb_gadget *gadget = dev_to_usb_gadget(dev);
        struct usb_composite_dev *cdev = get_gadget_data(gadget);
 
        return sprintf(buf, "%d\n", cdev->suspended);
 }
-
-static DEVICE_ATTR(suspended, 0444, composite_show_suspended, NULL);
+static DEVICE_ATTR_RO(suspended);
 
 static void __composite_unbind(struct usb_gadget *gadget, bool unbind_driver)
 {