redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

USB: move many drivers to use DEVICE_ATTR_RO 

Instead of "open coding" a DEVICE_ATTR() define, use the
DEVICE_ATTR_RO() macro instead, which does everything properly instead.

This does require a few static functions to be renamed to work properly,
but thanks to a script from Joe Perches, this was easily done.

Reported-by: Joe Perches <joe@perches.com>
Cc: Matthieu CASTET <castet.matthieu@free.fr>
Cc: Stanislaw Gruszka <stf_xl@wp.pl>
Cc: Oliver Neukum <oneukum@suse.com>
Acked-by: Alan Stern <stern@rowland.harvard.edu>
Acked-by: Felipe Balbi <felipe.balbi@linux.intel.com>
Acked-by: Pete Zaitcev <zaitcev@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
hifive-unleashed-5.1
Greg Kroah-Hartman 2018-01-23 11:24:06 +01:00
parent ed5bd7a47f
commit 7f26ee4b56
6 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/usb/atm/ueagle-atm.c
View File

@ -2315,7 +2315,7 @@ out:
static DEVICE_ATTR_RW(stat_status); static DEVICE_ATTR_RW(stat_status);
static ssize_t read_human_status(struct device *dev, static ssize_t stat_human_status_show(struct device *dev,
struct device_attribute *attr, char *buf) struct device_attribute *attr, char *buf)
{ {
int ret = -ENODEV; int ret = -ENODEV;
@ -2376,9 +2376,9 @@ out:
return ret; return ret;
} }
static DEVICE_ATTR(stat_human_status, S_IRUGO, read_human_status, NULL); static DEVICE_ATTR_RO(stat_human_status);
static ssize_t read_delin(struct device *dev, struct device_attribute *attr, static ssize_t stat_delin_show(struct device *dev, struct device_attribute *attr,
char *buf) char *buf)
{ {
int ret = -ENODEV; int ret = -ENODEV;
@ -2408,7 +2408,7 @@ out:
return ret; return ret;
} }
static DEVICE_ATTR(stat_delin, S_IRUGO, read_delin, NULL); static DEVICE_ATTR_RO(stat_delin);
#define UEA_ATTR(name, reset) \ #define UEA_ATTR(name, reset) \
\ \

12
drivers/usb/class/cdc-acm.c
View File

@ -235,7 +235,7 @@ static int acm_start_wb(struct acm *acm, struct acm_wb *wb)
/* /*
* attributes exported through sysfs * attributes exported through sysfs
*/ */
static ssize_t show_caps static ssize_t bmCapabilities_show
(struct device *dev, struct device_attribute *attr, char *buf) (struct device *dev, struct device_attribute *attr, char *buf)
{ {
struct usb_interface *intf = to_usb_interface(dev); struct usb_interface *intf = to_usb_interface(dev);
@ -243,9 +243,9 @@ static ssize_t show_caps
return sprintf(buf, "%d", acm->ctrl_caps); return sprintf(buf, "%d", acm->ctrl_caps);
} }
static DEVICE_ATTR(bmCapabilities, S_IRUGO, show_caps, NULL); static DEVICE_ATTR_RO(bmCapabilities);
static ssize_t show_country_codes static ssize_t wCountryCodes_show
(struct device *dev, struct device_attribute *attr, char *buf) (struct device *dev, struct device_attribute *attr, char *buf)
{ {
struct usb_interface *intf = to_usb_interface(dev); struct usb_interface *intf = to_usb_interface(dev);
@ -255,9 +255,9 @@ static ssize_t show_country_codes
return acm->country_code_size; return acm->country_code_size;
} }
static DEVICE_ATTR(wCountryCodes, S_IRUGO, show_country_codes, NULL); static DEVICE_ATTR_RO(wCountryCodes);
static ssize_t show_country_rel_date static ssize_t iCountryCodeRelDate_show
(struct device *dev, struct device_attribute *attr, char *buf) (struct device *dev, struct device_attribute *attr, char *buf)
{ {
struct usb_interface *intf = to_usb_interface(dev); struct usb_interface *intf = to_usb_interface(dev);
@ -266,7 +266,7 @@ static ssize_t show_country_rel_date
return sprintf(buf, "%d", acm->country_rel_date); return sprintf(buf, "%d", acm->country_rel_date);
} }
static DEVICE_ATTR(iCountryCodeRelDate, S_IRUGO, show_country_rel_date, NULL); static DEVICE_ATTR_RO(iCountryCodeRelDate);
/* /*
* Interrupt handlers for various ACM device responses * Interrupt handlers for various ACM device responses
*/ */

4
drivers/usb/class/usblp.c
View File

@ -1066,7 +1066,7 @@ static struct usb_class_driver usblp_class = {
.minor_base = USBLP_MINOR_BASE, .minor_base = USBLP_MINOR_BASE,
}; };
static ssize_t usblp_show_ieee1284_id(struct device *dev, struct device_attribute *attr, char *buf) static ssize_t ieee1284_id_show(struct device *dev, struct device_attribute *attr, char *buf)
{ {
struct usb_interface *intf = to_usb_interface(dev); struct usb_interface *intf = to_usb_interface(dev);
struct usblp *usblp = usb_get_intfdata(intf); struct usblp *usblp = usb_get_intfdata(intf);
@ -1078,7 +1078,7 @@ static ssize_t usblp_show_ieee1284_id(struct device *dev, struct device_attribut
return sprintf(buf, "%s", usblp->device_id_string+2); return sprintf(buf, "%s", usblp->device_id_string+2);
} }
static DEVICE_ATTR(ieee1284_id, S_IRUGO, usblp_show_ieee1284_id, NULL); static DEVICE_ATTR_RO(ieee1284_id);
static int usblp_probe(struct usb_interface *intf, static int usblp_probe(struct usb_interface *intf,
const struct usb_device_id *id) const struct usb_device_id *id)

4
drivers/usb/phy/phy-tahvo.c
View File

@ -59,13 +59,13 @@ static const unsigned int tahvo_cable[] = {
EXTCON_NONE, EXTCON_NONE,
}; };
static ssize_t vbus_state_show(struct device *device, static ssize_t vbus_show(struct device *device,
struct device_attribute *attr, char *buf) struct device_attribute *attr, char *buf)
{ {
struct tahvo_usb *tu = dev_get_drvdata(device); struct tahvo_usb *tu = dev_get_drvdata(device);
return sprintf(buf, "%s\n", tu->vbus_state ? "on" : "off"); return sprintf(buf, "%s\n", tu->vbus_state ? "on" : "off");
} }
static DEVICE_ATTR(vbus, 0444, vbus_state_show, NULL); static DEVICE_ATTR_RO(vbus);
static void check_vbus_state(struct tahvo_usb *tu) static void check_vbus_state(struct tahvo_usb *tu)
{ {

4
drivers/usb/phy/phy-twl6030-usb.c
View File

@ -168,7 +168,7 @@ static int twl6030_usb_ldo_init(struct twl6030_usb *twl)
return 0; return 0;
} }
static ssize_t twl6030_usb_vbus_show(struct device *dev, static ssize_t vbus_show(struct device *dev,
struct device_attribute *attr, char *buf) struct device_attribute *attr, char *buf)
{ {
struct twl6030_usb *twl = dev_get_drvdata(dev); struct twl6030_usb *twl = dev_get_drvdata(dev);
@ -194,7 +194,7 @@ static ssize_t twl6030_usb_vbus_show(struct device *dev,
return ret; return ret;
} }
static DEVICE_ATTR(vbus, 0444, twl6030_usb_vbus_show, NULL); static DEVICE_ATTR_RO(vbus);
static irqreturn_t twl6030_usb_irq(int irq, void *_twl) static irqreturn_t twl6030_usb_irq(int irq, void *_twl)
{ {

4
drivers/usb/storage/sierra_ms.c
View File

@ -90,7 +90,7 @@ static void debug_swoc(const struct device *dev, struct swoc_info *swocInfo)
} }
static ssize_t show_truinst(struct device *dev, struct device_attribute *attr, static ssize_t truinst_show(struct device *dev, struct device_attribute *attr,
char *buf) char *buf)
{ {
struct swoc_info *swocInfo; struct swoc_info *swocInfo;
@ -122,7 +122,7 @@ static ssize_t show_truinst(struct device *dev, struct device_attribute *attr,
} }
return result; return result;
} }
static DEVICE_ATTR(truinst, S_IRUGO, show_truinst, NULL); static DEVICE_ATTR_RO(truinst);
int sierra_ms_init(struct us_data *us) int sierra_ms_init(struct us_data *us)
{ {