Commit 7f26ee4b authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

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: default avatarJoe 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: default avatarAlan Stern <stern@rowland.harvard.edu>
Acked-by: default avatarFelipe Balbi <felipe.balbi@linux.intel.com>
Acked-by: default avatarPete Zaitcev <zaitcev@redhat.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent ed5bd7a4

drivers/usb/atm/ueagle-atm.c

+4 −4
Original line number Diff line number Diff line
@@ -2315,7 +2315,7 @@ out: 


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)

{

	int ret = -ENODEV;
@@ -2376,9 +2376,9 @@ out: 
	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)

{

	int ret = -ENODEV;
@@ -2408,7 +2408,7 @@ out: 
	return ret;

}



static DEVICE_ATTR(stat_delin, S_IRUGO, read_delin, NULL);

static DEVICE_ATTR_RO(stat_delin);



#define UEA_ATTR(name, reset)					\

								\

drivers/usb/class/cdc-acm.c

+6 −6
Original line number Diff line number Diff line
@@ -235,7 +235,7 @@ static int acm_start_wb(struct acm *acm, struct acm_wb *wb) 
/*

 * attributes exported through sysfs

 */

static ssize_t show_caps

static ssize_t bmCapabilities_show

(struct device *dev, struct device_attribute *attr, char *buf)

{

	struct usb_interface *intf = to_usb_interface(dev);
@@ -243,9 +243,9 @@ static ssize_t show_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 usb_interface *intf = to_usb_interface(dev);
@@ -255,9 +255,9 @@ static ssize_t show_country_codes 
	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 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);

}



static DEVICE_ATTR(iCountryCodeRelDate, S_IRUGO, show_country_rel_date, NULL);

static DEVICE_ATTR_RO(iCountryCodeRelDate);

/*

 * Interrupt handlers for various ACM device responses

 */

drivers/usb/class/usblp.c

+2 −2
Original line number Diff line number Diff line
@@ -1066,7 +1066,7 @@ static struct usb_class_driver usblp_class = { 
	.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 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);

}



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,

		       const struct usb_device_id *id)

drivers/usb/phy/phy-tahvo.c

+2 −2
Original line number Diff line number Diff line
@@ -59,13 +59,13 @@ static const unsigned int tahvo_cable[] = { 
	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 tahvo_usb *tu = dev_get_drvdata(device);

	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)

{

drivers/usb/phy/phy-twl6030-usb.c

+2 −2
Original line number Diff line number Diff line
@@ -168,7 +168,7 @@ static int twl6030_usb_ldo_init(struct twl6030_usb *twl) 
	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 twl6030_usb *twl = dev_get_drvdata(dev);
@@ -194,7 +194,7 @@ static ssize_t twl6030_usb_vbus_show(struct device *dev, 


	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)

{

CRA Git | Maintained and supported by SUSTech CRA and CCSE