Received: by 10.213.65.68 with SMTP id h4csp1135278imn; Sat, 24 Mar 2018 04:29:22 -0700 (PDT) X-Google-Smtp-Source: AG47ELstTUSzhshuSWgVbDSDbYPXncTCHLi8bH/Y/twxiDiWfyF+O3Vf20Clcppg8zmps1BNnClt X-Received: by 10.98.236.86 with SMTP id k83mr15120401pfh.84.1521890962787; Sat, 24 Mar 2018 04:29:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1521890962; cv=none; d=google.com; s=arc-20160816; b=dU5HeUb9+mb3aG7HjzcCGD2p4TEwkRayvFDjFXqHrQJRWJJRCgwZ1JJYrZmWATftRz 4H4geVFNLLYgcxl6XyDMRFU6hPX9w2xuQOa867Rr+N4IPqr1++NhrS2bnTPGDafavqsK uEE2urRFHcUJt4EJIWS7IX8gahYowqBqJdeeRKhLbM63QikAKoNWFmd3KSitwOFUIUHp G/Wj7TvP4cAl2WdGxQvvmP4Rx/J+slLZkyQPbsi0cWmwvC6B49xlF1jYjenZQr8OHS2L ZoVPhAAPwF/GPiC8vVDe+1RbQ6S1elgUQqTVoNzajckEBJfsp+K8Pg4DYTKJSUGMIzDd cmoA== 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=sS6RqpCYJHfCoB9G2xPSRwuQAij5f9wuCWxOKWCyla0f8eKOpVHqw7Mx1eAVe855ok YmWGBsUdawOhxCTwban7b5wy8HcP+xpu6R2i9Wqp7vhmKG6U88H+zRptb8m49kIdtBhD 3Eus52loC8qYfvYx+n10tuFDOk9ItdWba04aAzmV+2GndMq9r2slQDcoZlYfhOM3WtnH RXs22GMKAWiq+Rr5PSKLdNNgWtHlTTeGB7eeB9KYLqVxXCDARFg4oI1HyVtYOYpsYm5O 2pyJ4sx4s1kcK+rMfwncXDe8mKOF4BKvDKF6RhHGWAS/t9mGix6ni5PFHSP6WsFlviMn Dbfw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=CQ2lAiP2; 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 p1si4721858pfi.355.2018.03.24.04.29.08; Sat, 24 Mar 2018 04:29:22 -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=CQ2lAiP2; 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 S1752130AbeCXL1p (ORCPT + 99 others); Sat, 24 Mar 2018 07:27:45 -0400 Received: from mail-pl0-f65.google.com ([209.85.160.65]:35772 "EHLO mail-pl0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752055AbeCXL1l (ORCPT ); Sat, 24 Mar 2018 07:27:41 -0400 Received: by mail-pl0-f65.google.com with SMTP id p9-v6so9010381pls.2 for ; Sat, 24 Mar 2018 04:27:41 -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=CQ2lAiP254xC1cXkfoaQrWQehDBFIvA36Fn4Glqm7gVyoUf4MV4NOxNh7BdQyVj7xb q1GqMgqvuQKSz7pGnuf/6TIuBzI1KRINlvdCp9PYYSBnRJsBhpKnQuBwqWJrXuqU4yRu aDYPeAUjTTSrYm+smqw9IinCDG+VL5mv2c8fp1T6HnbQkvxsXTlfKQjY/zKeUWVpp9pN O6Q1W74PdD4RBwirX0Qk84KeBL3R07eIxJU8DrJyWG8q8HsgTzkW7cg8ptVWTDX48f7i VyT471ONIgKq3UB1u0HxEMTMz8DjJQAasfCw1OtedTt6bf119VgCkj6W7Wo0rBdRsG5r 2Grg== 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=KXegxOtoAktGnljWwF+A1HrkESn/GFIns7BdSgEgLlsJRyylVwIEv9YeVVD0f5anu+ x+3UEq4dPmkyanwhC6RVPttlH/eTPN8wfQgRUQROeF2lbJALO7kAKlose+bQ1fUjlFs2 K0HfBTwesi/bm7cd0nvGDxxkQn99EdIlvtPeozpjELqICCQp0iUmqAgugiZZRy+2FmM+ PHZLAKIEZBDRvYc50aG2twhkkAE2whOaM55rMQG6GFz0/ofMcKq3EJshhkor7kflAUP+ jMYPC/XsCbIa+nFn2K06aDS6GswSkHz560Ky+nI5/CzxAgIelE5kiKqrouNJyig+yYxj pbQA== X-Gm-Message-State: AElRT7GzUIxCf5S83QCWvYFlIbRUGjNwVTWMXu3CsympNNqBTnbdm7fa 87C0CC4/wgW3YpyLVfM7cWvPww== X-Received: by 2002:a17:902:41:: with SMTP id 59-v6mr33553971pla.248.1521890860924; Sat, 24 Mar 2018 04:27:40 -0700 (PDT) Received: from nibbler.alyptik.lan ([2605:e000:1117:c19a:2e0:1bff:fe70:ea]) by smtp.gmail.com with ESMTPSA id s7sm19383899pfb.150.2018.03.24.04.27.38 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 24 Mar 2018 04:27:40 -0700 (PDT) From: Joey Pabalinas To: linux-kernel@vger.kernel.org Cc: Joey Pabalinas , Greg Kroah-Hartman , Arnd Bergmann , Jiri Slaby , Tomasz Kramkowsk Subject: [PATCH v2 2/4] tty/nozomi: fix inconsistent indentation Date: Sat, 24 Mar 2018 01:27:30 -1000 Message-Id: <20180324112732.29424-3-joeypabalinas@gmail.com> X-Mailer: git-send-email 2.16.3 In-Reply-To: <20180324112732.29424-1-joeypabalinas@gmail.com> References: <20180324112732.29424-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