Received: by 10.192.165.148 with SMTP id m20csp5193951imm; Tue, 24 Apr 2018 15:40:49 -0700 (PDT) X-Google-Smtp-Source: AIpwx48/lSnF366wIfU41dK4Y2Rt6mQIqMEGc9OCUlze244m+PgQJ5U3ztOp9SVChtS9StB7ctGs X-Received: by 10.101.100.193 with SMTP id t1mr17161098pgv.406.1524609649496; Tue, 24 Apr 2018 15:40:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1524609649; cv=none; d=google.com; s=arc-20160816; b=Jdi+cHU0tQsIteHc8JtYjuPXxwY2gJPprtXKnD7UxCPnpn9Cmi2QFmRCNCUdrjvESv 8NAbYIdjxRyJilq49pi3z/nWLypc1CwsbhTQNtLgIdnBuAXk552Rpj66sSeImxtRkpnP Vop+cR3wzHluS1Ny9OtcWGpXBrKLvuiiQ9+OgwjLfQ3oP3ugteFeiIpDCsq2JiYYmk1d UHs4jOy0tvaTQKMLUohrv8P6arxR6z2HZpNoe51bMLDmjJHzDMeu38JdZjNFJxKrSKUN KoviS7NPQToPEwMFXGd7D747Ov5G5tJ2rxr/OvftCCozfIexkIjbamU+8aYokM7cl1Bm 9WHQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:references :in-reply-to:message-id:date:subject:cc:to:from:dkim-signature :arc-authentication-results; bh=GB5WUl0ThGhryoCdEUwmROZDw+JERBQOKQl4cZpVLOY=; b=GMin1lPF7k/vplmOQvPG8xpVn80IihonLirUcKlcM8x05PGIA5ZK1evqJf0SsfWx2a hTKtD/krYOw+fL3io59jleIIEC72D5y8Lg7YemI3cUKAEUJAAoK3cKdlo9G2UoiH8Kip JP4gOGTI2KXSjm1yGISRJtU8NzZqaTSxDPrwkbsQ6g0Nt0P6ylxMicPUepglEuZcIOmg BPLQ3zGvXywOWeKu5A9YXs+r65pvW1Pmej9a5BPP6tJ3n7D5EAtL7YwSvup7lSll7f3k U/cyWUC64QorZfWvtOqICoQgyIscph31WOO6paS+h0XomGh/16xf9y2039uKXKNY4/zT dm5A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=TY56oD3T; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id a5si12494167pgd.628.2018.04.24.15.40.34; Tue, 24 Apr 2018 15:40:49 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=TY56oD3T; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751399AbeDXWjb (ORCPT + 99 others); Tue, 24 Apr 2018 18:39:31 -0400 Received: from mail-pf0-f196.google.com ([209.85.192.196]:42060 "EHLO mail-pf0-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751062AbeDXWjZ (ORCPT ); Tue, 24 Apr 2018 18:39:25 -0400 Received: by mail-pf0-f196.google.com with SMTP id o16so13454442pfk.9 for ; Tue, 24 Apr 2018 15:39:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :in-reply-to:references; bh=GB5WUl0ThGhryoCdEUwmROZDw+JERBQOKQl4cZpVLOY=; b=TY56oD3T+FGOhoPaRKkqM+FPaOvepWmoncnr8KXrQG3uLV4F87FJ82r/FfsAJIzDzG BEiOUBNOXq64yd4jieasJ5laLWlK6rliYRZe6NRgED2+HSNxxiFrSFvupU+Mk4KNwsAS OdiqZVyuFm3na4J0JDdAtBDjsl0ZrYzvQS7gygde2kU1Tj+VQtNSKOegaewCuFxmQSq5 YmAhwOUvUSjaJJBDrqEkz/hPpZ05GidsLXh4LAstepuA0AXNPfD70DvgAscYonFJ6t7x 8v8U1AeYzindW0IMf8zVKhWIcHiZt90rV08+FZKxPH6i+D+71CrRL+nTk6GIw8XA0pPF Aw0w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:in-reply-to:references; bh=GB5WUl0ThGhryoCdEUwmROZDw+JERBQOKQl4cZpVLOY=; b=uZohxPCpJFVh5Wn6A2LxEnygd4lf5VW0OGYcOS4+dsJFKViPX/syyNieOjJ5r6JFuc 9f0goz0mUxFrirv9qJOWQrkUGawE2gBz6q+WSKk8040iPvT1zqYpPW5WR3LWNeUOzUZU EmPtbBLLrkhCF/l68dDOI3xp2C24EkM1dZ58JAnbqyUdBu9MdCUacbQnTWfH7f/9XmKg bEg4x1iZjIZcJJApdCLw60v4h/GVy4fUsRSbhfZyK2eOxfyYlhqFpOnhy6pQ0BsDTvps ADWXngRMxkic2aLyEAxcLWqz9p2XGwHd5o06r5nQppRAUVTR3lN1gNsKHG0EqzlTIAA1 UAqA== X-Gm-Message-State: ALQs6tC4xuLf6cUzBuvaoRpxHfWUp6PlgC161+BpfoSv02kAix4IVZb+ /d20zucWxqz0ZU3Su50CgcFg2g== X-Received: by 10.98.180.2 with SMTP id h2mr25517135pfn.189.1524609564340; Tue, 24 Apr 2018 15:39:24 -0700 (PDT) Received: from hobbes.alyptik.lan ([2605:e000:1117:c0e3:2e0:1bff:fe70:ea]) by smtp.gmail.com with ESMTPSA id g26sm883244pfh.76.2018.04.24.15.39.23 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 24 Apr 2018 15:39:23 -0700 (PDT) From: Joey Pabalinas To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , Arnd Bergmann , Jiri Slaby Subject: [PATCH v3 2/2] tty/nozomi: fix inconsistent indentation Date: Tue, 24 Apr 2018 12:39:15 -1000 Message-Id: X-Mailer: git-send-email 2.17.0.rc1.35.g90bbd502d54fe92035.dirty In-Reply-To: References: In-Reply-To: References: X-Mailer-Send-Delay: 1 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Correct misaligned indentation and remove extraneous spaces. Signed-off-by: Joey Pabalinas 1 file changed, 37 insertions(+), 37 deletions(-) diff --git a/drivers/tty/nozomi.c b/drivers/tty/nozomi.c index f26bf1d1e9ee0e74eb..0fcb4db721d2a42f08 100644 --- a/drivers/tty/nozomi.c +++ b/drivers/tty/nozomi.c @@ -102,41 +102,41 @@ do { \ #define RECEIVE_BUF_MAX 4 -#define R_IIR 0x0000 /* Interrupt Identity Register */ -#define R_FCR 0x0000 /* Flow Control Register */ -#define R_IER 0x0004 /* Interrupt Enable Register */ +#define R_IIR 0x0000 /* Interrupt Identity Register */ +#define R_FCR 0x0000 /* Flow Control Register */ +#define R_IER 0x0004 /* Interrupt Enable Register */ #define NOZOMI_CONFIG_MAGIC 0xEFEFFEFE #define TOGGLE_VALID 0x0000 /* Definition of interrupt tokens */ -#define MDM_DL1 0x0001 -#define MDM_UL1 0x0002 -#define MDM_DL2 0x0004 -#define MDM_UL2 0x0008 -#define DIAG_DL1 0x0010 -#define DIAG_DL2 0x0020 -#define DIAG_UL 0x0040 -#define APP1_DL 0x0080 -#define APP1_UL 0x0100 -#define APP2_DL 0x0200 -#define APP2_UL 0x0400 -#define CTRL_DL 0x0800 -#define CTRL_UL 0x1000 -#define RESET 0x8000 +#define MDM_DL1 0x0001 +#define MDM_UL1 0x0002 +#define MDM_DL2 0x0004 +#define MDM_UL2 0x0008 +#define DIAG_DL1 0x0010 +#define DIAG_DL2 0x0020 +#define DIAG_UL 0x0040 +#define APP1_DL 0x0080 +#define APP1_UL 0x0100 +#define APP2_DL 0x0200 +#define APP2_UL 0x0400 +#define CTRL_DL 0x0800 +#define CTRL_UL 0x1000 +#define RESET 0x8000 -#define MDM_DL (MDM_DL1 | MDM_DL2) -#define MDM_UL (MDM_UL1 | MDM_UL2) -#define DIAG_DL (DIAG_DL1 | DIAG_DL2) +#define MDM_DL (MDM_DL1 | MDM_DL2) +#define MDM_UL (MDM_UL1 | MDM_UL2) +#define DIAG_DL (DIAG_DL1 | DIAG_DL2) /* modem signal definition */ -#define CTRL_DSR 0x0001 -#define CTRL_DCD 0x0002 -#define CTRL_RI 0x0004 -#define CTRL_CTS 0x0008 +#define CTRL_DSR 0x0001 +#define CTRL_DCD 0x0002 +#define CTRL_RI 0x0004 +#define CTRL_CTS 0x0008 -#define CTRL_DTR 0x0001 -#define CTRL_RTS 0x0002 +#define CTRL_DTR 0x0001 +#define CTRL_RTS 0x0002 #define MAX_PORT 4 #define NOZOMI_MAX_PORTS 5 @@ -365,7 +365,7 @@ struct buffer { u8 *data; } __attribute__ ((packed)); -/* Global variables */ +/* Global variables */ static const struct pci_device_id nozomi_pci_tbl[] = { {PCI_DEVICE(0x1931, 0x000c)}, /* Nozomi HSDPA */ {}, @@ -1686,12 +1686,12 @@ static int ntty_tiocmget(struct tty_struct *tty) /* Note: these could change under us but it is not clear this matters if so */ - return (ctrl_ul->RTS ? TIOCM_RTS : 0) | - (ctrl_ul->DTR ? TIOCM_DTR : 0) | - (ctrl_dl->DCD ? TIOCM_CAR : 0) | - (ctrl_dl->RI ? TIOCM_RNG : 0) | - (ctrl_dl->DSR ? TIOCM_DSR : 0) | - (ctrl_dl->CTS ? TIOCM_CTS : 0); + return (ctrl_ul->RTS ? TIOCM_RTS : 0) + | (ctrl_ul->DTR ? TIOCM_DTR : 0) + | (ctrl_dl->DCD ? TIOCM_CAR : 0) + | (ctrl_dl->RI ? TIOCM_RNG : 0) + | (ctrl_dl->DSR ? TIOCM_DSR : 0) + | (ctrl_dl->CTS ? TIOCM_CTS : 0); } /* Sets io controls parameters */ @@ -1722,10 +1722,10 @@ static int ntty_cflags_changed(struct port *port, unsigned long flags, const struct async_icount cnow = port->tty_icount; int ret; - ret = ((flags & TIOCM_RNG) && (cnow.rng != cprev->rng)) || - ((flags & TIOCM_DSR) && (cnow.dsr != cprev->dsr)) || - ((flags & TIOCM_CD) && (cnow.dcd != cprev->dcd)) || - ((flags & TIOCM_CTS) && (cnow.cts != cprev->cts)); + ret = ((flags & TIOCM_RNG) && (cnow.rng != cprev->rng)) + || ((flags & TIOCM_DSR) && (cnow.dsr != cprev->dsr)) + || ((flags & TIOCM_CD) && (cnow.dcd != cprev->dcd)) + || ((flags & TIOCM_CTS) && (cnow.cts != cprev->cts)); *cprev = cnow; -- 2.17.0.rc1.35.g90bbd502d54fe92035.dirty