USB: serial: ftdi_sio: use new GPIO line value setter callbacks

struct gpio_chip now has callbacks for setting line values that return
an integer, allowing to indicate failures. Convert the driver to using
them.

Signed-off-by: Bartosz Golaszewski <bartosz.golaszewski@linaro.org>
Signed-off-by: Johan Hovold <johan@kernel.org>

diff --git a/drivers/usb/serial/ftdi_sio.c b/drivers/usb/serial/ftdi_sio.c
index 6ac7a0a5cf074e0629dfdd3b2330bfa05ca31663..d0a190c6dff38f64e393c11d1bc7759e52876d4e 100644 (file)
--- a/drivers/usb/serial/ftdi_sio.c
+++ b/drivers/usb/serial/ftdi_sio.c
@@ -1857,10 +1857,11 @@ static int ftdi_gpio_get(struct gpio_chip *gc, unsigned int gpio)
        return !!(result & BIT(gpio));
 }
 
-static void ftdi_gpio_set(struct gpio_chip *gc, unsigned int gpio, int value)
+static int ftdi_gpio_set(struct gpio_chip *gc, unsigned int gpio, int value)
 {
        struct usb_serial_port *port = gpiochip_get_data(gc);
        struct ftdi_private *priv = usb_get_serial_port_data(port);
+       int result;
 
        mutex_lock(&priv->gpio_lock);
 
@@ -1869,9 +1870,11 @@ static void ftdi_gpio_set(struct gpio_chip *gc, unsigned int gpio, int value)
        else
                priv->gpio_value &= ~BIT(gpio);
 
-       ftdi_set_cbus_pins(port);
+       result = ftdi_set_cbus_pins(port);
 
        mutex_unlock(&priv->gpio_lock);
+
+       return result;
 }
 
 static int ftdi_gpio_get_multiple(struct gpio_chip *gc, unsigned long *mask,
@@ -1889,19 +1892,22 @@ static int ftdi_gpio_get_multiple(struct gpio_chip *gc, unsigned long *mask,
        return 0;
 }
 
-static void ftdi_gpio_set_multiple(struct gpio_chip *gc, unsigned long *mask,
+static int ftdi_gpio_set_multiple(struct gpio_chip *gc, unsigned long *mask,
                                        unsigned long *bits)
 {
        struct usb_serial_port *port = gpiochip_get_data(gc);
        struct ftdi_private *priv = usb_get_serial_port_data(port);
+       int result;
 
        mutex_lock(&priv->gpio_lock);
 
        priv->gpio_value &= ~(*mask);
        priv->gpio_value |= *bits & *mask;
-       ftdi_set_cbus_pins(port);
+       result = ftdi_set_cbus_pins(port);
 
        mutex_unlock(&priv->gpio_lock);
+
+       return result;
 }
 
 static int ftdi_gpio_direction_get(struct gpio_chip *gc, unsigned int gpio)
@@ -2142,9 +2148,9 @@ static int ftdi_gpio_init(struct usb_serial_port *port)
        priv->gc.direction_output = ftdi_gpio_direction_output;
        priv->gc.init_valid_mask = ftdi_gpio_init_valid_mask;
        priv->gc.get = ftdi_gpio_get;
-       priv->gc.set = ftdi_gpio_set;
+       priv->gc.set_rv = ftdi_gpio_set;
        priv->gc.get_multiple = ftdi_gpio_get_multiple;
-       priv->gc.set_multiple = ftdi_gpio_set_multiple;
+       priv->gc.set_multiple_rv = ftdi_gpio_set_multiple;
        priv->gc.owner = THIS_MODULE;
        priv->gc.parent = &serial->interface->dev;
        priv->gc.base = -1;