diff options
Diffstat (limited to 'drivers/usb/serial/ftdi_sio.c')
-rw-r--r-- | drivers/usb/serial/ftdi_sio.c | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/drivers/usb/serial/ftdi_sio.c b/drivers/usb/serial/ftdi_sio.c index dbf2f2818823..c45f9c0a1b34 100644 --- a/drivers/usb/serial/ftdi_sio.c +++ b/drivers/usb/serial/ftdi_sio.c | |||
@@ -1561,8 +1561,8 @@ static void ftdi_set_max_packet_size(struct usb_serial_port *port) | |||
1561 | * *************************************************************************** | 1561 | * *************************************************************************** |
1562 | */ | 1562 | */ |
1563 | 1563 | ||
1564 | static ssize_t show_latency_timer(struct device *dev, | 1564 | static ssize_t latency_timer_show(struct device *dev, |
1565 | struct device_attribute *attr, char *buf) | 1565 | struct device_attribute *attr, char *buf) |
1566 | { | 1566 | { |
1567 | struct usb_serial_port *port = to_usb_serial_port(dev); | 1567 | struct usb_serial_port *port = to_usb_serial_port(dev); |
1568 | struct ftdi_private *priv = usb_get_serial_port_data(port); | 1568 | struct ftdi_private *priv = usb_get_serial_port_data(port); |
@@ -1572,11 +1572,10 @@ static ssize_t show_latency_timer(struct device *dev, | |||
1572 | return sprintf(buf, "%i\n", priv->latency); | 1572 | return sprintf(buf, "%i\n", priv->latency); |
1573 | } | 1573 | } |
1574 | 1574 | ||
1575 | |||
1576 | /* Write a new value of the latency timer, in units of milliseconds. */ | 1575 | /* Write a new value of the latency timer, in units of milliseconds. */ |
1577 | static ssize_t store_latency_timer(struct device *dev, | 1576 | static ssize_t latency_timer_store(struct device *dev, |
1578 | struct device_attribute *attr, const char *valbuf, | 1577 | struct device_attribute *attr, |
1579 | size_t count) | 1578 | const char *valbuf, size_t count) |
1580 | { | 1579 | { |
1581 | struct usb_serial_port *port = to_usb_serial_port(dev); | 1580 | struct usb_serial_port *port = to_usb_serial_port(dev); |
1582 | struct ftdi_private *priv = usb_get_serial_port_data(port); | 1581 | struct ftdi_private *priv = usb_get_serial_port_data(port); |
@@ -1589,6 +1588,7 @@ static ssize_t store_latency_timer(struct device *dev, | |||
1589 | return -EIO; | 1588 | return -EIO; |
1590 | return count; | 1589 | return count; |
1591 | } | 1590 | } |
1591 | static DEVICE_ATTR_RW(latency_timer); | ||
1592 | 1592 | ||
1593 | /* Write an event character directly to the FTDI register. The ASCII | 1593 | /* Write an event character directly to the FTDI register. The ASCII |
1594 | value is in the low 8 bits, with the enable bit in the 9th bit. */ | 1594 | value is in the low 8 bits, with the enable bit in the 9th bit. */ |
@@ -1616,9 +1616,6 @@ static ssize_t store_event_char(struct device *dev, | |||
1616 | 1616 | ||
1617 | return count; | 1617 | return count; |
1618 | } | 1618 | } |
1619 | |||
1620 | static DEVICE_ATTR(latency_timer, S_IWUSR | S_IRUGO, show_latency_timer, | ||
1621 | store_latency_timer); | ||
1622 | static DEVICE_ATTR(event_char, S_IWUSR, NULL, store_event_char); | 1619 | static DEVICE_ATTR(event_char, S_IWUSR, NULL, store_event_char); |
1623 | 1620 | ||
1624 | static int create_sysfs_attrs(struct usb_serial_port *port) | 1621 | static int create_sysfs_attrs(struct usb_serial_port *port) |