Received: by 10.213.65.68 with SMTP id h4csp815069imn; Fri, 23 Mar 2018 17:32:54 -0700 (PDT) X-Google-Smtp-Source: AG47ELsRTt9iBKDEmCDNqed1uUmIjtgDCsZJPS2kKPPYb4cnh/suCFcCaZnuHF6Ut1cnu7rkppRH X-Received: by 2002:a17:902:bc8b:: with SMTP id bb11-v6mr17128128plb.370.1521851574056; Fri, 23 Mar 2018 17:32:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1521851574; cv=none; d=google.com; s=arc-20160816; b=jg032f9DpVKuz25agHKMdYZ/tOUVb9ySLoS28u7hyPZCjmRqU2cM02WNUN9ZuGTdqj YIUpFg1EqwoIZu+3Ci/pngcu9nCvp8idFPOEpvJS9hKezaOK5/XOqTkEy1pIRUwCecC+ 3XarkyhBtEoPbB0BWbzwjZ1FiQ0yzKuh1CjZhbnfVUFGCBlGI4Ix3vClGIqWiH/6m6bl PnMHZu8z8Kmdjo6zkEChU4BjAKJKm+Qnb+NNOABQVVNuR9ogAWfoAPChLcTS/oNbECjA P8EvsMpqVPt4infzNSwtc7jkBeNuryBdeKtd7NStMynJkcld10UDUMOnlRY9lBvxotgs Ntjg== 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:message-id:date :subject:cc:to:from:dkim-signature:arc-authentication-results; bh=0/2CRlx4K53JoeFoyFHBhWN1XlJVmLYOFnC66EUwWso=; b=s9qnkjNci+LGX5goIJjJXB71acWpnumBJurW5tPV1dLT9DQZZY5xpWvKkmLMyU7kMQ imHkWUyo3SNf1jyCExAAIyUUlqS5bdbr0wssgzc7IidvTni0NfI3vHnvgfu6FWkLfHQb cV+2wAlXeYwnXnx8XLZXGN0E677xrD75+5IzGE3ZcD4CO3SGzddmXsCC5+D+NCElkw9S u15u20az9Pe0rZNnacaA0xkTbsCAxc/zlU+aRRajgsIn7WBdCO8uNn6ktcquI8zP96PR mbk+lgcPgifAiep0WuRFWJ+SW6b2Gd0qXosTv4h5iQp3HktwwH3vnyP1CCRiZpkyR+Fz eZAA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=Nrd2Rn77; 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 f127si6710673pgc.49.2018.03.23.17.32.38; Fri, 23 Mar 2018 17:32:54 -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=Nrd2Rn77; 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 S1752050AbeCXAbm (ORCPT + 99 others); Fri, 23 Mar 2018 20:31:42 -0400 Received: from mail-pl0-f65.google.com ([209.85.160.65]:36234 "EHLO mail-pl0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751897AbeCXAbi (ORCPT ); Fri, 23 Mar 2018 20:31:38 -0400 Received: by mail-pl0-f65.google.com with SMTP id 91-v6so613364pld.3 for ; Fri, 23 Mar 2018 17:31:37 -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; bh=0/2CRlx4K53JoeFoyFHBhWN1XlJVmLYOFnC66EUwWso=; b=Nrd2Rn779aQwSevclArk+gtjKiGyyiSuiPU3dTF5Rr8DtgYWipuYKvphWMQeSI1mi8 45NMvTzy3WQYvTaLf+X7G2QkFjYYTMLoefq+es9RYz+k1P5GdVnUAyppTlAdmTDnlsaH A+jWEnqBihO9tqDGc96zDr3lBpgA7quqvzMA1P87hI1Ml3GBE1w+tXFSixnzc4ezLuRO 4cofnusvjug6i3EuPGolO0PdfUzJanheUpCp5JgB+dGRu4leoBnR/R8l8/IhWgyjidyc +HRh4gA8/s4ul94VzuUVX2+lP3qALEbvh/fHDjUKOp+CLVWD4HqnpJikr0PEyuvNrXmE T2zg== 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; bh=0/2CRlx4K53JoeFoyFHBhWN1XlJVmLYOFnC66EUwWso=; b=jZ0xWwxUO+K2XkyDk5n89PhUPfb1rMrXJ+Yr2a+ZNKSb7X/Qo8cliwTAk50nD27Vex JUZHO07a5FJYgr5vgh8ApwWtCcAny+Cy/SbEkX5oFkjmxKRnWuLcvwRn0lUEJ0NBrEdQ HKvyWqRCoQJn0TQOlFyCJVM7++gla7fgMb65/Kk/TseONTZbwz7+LR9SGQIejaPD9y7K cro0958gKT65Wp45m4l2HplQ81LF/Nuiq3XT3SrW51RNeNoMAh0EyaMdJt53GpTjZoEp wH50v3Aiu0W572WXlaTO/g0eQDlIpDtqdZag/qFHFeF7U6kmY0vWtniYHo7ZUfgvcRUt 5jbg== X-Gm-Message-State: AElRT7G7GkO7LfEn/lcMjzHo2UJKB6kB/2uFJzr19x+RLXOxGBuFr9MW 5a1DvhYN+aWTbEpSsp2er3ZV0g== X-Received: by 2002:a17:902:2805:: with SMTP id e5-v6mr23628017plb.89.1521851497237; Fri, 23 Mar 2018 17:31:37 -0700 (PDT) Received: from nibbler.alyptik.lan ([2605:e000:1117:c19a:2e0:1bff:fe70:ea]) by smtp.gmail.com with ESMTPSA id y27sm19682943pfi.156.2018.03.23.17.31.35 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 23 Mar 2018 17:31:36 -0700 (PDT) From: Joey Pabalinas To: linux-kernel@vger.kernel.org Cc: Joey Pabalinas Subject: [PATCH 2/4] tty/nozomi: fix inconsistent indentation Date: Fri, 23 Mar 2018 14:31:25 -1000 Message-Id: <20180324003127.4287-3-joeypabalinas@gmail.com> X-Mailer: git-send-email 2.16.3 In-Reply-To: <20180324003127.4287-1-joeypabalinas@gmail.com> References: <20180324003127.4287-1-joeypabalinas@gmail.com> 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.16.3