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

USB: move many drivers to use DEVICE_ATTR_RW 



Instead of "open coding" a DEVICE_ATTR() define, use the
DEVICE_ATTR_RW() 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: Peter Chen <Peter.Chen@nxp.com>
Cc: Mathias Nyman <mathias.nyman@intel.com>
Acked-by: default avatarFelipe Balbi <felipe.balbi@linux.intel.com>
Acked-by: default avatarAlan Stern <stern@rowland.harvard.edu>
Acked-by: default avatarBin Liu <b-liu@ti.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 32366fc9

drivers/usb/atm/ueagle-atm.c

+3 −3
Original line number Diff line number Diff line
@@ -2280,7 +2280,7 @@ static struct uea_softc *dev_to_uea(struct device *dev) 
	return usbatm->driver_data;

}



static ssize_t read_status(struct device *dev, struct device_attribute *attr,

static ssize_t stat_status_show(struct device *dev, struct device_attribute *attr,

		char *buf)

{

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

}



static ssize_t reboot(struct device *dev, struct device_attribute *attr,

static ssize_t stat_status_store(struct device *dev, struct device_attribute *attr,

		const char *buf, size_t count)

{

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

}



static DEVICE_ATTR(stat_status, S_IWUSR | S_IRUGO, read_status, reboot);

static DEVICE_ATTR_RW(stat_status);



static ssize_t read_human_status(struct device *dev,

			struct device_attribute *attr, char *buf)

drivers/usb/chipidea/core.c

+3 −3
Original line number Diff line number Diff line
@@ -835,7 +835,7 @@ static void ci_get_otg_capable(struct ci_hdrc *ci) 
	}

}



static ssize_t ci_role_show(struct device *dev, struct device_attribute *attr,

static ssize_t role_show(struct device *dev, struct device_attribute *attr,

			  char *buf)

{

	struct ci_hdrc *ci = dev_get_drvdata(dev);
@@ -846,7 +846,7 @@ static ssize_t ci_role_show(struct device *dev, struct device_attribute *attr, 
	return 0;

}



static ssize_t ci_role_store(struct device *dev,

static ssize_t role_store(struct device *dev,

		struct device_attribute *attr, const char *buf, size_t n)

{

	struct ci_hdrc *ci = dev_get_drvdata(dev);
@@ -877,7 +877,7 @@ static ssize_t ci_role_store(struct device *dev, 


	return (ret == 0) ? n : ret;

}

static DEVICE_ATTR(role, 0644, ci_role_show, ci_role_store);

static DEVICE_ATTR_RW(role);



static struct attribute *ci_attrs[] = {

	&dev_attr_role.attr,

drivers/usb/chipidea/otg_fsm.c

+9 −10
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ 


/* Add for otg: interact with user space app */

static ssize_t

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

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

{

	char		*next;

	unsigned	size, t;
@@ -45,7 +45,7 @@ get_a_bus_req(struct device *dev, struct device_attribute *attr, char *buf) 
}



static ssize_t

set_a_bus_req(struct device *dev, struct device_attribute *attr,

a_bus_req_store(struct device *dev, struct device_attribute *attr,

					const char *buf, size_t count)

{

	struct ci_hdrc *ci = dev_get_drvdata(dev);
@@ -75,10 +75,10 @@ set_a_bus_req(struct device *dev, struct device_attribute *attr, 


	return count;

}

static DEVICE_ATTR(a_bus_req, S_IRUGO | S_IWUSR, get_a_bus_req, set_a_bus_req);

static DEVICE_ATTR_RW(a_bus_req);



static ssize_t

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

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

{

	char		*next;

	unsigned	size, t;
@@ -94,7 +94,7 @@ get_a_bus_drop(struct device *dev, struct device_attribute *attr, char *buf) 
}



static ssize_t

set_a_bus_drop(struct device *dev, struct device_attribute *attr,

a_bus_drop_store(struct device *dev, struct device_attribute *attr,

					const char *buf, size_t count)

{

	struct ci_hdrc	*ci = dev_get_drvdata(dev);
@@ -115,11 +115,10 @@ set_a_bus_drop(struct device *dev, struct device_attribute *attr, 


	return count;

}

static DEVICE_ATTR(a_bus_drop, S_IRUGO | S_IWUSR, get_a_bus_drop,

						set_a_bus_drop);

static DEVICE_ATTR_RW(a_bus_drop);



static ssize_t

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

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

{

	char		*next;

	unsigned	size, t;
@@ -135,7 +134,7 @@ get_b_bus_req(struct device *dev, struct device_attribute *attr, char *buf) 
}



static ssize_t

set_b_bus_req(struct device *dev, struct device_attribute *attr,

b_bus_req_store(struct device *dev, struct device_attribute *attr,

					const char *buf, size_t count)

{

	struct ci_hdrc	*ci = dev_get_drvdata(dev);
@@ -160,7 +159,7 @@ set_b_bus_req(struct device *dev, struct device_attribute *attr, 


	return count;

}

static DEVICE_ATTR(b_bus_req, S_IRUGO | S_IWUSR, get_b_bus_req, set_b_bus_req);

static DEVICE_ATTR_RW(b_bus_req);



static ssize_t

set_a_clr_err(struct device *dev, struct device_attribute *attr,

drivers/usb/host/ehci-sysfs.c

+6 −6
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ 




/* Display the ports dedicated to the companion controller */

static ssize_t show_companion(struct device *dev,

static ssize_t companion_show(struct device *dev,

			      struct device_attribute *attr,

			      char *buf)

{
@@ -34,7 +34,7 @@ static ssize_t show_companion(struct device *dev, 
 * Syntax is "[-]portnum", where a leading '-' sign means

 * return control of the port to the EHCI controller.

 */

static ssize_t store_companion(struct device *dev,

static ssize_t companion_store(struct device *dev,

			       struct device_attribute *attr,

			       const char *buf, size_t count)

{
@@ -59,13 +59,13 @@ static ssize_t store_companion(struct device *dev, 
	set_owner(ehci, portnum, new_owner);

	return count;

}

static DEVICE_ATTR(companion, 0644, show_companion, store_companion);

static DEVICE_ATTR_RW(companion);





/*

 * Display / Set uframe_periodic_max

 */

static ssize_t show_uframe_periodic_max(struct device *dev,

static ssize_t uframe_periodic_max_show(struct device *dev,

					struct device_attribute *attr,

					char *buf)

{
@@ -78,7 +78,7 @@ static ssize_t show_uframe_periodic_max(struct device *dev, 
}





static ssize_t store_uframe_periodic_max(struct device *dev,

static ssize_t uframe_periodic_max_store(struct device *dev,

					struct device_attribute *attr,

					const char *buf, size_t count)

{
@@ -143,7 +143,7 @@ out_unlock: 
	spin_unlock_irqrestore (&ehci->lock, flags);

	return ret;

}

static DEVICE_ATTR(uframe_periodic_max, 0644, show_uframe_periodic_max, store_uframe_periodic_max);

static DEVICE_ATTR_RW(uframe_periodic_max);





static inline int create_sysfs_files(struct ehci_hcd *ehci)

drivers/usb/host/fotg210-hcd.c

+3 −4
Original line number Diff line number Diff line
@@ -4693,7 +4693,7 @@ static void scan_isoc(struct fotg210_hcd *fotg210) 


/* Display / Set uframe_periodic_max

 */

static ssize_t show_uframe_periodic_max(struct device *dev,

static ssize_t uframe_periodic_max_show(struct device *dev,

		struct device_attribute *attr, char *buf)

{

	struct fotg210_hcd *fotg210;
@@ -4705,7 +4705,7 @@ static ssize_t show_uframe_periodic_max(struct device *dev, 
}





static ssize_t store_uframe_periodic_max(struct device *dev,

static ssize_t uframe_periodic_max_store(struct device *dev,

		struct device_attribute *attr, const char *buf, size_t count)

{

	struct fotg210_hcd *fotg210;
@@ -4772,8 +4772,7 @@ out_unlock: 
	return ret;

}



static DEVICE_ATTR(uframe_periodic_max, 0644, show_uframe_periodic_max,

		   store_uframe_periodic_max);

static DEVICE_ATTR_RW(uframe_periodic_max);



static inline int create_sysfs_files(struct fotg210_hcd *fotg210)

{

CRA Git | Maintained and supported by SUSTech CRA and CCSE