lkml.org 
[lkml]   [2020]   [Aug]   [20]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.14 197/228] USB: serial: ftdi_sio: make process-packet buffer unsigned
    Date
    From: Johan Hovold <johan@kernel.org>

    [ Upstream commit ab4cc4ef6724ea588e835fc1e764c4b4407a70b7 ]

    Use an unsigned type for the process-packet buffer argument and give it
    a more apt name.

    Reviewed-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    Signed-off-by: Johan Hovold <johan@kernel.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/usb/serial/ftdi_sio.c | 22 +++++++++++-----------
    1 file changed, 11 insertions(+), 11 deletions(-)

    diff --git a/drivers/usb/serial/ftdi_sio.c b/drivers/usb/serial/ftdi_sio.c
    index a962065227c48..4959fcac5e030 100644
    --- a/drivers/usb/serial/ftdi_sio.c
    +++ b/drivers/usb/serial/ftdi_sio.c
    @@ -2042,12 +2042,12 @@ static int ftdi_prepare_write_buffer(struct usb_serial_port *port,
    #define FTDI_RS_ERR_MASK (FTDI_RS_BI | FTDI_RS_PE | FTDI_RS_FE | FTDI_RS_OE)

    static int ftdi_process_packet(struct usb_serial_port *port,
    - struct ftdi_private *priv, char *packet, int len)
    + struct ftdi_private *priv, unsigned char *buf, int len)
    {
    + unsigned char status;
    + unsigned char *ch;
    int i;
    - char status;
    char flag;
    - char *ch;

    if (len < 2) {
    dev_dbg(&port->dev, "malformed packet\n");
    @@ -2057,7 +2057,7 @@ static int ftdi_process_packet(struct usb_serial_port *port,
    /* Compare new line status to the old one, signal if different/
    N.B. packet may be processed more than once, but differences
    are only processed once. */
    - status = packet[0] & FTDI_STATUS_B0_MASK;
    + status = buf[0] & FTDI_STATUS_B0_MASK;
    if (status != priv->prev_status) {
    char diff_status = status ^ priv->prev_status;

    @@ -2083,7 +2083,7 @@ static int ftdi_process_packet(struct usb_serial_port *port,
    }

    /* save if the transmitter is empty or not */
    - if (packet[1] & FTDI_RS_TEMT)
    + if (buf[1] & FTDI_RS_TEMT)
    priv->transmit_empty = 1;
    else
    priv->transmit_empty = 0;
    @@ -2097,29 +2097,29 @@ static int ftdi_process_packet(struct usb_serial_port *port,
    * data payload to avoid over-reporting.
    */
    flag = TTY_NORMAL;
    - if (packet[1] & FTDI_RS_ERR_MASK) {
    + if (buf[1] & FTDI_RS_ERR_MASK) {
    /* Break takes precedence over parity, which takes precedence
    * over framing errors */
    - if (packet[1] & FTDI_RS_BI) {
    + if (buf[1] & FTDI_RS_BI) {
    flag = TTY_BREAK;
    port->icount.brk++;
    usb_serial_handle_break(port);
    - } else if (packet[1] & FTDI_RS_PE) {
    + } else if (buf[1] & FTDI_RS_PE) {
    flag = TTY_PARITY;
    port->icount.parity++;
    - } else if (packet[1] & FTDI_RS_FE) {
    + } else if (buf[1] & FTDI_RS_FE) {
    flag = TTY_FRAME;
    port->icount.frame++;
    }
    /* Overrun is special, not associated with a char */
    - if (packet[1] & FTDI_RS_OE) {
    + if (buf[1] & FTDI_RS_OE) {
    port->icount.overrun++;
    tty_insert_flip_char(&port->port, 0, TTY_OVERRUN);
    }
    }

    port->icount.rx += len;
    - ch = packet + 2;
    + ch = buf + 2;

    if (port->port.console && port->sysrq) {
    for (i = 0; i < len; i++, ch++) {
    --
    2.25.1


    \
     
     \ /
      Last update: 2020-08-20 12:16    [W:3.374 / U:0.040 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site