From patchwork Tue Jun 26 13:43:13 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johan Hovold X-Patchwork-Id: 10489077 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 886D060386 for ; Tue, 26 Jun 2018 13:43:40 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7D05B2896D for ; Tue, 26 Jun 2018 13:43:40 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 71C7828911; Tue, 26 Jun 2018 13:43:40 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1AD3528911 for ; Tue, 26 Jun 2018 13:43:40 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S935265AbeFZNnj (ORCPT ); Tue, 26 Jun 2018 09:43:39 -0400 Received: from mail-lj1-f195.google.com ([209.85.208.195]:45398 "EHLO mail-lj1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S934072AbeFZNni (ORCPT ); Tue, 26 Jun 2018 09:43:38 -0400 Received: by mail-lj1-f195.google.com with SMTP id g3-v6so8837622ljk.12 for ; Tue, 26 Jun 2018 06:43:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id; bh=Fk7APZj4GcWrrQ3ZAguSXKVxv2eE8H64aHiPGxqDtRI=; b=U0lixDO5Aw7NvOGI15cKXbAfm5D2NB7Ozim8mSPJmlg9VsjbtpffC9GI5SV0MrVJS0 ei7P0uGswqbO/C5IWWmhN6H1t71AKT2yB3uoESb48iEzVcwgOSAr3KjdpAIFgTE3Bf4D XXx/o3mFjQDTxfiREN/WG8HkJ2J3POpLGvaWGg7M7o5Czi4TsYVoWEhce9RdVSpaa2Wo oyd6QizybMw8DrFUNv2Hn5au4D3L6VH6UGbGksX39dIeSdPlCGbNze7oYKnChdrfAYpy 5Ga7SGlO56gxGf8mUu5fHnOnCBm5quzOJCFmSpDkwLS2WX98zyFsIZE4upfQSa/dyimz Su5A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id; bh=Fk7APZj4GcWrrQ3ZAguSXKVxv2eE8H64aHiPGxqDtRI=; b=prg1bF1tniK3XuNr2WEzBtSAT8LwUF4PpYFQh6a1toezM29ENhVUak+0gKoGKndJ3v VkwptSV7ITxR14s9WL/+GlJ/ury6Cmo7b8w58LLRS0Gt/fREm4NZpZNPDIgLFxzYUiu+ Cgte7v2flLKydY6if62U8/3Ek/OyBFt66AR2rzBSgfKRgMtXuZL/0w0lx+wBmYeeeAKc OGTeQPOU4tIUBV9gmAg8BMtBUS9sUlIhW4ZJoq7LcNFt2G0sF1tiPOR1LuYwLXs5LCgU gVZ0ndi55cCOkKZQqzsijb9BERX9oO/P63PrNls4OAAPtL1gK8qJsgbFJflsgDeltv3N 9jIw== X-Gm-Message-State: APt69E2u/TWgA+Bcm8kGoC9wS9jExpi6m4PobWYPOPwr0d+oLgG3sLZs obAIbQ/GVBNZrtKM7Jp1j/w= X-Google-Smtp-Source: ADUXVKKnJF3hFdKYmf4vyg1hEf82PwYWVWD05TiKe/DHLm9GzelxI+ngdEicjx4r82a64cSNZDM1yA== X-Received: by 2002:a2e:7c02:: with SMTP id x2-v6mr1203033ljc.71.1530020617113; Tue, 26 Jun 2018 06:43:37 -0700 (PDT) Received: from xi.terra (c-8bb2e655.07-184-6d6c6d4.bbcust.telenor.se. [85.230.178.139]) by smtp.gmail.com with ESMTPSA id d19-v6sm351662lfc.65.2018.06.26.06.43.36 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 26 Jun 2018 06:43:36 -0700 (PDT) Received: from johan by xi.terra with local (Exim 4.91) (envelope-from ) id 1fXoFl-0005nW-W6; Tue, 26 Jun 2018 15:43:30 +0200 From: Johan Hovold To: Johan Hovold Cc: Greg Kroah-Hartman , linux-usb@vger.kernel.org, Sebastian Andrzej Siewior , John Ogness Subject: [PATCH] USB: serial: digi_acceleport: rename tty flag variable Date: Tue, 26 Jun 2018 15:43:13 +0200 Message-Id: <20180626134313.22246-1-johan@kernel.org> X-Mailer: git-send-email 2.18.0 Sender: linux-usb-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-usb@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Add a "tty_" prefix to the tty "flag" variable to avoid any future mixups with the recently added irq-mask "flags" one. Signed-off-by: Johan Hovold Reviewed-by: Greg Kroah-Hartman --- drivers/usb/serial/digi_acceleport.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/usb/serial/digi_acceleport.c b/drivers/usb/serial/digi_acceleport.c index ae512fed08af..e7f244cf2c07 100644 --- a/drivers/usb/serial/digi_acceleport.c +++ b/drivers/usb/serial/digi_acceleport.c @@ -1387,7 +1387,7 @@ static int digi_read_inb_callback(struct urb *urb) int len; int port_status; unsigned char *data; - int flag, throttled; + int tty_flag, throttled; /* short/multiple packet check */ if (urb->actual_length < 2) { @@ -1423,7 +1423,7 @@ static int digi_read_inb_callback(struct urb *urb) data = &buf[3]; /* get flag from port_status */ - flag = 0; + tty_flag = 0; /* overrun is special, not associated with a char */ if (port_status & DIGI_OVERRUN_ERROR) @@ -1432,17 +1432,17 @@ static int digi_read_inb_callback(struct urb *urb) /* break takes precedence over parity, */ /* which takes precedence over framing errors */ if (port_status & DIGI_BREAK_ERROR) - flag = TTY_BREAK; + tty_flag = TTY_BREAK; else if (port_status & DIGI_PARITY_ERROR) - flag = TTY_PARITY; + tty_flag = TTY_PARITY; else if (port_status & DIGI_FRAMING_ERROR) - flag = TTY_FRAME; + tty_flag = TTY_FRAME; /* data length is len-1 (one byte of len is port_status) */ --len; if (len > 0) { tty_insert_flip_string_fixed_flag(&port->port, data, - flag, len); + tty_flag, len); tty_flip_buffer_push(&port->port); } }