1 files changed, 18 insertions, 18 deletions

diff --git a/drivers/usb/core/endpoint.c b/drivers/usb/core/endpoint.c
index f13a289a0743..39a24021fe4d 100644
--- a/drivers/usb/core/endpoint.c
+++ b/drivers/usb/core/endpoint.c
@@ -32,31 +32,31 @@ struct ep_attribute {
         container_of(_attr, struct ep_attribute, attr)
 
 #define usb_ep_attr(field, format_string)                       \
-static ssize_t show_ep_##field(struct device *dev,              \
+static ssize_t field##_show(struct device *dev,                 \
                                struct device_attribute *attr,   \
                                char *buf)                       \
 {                                                               \
         struct ep_device *ep = to_ep_device(dev);               \
         return sprintf(buf, format_string, ep->desc->field);    \
 }                                                               \
-static DEVICE_ATTR(field, S_IRUGO, show_ep_##field, NULL);
+static DEVICE_ATTR_RO(field)
 
-usb_ep_attr(bLength, "%02x\n")
-usb_ep_attr(bEndpointAddress, "%02x\n")
-usb_ep_attr(bmAttributes, "%02x\n")
-usb_ep_attr(bInterval, "%02x\n")
+usb_ep_attr(bLength, "%02x\n");
+usb_ep_attr(bEndpointAddress, "%02x\n");
+usb_ep_attr(bmAttributes, "%02x\n");
+usb_ep_attr(bInterval, "%02x\n");
 
-static ssize_t show_ep_wMaxPacketSize(struct device *dev,
-                                      struct device_attribute *attr, char *buf)
+static ssize_t wMaxPacketSize_show(struct device *dev,
+                                   struct device_attribute *attr, char *buf)
 {
         struct ep_device *ep = to_ep_device(dev);
         return sprintf(buf, "%04x\n",
                         usb_endpoint_maxp(ep->desc) & 0x07ff);
 }
-static DEVICE_ATTR(wMaxPacketSize, S_IRUGO, show_ep_wMaxPacketSize, NULL);
+static DEVICE_ATTR_RO(wMaxPacketSize);
 
-static ssize_t show_ep_type(struct device *dev, struct device_attribute *attr,
-                            char *buf)
+static ssize_t type_show(struct device *dev, struct device_attribute *attr,
+                         char *buf)
 {
         struct ep_device *ep = to_ep_device(dev);
         char *type = "unknown";
@@ -77,10 +77,10 @@ static ssize_t show_ep_type(struct device *dev, struct device_attribute *attr,
         }
         return sprintf(buf, "%s\n", type);
 }
-static DEVICE_ATTR(type, S_IRUGO, show_ep_type, NULL);
+static DEVICE_ATTR_RO(type);
 
-static ssize_t show_ep_interval(struct device *dev,
-                                struct device_attribute *attr, char *buf)
+static ssize_t interval_show(struct device *dev, struct device_attribute *attr,
+                             char *buf)
 {
         struct ep_device *ep = to_ep_device(dev);
         char unit;
@@ -123,10 +123,10 @@ static ssize_t show_ep_interval(struct device *dev,
 
         return sprintf(buf, "%d%cs\n", interval, unit);
 }
-static DEVICE_ATTR(interval, S_IRUGO, show_ep_interval, NULL);
+static DEVICE_ATTR_RO(interval);
 
-static ssize_t show_ep_direction(struct device *dev,
-                                 struct device_attribute *attr, char *buf)
+static ssize_t direction_show(struct device *dev, struct device_attribute *attr,
+                              char *buf)
 {
         struct ep_device *ep = to_ep_device(dev);
         char *direction;
@@ -139,7 +139,7 @@ static ssize_t show_ep_direction(struct device *dev,
                 direction = "out";
         return sprintf(buf, "%s\n", direction);
 }
-static DEVICE_ATTR(direction, S_IRUGO, show_ep_direction, NULL);
+static DEVICE_ATTR_RO(direction);
 
 static struct attribute *ep_dev_attrs[] = {
         &dev_attr_bLength.attr,