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

USB: move many drivers to use DEVICE_ATTR_WO 



Instead of "open coding" a DEVICE_ATTR() define, use the
DEVICE_ATTR_WO() 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: Peter Chen <Peter.Chen@nxp.com>
Cc: Valentina Manea <valentina.manea.m@gmail.com>
Acked-by: default avatarFelipe Balbi <felipe.balbi@linux.intel.com>
Acked-by: default avatarJohan Hovold <johan@kernel.org>
Acked-by: default avatarShuah Khan <shuahkh@osg.samsung.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 7f26ee4b

drivers/usb/chipidea/otg_fsm.c

+2 −2
Original line number Diff line number Diff line
@@ -162,7 +162,7 @@ b_bus_req_store(struct device *dev, struct device_attribute *attr, 
static DEVICE_ATTR_RW(b_bus_req);



static ssize_t

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

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

					const char *buf, size_t count)

{

	struct ci_hdrc	*ci = dev_get_drvdata(dev);
@@ -179,7 +179,7 @@ set_a_clr_err(struct device *dev, struct device_attribute *attr, 


	return count;

}

static DEVICE_ATTR(a_clr_err, S_IWUSR, NULL, set_a_clr_err);

static DEVICE_ATTR_WO(a_clr_err);



static struct attribute *inputs_attrs[] = {

	&dev_attr_a_bus_req.attr,

drivers/usb/gadget/udc/core.c

+4 −4
Original line number Diff line number Diff line
@@ -1417,7 +1417,7 @@ EXPORT_SYMBOL_GPL(usb_gadget_unregister_driver); 


/* ------------------------------------------------------------------------- */



static ssize_t usb_udc_srp_store(struct device *dev,

static ssize_t srp_store(struct device *dev,

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

{

	struct usb_udc		*udc = container_of(dev, struct usb_udc, dev);
@@ -1427,9 +1427,9 @@ static ssize_t usb_udc_srp_store(struct device *dev, 


	return n;

}

static DEVICE_ATTR(srp, S_IWUSR, NULL, usb_udc_srp_store);

static DEVICE_ATTR_WO(srp);



static ssize_t usb_udc_softconn_store(struct device *dev,

static ssize_t soft_connect_store(struct device *dev,

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

{

	struct usb_udc		*udc = container_of(dev, struct usb_udc, dev);
@@ -1453,7 +1453,7 @@ static ssize_t usb_udc_softconn_store(struct device *dev, 


	return n;

}

static DEVICE_ATTR(soft_connect, S_IWUSR, NULL, usb_udc_softconn_store);

static DEVICE_ATTR_WO(soft_connect);



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

			  char *buf)

drivers/usb/phy/phy-mv-usb.c

+2 −2
Original line number Diff line number Diff line
@@ -562,7 +562,7 @@ a_bus_req_store(struct device *dev, struct device_attribute *attr, 
static DEVICE_ATTR_RW(a_bus_req);



static ssize_t

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

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

	      const char *buf, size_t count)

{

	struct mv_otg *mvotg = dev_get_drvdata(dev);
@@ -586,7 +586,7 @@ set_a_clr_err(struct device *dev, struct device_attribute *attr, 
	return count;

}



static DEVICE_ATTR(a_clr_err, S_IWUSR, NULL, set_a_clr_err);

static DEVICE_ATTR_WO(a_clr_err);



static ssize_t

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

drivers/usb/serial/ftdi_sio.c

+2 −2
Original line number Diff line number Diff line
@@ -1691,7 +1691,7 @@ static DEVICE_ATTR_RW(latency_timer); 


/* Write an event character directly to the FTDI register.  The ASCII

   value is in the low 8 bits, with the enable bit in the 9th bit. */

static ssize_t store_event_char(struct device *dev,

static ssize_t event_char_store(struct device *dev,

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

{

	struct usb_serial_port *port = to_usb_serial_port(dev);
@@ -1718,7 +1718,7 @@ static ssize_t store_event_char(struct device *dev, 


	return count;

}

static DEVICE_ATTR(event_char, S_IWUSR, NULL, store_event_char);

static DEVICE_ATTR_WO(event_char);



static int create_sysfs_attrs(struct usb_serial_port *port)

{

drivers/usb/usbip/stub_dev.c

+2 −2
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ static DEVICE_ATTR_RO(usbip_status); 
 * is used to transfer usbip requests by kernel threads. -1 is a magic number

 * by which usbip connection is finished.

 */

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

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

			    const char *buf, size_t count)

{

	struct stub_device *sdev = dev_get_drvdata(dev);
@@ -103,7 +103,7 @@ err: 
	spin_unlock_irq(&sdev->ud.lock);

	return -EINVAL;

}

static DEVICE_ATTR(usbip_sockfd, S_IWUSR, NULL, store_sockfd);

static DEVICE_ATTR_WO(usbip_sockfd);



static int stub_add_files(struct device *dev)

{

CRA Git | Maintained and supported by SUSTech CRA and CCSE