From patchwork Sat Aug 11 01:34:23 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "\(Exiting\) Baolin Wang" X-Patchwork-Id: 143969 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp587694ljj; Fri, 10 Aug 2018 18:35:13 -0700 (PDT) X-Google-Smtp-Source: AA+uWPwq/uofndadt5GCAVgL7Rid0PvFky3e/4U9CbGe3iDPbse0Z6TepiTaSdagaWPAPhrH4hFn X-Received: by 2002:a63:121a:: with SMTP id h26-v6mr8708416pgl.316.1533951313748; Fri, 10 Aug 2018 18:35:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1533951313; cv=none; d=google.com; s=arc-20160816; b=IXG9nzA0EkamZjWVNdRzEOSrvdeCh8jLXzlfg+2FWavsbm/L1S131jcutdnJUfnYny abm9rBGvB6s5apSn+ABZO2U5gH8TYuGmWuysLAub0ypBPpe8bS14UoUJQYVBZ1Ntq31C NchtVQfiEexUUxktcue7N3EWcVKVGHmn1NB1OWAANIZadlmCPKkLx8Qf797WHFHZe8SP NIHOcnK7/wSKDgHrG3DANUNX4ea9rGnhZuQVUWFo6hx3Qq5Wf0I7QVllSGV1frLelQV8 ZbleeJwHQCvzwsTQhOih8AUE/n6a7itWlHuqWETSPR77DF+eeWzHripf98ARgf7U+50H SO+A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:date:subject:cc:to:from :dkim-signature:arc-authentication-results; bh=6D8lsRhhjwMG3VXiYtID+Ot7ZV5JG34DBjU41vN98IY=; b=oZyjqac9shOLPVqe4nZiXr9WxgPOWCmDhGOBW1+ZfyIDNSyZw9nebd/U9DFIPcLqvH b8mc7MQunKZqzB0zbpG5+zDLdYQFk3XH4f9IL+5Glax8igVAvKU/MJyqRD1yo0avXd41 gMuESVdwyVZS84El1TmlcXBiu7y8G9O46Vdcu6ujq4M3iFs5UKnOUgOL2pM3+FMr6+x1 rWmVgWnxhjQRDYapbB4RK0/EuR2ORGaRcfVLyd3xmsoiMehFMprCfh4nLoJtPSaTNAYx +erc9uKmGUXEgDJpYqPgsaqi3MJqHY/f4vRK4EDP9O7EyBWsAzEvFYGtBjaQwOuUCQbc TOmw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=g45qt2En; 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=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id a9-v6si11468480pgj.224.2018.08.10.18.35.13; Fri, 10 Aug 2018 18:35:13 -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=@linaro.org header.s=google header.b=g45qt2En; 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=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727154AbeHKEH2 (ORCPT + 31 others); Sat, 11 Aug 2018 00:07:28 -0400 Received: from mail-pf1-f193.google.com ([209.85.210.193]:46828 "EHLO mail-pf1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726457AbeHKEH1 (ORCPT ); Sat, 11 Aug 2018 00:07:27 -0400 Received: by mail-pf1-f193.google.com with SMTP id u24-v6so5254044pfn.13 for ; Fri, 10 Aug 2018 18:35:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id; bh=6D8lsRhhjwMG3VXiYtID+Ot7ZV5JG34DBjU41vN98IY=; b=g45qt2EnA8N2D/zpweDwRcF/rpjeRqLpWfxu+sJobaz+HP4bjGVPJIUQpkWWFwofBt 0xv1jXkxF3GTmzz4pCeE/GonhLa4f6wZPufY9Du4LpkNavmX39fqVuJRs/UgKhCol5MG vEKclVi8MJSDHM7G/9LOBNHIFkOt8JDZSNLC0= 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; bh=6D8lsRhhjwMG3VXiYtID+Ot7ZV5JG34DBjU41vN98IY=; b=Is44n1/wJzs1hahLm+bZq0qM+7UR+HLw4nv/ckkvSl6+kaCTKiead45ruQCiX1C+xu +AZ1JuuyQ57fG0Ba2CwsIZuDKIi31lyJHBRM/NTvaa+7rGtnCLpezM8TLrtIOrxCtZzW +Kq9uKE8xI5cGwKllBO8tcIeZ4LVjGeKwLtXBGXd4cB6XNyT2JN8ECgLbRdUcsFrAToZ +SnHuSpz2SYYB9slnVK0PP5rm9fv9W8Jczqy52eQ1rPQQgHaZQHDvD+ARYHffgYXaUtC qlLpFqPgUV17/9ifj0Y+pHNI1CkLXPI73Hskifxqdx8EO4h00459RnNvRhSPnR/1pBhg ZEwA== X-Gm-Message-State: AOUpUlH0mPq32/jdW4HaM8LejI5j5tQxev6rgpPL5CUdLfAjfQBmthM8 EHyDYyxDojgDyf7sI4nY3BjIrA== X-Received: by 2002:a63:920c:: with SMTP id o12-v6mr8576702pgd.141.1533951307312; Fri, 10 Aug 2018 18:35:07 -0700 (PDT) Received: from ubuntu.localdomain ([45.56.155.48]) by smtp.gmail.com with ESMTPSA id d22-v6sm21722373pfk.69.2018.08.10.18.35.02 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 10 Aug 2018 18:35:06 -0700 (PDT) From: Baolin Wang To: gregkh@linuxfoundation.org, jslaby@suse.com Cc: orsonzhai@gmail.com, baolin.wang@linaro.org, zhang.lyra@gmail.com, broonie@kernel.org, linux-serial@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 1/5] serial: sprd: Remove unused structure Date: Fri, 10 Aug 2018 18:34:23 -0700 Message-Id: <50e1f7f4673bff9d71936b4eb34cbf2571b0fda9.1533950271.git.baolin.wang@linaro.org> X-Mailer: git-send-email 1.9.1 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Remove the unused reg_backup structure. Signed-off-by: Baolin Wang --- drivers/tty/serial/sprd_serial.c | 11 ----------- 1 file changed, 11 deletions(-) -- 1.9.1 Acked-by: Chunyan Zhang diff --git a/drivers/tty/serial/sprd_serial.c b/drivers/tty/serial/sprd_serial.c index 828f114..1b0e3fb 100644 --- a/drivers/tty/serial/sprd_serial.c +++ b/drivers/tty/serial/sprd_serial.c @@ -95,19 +95,8 @@ #define SPRD_IMSR_BREAK_DETECT BIT(7) #define SPRD_IMSR_TIMEOUT BIT(13) -struct reg_backup { - u32 ien; - u32 ctrl0; - u32 ctrl1; - u32 ctrl2; - u32 clkd0; - u32 clkd1; - u32 dspwait; -}; - struct sprd_uart_port { struct uart_port port; - struct reg_backup reg_bak; char name[16]; }; From patchwork Sat Aug 11 01:34:24 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "\(Exiting\) Baolin Wang" X-Patchwork-Id: 143970 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp587772ljj; Fri, 10 Aug 2018 18:35:20 -0700 (PDT) X-Google-Smtp-Source: AA+uWPzK5gtX6gqxBSHDKiDD6xXg5On2GfEJXDgiDEON+FNgZhwTWJnL1jdZDCZ5v/LxhaRTzWi1 X-Received: by 2002:a17:902:5a4c:: with SMTP id f12-v6mr8103799plm.253.1533951319852; Fri, 10 Aug 2018 18:35:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1533951319; cv=none; d=google.com; s=arc-20160816; b=CCp4oAPCpLvtaACVtOzQOiD0Hht3gpJGOE0fzT4mw8bT71zA05zkJfh+ItMfII7gdJ 1Tl+QACa7ux/OvIE/ImHGTX2AY9F6B0QERRcnuFfWi+WA+dA6z65wDX7EJ9BhxGO91WC 7Q2kn5bu0j8ySIqtQ2uCyyns/Z00FX5G+s/pcjZgSvL8mw7eAR5H3m5j0+7oAnCIj4Xd 7galrC/W/cRK6wg80RNbIqqIYSSKcATrgWeaxR8PELStcxNzdT0U4e3wc0DwQ64wfo1E a+h1+AB4aAgGnr7Sxi/zFTPrrT/dkhPVnem6cUXjSjWHRTFDdYQ80EIjy3qeeasXvk/H Znng== 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=hh3dhIR2H2hQcGSB7bAcef0nVcc7E+h6SPFH2kmnZ3g=; b=zQXNhZHxFiXZuNAvKGL5nmYVGl/mQID6Lv2NHoX9RoOp9JV1c4mJS3SDiIElQBEvlS IxmHxu3nEjcfxcSzvcgrM68D4vY5h+ahTy999O/Ahv6teJIp0NRdP5oVJL1US/z5RhKz FJ3t/g6RwwpxW06gC2LWfo9lEuJ+llZY+gdtgR+6RXZixVKXXK14Rvi7A2wZ8hgE26MH L3vnMgVVRaZrk+DcYaXyrwPtPBQ89jUrQ4ybzy5jwRTOfuKSAu4oZ1fOwZGbnDNHcjQy 3aIIiOL+Nc+mnC/KW6tBs/PX5dStHssCj1ogYDru7hNIlkIGMxhN+kPOtakpGhmhlYi5 +AeA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=G4GKmli8; 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=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id r15-v6si9818936pgf.403.2018.08.10.18.35.19; Fri, 10 Aug 2018 18:35:19 -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=@linaro.org header.s=google header.b=G4GKmli8; 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=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727235AbeHKEHd (ORCPT + 31 others); Sat, 11 Aug 2018 00:07:33 -0400 Received: from mail-pl0-f67.google.com ([209.85.160.67]:32872 "EHLO mail-pl0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725922AbeHKEHd (ORCPT ); Sat, 11 Aug 2018 00:07:33 -0400 Received: by mail-pl0-f67.google.com with SMTP id b90-v6so4717460plb.0 for ; Fri, 10 Aug 2018 18:35:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :in-reply-to:references; bh=hh3dhIR2H2hQcGSB7bAcef0nVcc7E+h6SPFH2kmnZ3g=; b=G4GKmli8ggpF1cOSDJn7EVDxP6ZKj4bGPmxxtW5+4x1EYeyc9AMubKfbIL8G7cgyCb gmay90wr4lAEw3Gl0/UCnX2JmOnO64Md3jSonr4qIaLIy4/lVzY38WI6f8g4eYdi7Vn6 plBBZ54EKY9KdgG80TBz9B2ZAMM+QMQTAc9xY= 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=hh3dhIR2H2hQcGSB7bAcef0nVcc7E+h6SPFH2kmnZ3g=; b=haMk5/PvDGvy+tYC+ENPUI8lzkesRfneCAvUR5OiVSHR7HbXGdOJDCRVzedkLoyyLO rzTp2HGdgt9nAYYcatp4HkkbSScdMKpalv7r3cvyQqY++ixjZqeHIkrgN9daxeC1YIHo Xil0BPQKIDk+Jum+Fa9YfyKop8MFr0W9NQZX+dXboWdzkjhTGv4LfF97vu87CveV14LK rgwTAKQmiTD6rLQUqcdpAUpcjbGWkkKpeneK4/GO6r7OUFLuBptua4eVG2aKPnFA850p nnoCSV4QFUA+Q1GqHou7UgfArpXZ05Wx0SLYKaKy17Bgk0aH6DI+5Zy7AwGOVITOSFrn I0dA== X-Gm-Message-State: AOUpUlGGnvcWGe0EwQtGtQz27dJ51FN3f3+1wbi82P7tcllC+YmRS2H2 4uhhs2rYvOXuHvj+hWZ+GOBc+Yyn8+ykpA== X-Received: by 2002:a17:902:9a01:: with SMTP id v1-v6mr8290901plp.20.1533951312512; Fri, 10 Aug 2018 18:35:12 -0700 (PDT) Received: from ubuntu.localdomain ([45.56.155.48]) by smtp.gmail.com with ESMTPSA id d22-v6sm21722373pfk.69.2018.08.10.18.35.07 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 10 Aug 2018 18:35:12 -0700 (PDT) From: Baolin Wang To: gregkh@linuxfoundation.org, jslaby@suse.com Cc: orsonzhai@gmail.com, baolin.wang@linaro.org, zhang.lyra@gmail.com, broonie@kernel.org, linux-serial@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 2/5] serial: sprd: Use readable macros instead of magic number Date: Fri, 10 Aug 2018 18:34:24 -0700 Message-Id: <7b3341ab8778d31bf564bdcbb04b8c6e09fa4d6d.1533950271.git.baolin.wang@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <50e1f7f4673bff9d71936b4eb34cbf2571b0fda9.1533950271.git.baolin.wang@linaro.org> References: <50e1f7f4673bff9d71936b4eb34cbf2571b0fda9.1533950271.git.baolin.wang@linaro.org> In-Reply-To: <50e1f7f4673bff9d71936b4eb34cbf2571b0fda9.1533950271.git.baolin.wang@linaro.org> References: <50e1f7f4673bff9d71936b4eb34cbf2571b0fda9.1533950271.git.baolin.wang@linaro.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Define readable macros instead of magic number to make code more readable. Signed-off-by: Baolin Wang --- drivers/tty/serial/sprd_serial.c | 25 +++++++++++++++++-------- 1 file changed, 17 insertions(+), 8 deletions(-) -- 1.9.1 diff --git a/drivers/tty/serial/sprd_serial.c b/drivers/tty/serial/sprd_serial.c index 1b0e3fb..e18d8af 100644 --- a/drivers/tty/serial/sprd_serial.c +++ b/drivers/tty/serial/sprd_serial.c @@ -45,6 +45,8 @@ /* data number in TX and RX fifo */ #define SPRD_STS1 0x000C +#define SPRD_RX_FIFO_CNT_MASK GENMASK(7, 0) +#define SPRD_TX_FIFO_CNT_MASK GENMASK(15, 8) /* interrupt enable register and its BITs */ #define SPRD_IEN 0x0010 @@ -82,11 +84,15 @@ /* fifo threshold register */ #define SPRD_CTL2 0x0020 #define THLD_TX_EMPTY 0x40 +#define THLD_TX_EMPTY_SHIFT 8 #define THLD_RX_FULL 0x40 /* config baud rate register */ #define SPRD_CLKD0 0x0024 +#define SPRD_CLKD0_MASK GENMASK(15, 0) #define SPRD_CLKD1 0x0028 +#define SPRD_CLKD1_MASK GENMASK(20, 16) +#define SPRD_CLKD1_SHIFT 16 /* interrupt mask status register */ #define SPRD_IMSR 0x002C @@ -115,7 +121,7 @@ static inline void serial_out(struct uart_port *port, int offset, int value) static unsigned int sprd_tx_empty(struct uart_port *port) { - if (serial_in(port, SPRD_STS1) & 0xff00) + if (serial_in(port, SPRD_STS1) & SPRD_TX_FIFO_CNT_MASK) return 0; else return TIOCSER_TEMT; @@ -213,7 +219,8 @@ static inline void sprd_rx(struct uart_port *port) struct tty_port *tty = &port->state->port; unsigned int ch, flag, lsr, max_count = SPRD_TIMEOUT; - while ((serial_in(port, SPRD_STS1) & 0x00ff) && max_count--) { + while ((serial_in(port, SPRD_STS1) & SPRD_RX_FIFO_CNT_MASK) && + max_count--) { lsr = serial_in(port, SPRD_LSR); ch = serial_in(port, SPRD_RXD); flag = TTY_NORMAL; @@ -303,16 +310,17 @@ static int sprd_startup(struct uart_port *port) struct sprd_uart_port *sp; unsigned long flags; - serial_out(port, SPRD_CTL2, ((THLD_TX_EMPTY << 8) | THLD_RX_FULL)); + serial_out(port, SPRD_CTL2, + THLD_TX_EMPTY << THLD_TX_EMPTY_SHIFT | THLD_RX_FULL); /* clear rx fifo */ timeout = SPRD_TIMEOUT; - while (timeout-- && serial_in(port, SPRD_STS1) & 0x00ff) + while (timeout-- && serial_in(port, SPRD_STS1) & SPRD_RX_FIFO_CNT_MASK) serial_in(port, SPRD_RXD); /* clear tx fifo */ timeout = SPRD_TIMEOUT; - while (timeout-- && serial_in(port, SPRD_STS1) & 0xff00) + while (timeout-- && serial_in(port, SPRD_STS1) & SPRD_TX_FIFO_CNT_MASK) cpu_relax(); /* clear interrupt */ @@ -433,10 +441,11 @@ static void sprd_set_termios(struct uart_port *port, } /* clock divider bit0~bit15 */ - serial_out(port, SPRD_CLKD0, quot & 0xffff); + serial_out(port, SPRD_CLKD0, quot & SPRD_CLKD0_MASK); /* clock divider bit16~bit20 */ - serial_out(port, SPRD_CLKD1, (quot & 0x1f0000) >> 16); + serial_out(port, SPRD_CLKD1, + (quot & SPRD_CLKD1_MASK) >> SPRD_CLKD1_SHIFT); serial_out(port, SPRD_LCR, lcr); fc |= RX_TOUT_THLD_DEF | RX_HFC_THLD_DEF; serial_out(port, SPRD_CTL1, fc); @@ -510,7 +519,7 @@ static void wait_for_xmitr(struct uart_port *port) if (--tmout == 0) break; udelay(1); - } while (status & 0xff00); + } while (status & SPRD_TX_FIFO_CNT_MASK); } static void sprd_console_putchar(struct uart_port *port, int ch) From patchwork Sat Aug 11 01:34:25 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "\(Exiting\) Baolin Wang" X-Patchwork-Id: 143971 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp587786ljj; Fri, 10 Aug 2018 18:35:20 -0700 (PDT) X-Google-Smtp-Source: AA+uWPw0IhE3FWQN3MiD4JE9gi4LjBO8aLKjvJ6igfU/mtKQrdTDQ1SKMYe0PrVmGNywjUqo4045 X-Received: by 2002:a63:be05:: with SMTP id l5-v6mr8486470pgf.330.1533951320753; Fri, 10 Aug 2018 18:35:20 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1533951320; cv=none; d=google.com; s=arc-20160816; b=H0iqNjL2BWT1ajgukv26fn3XBWSg9Fd+ISmksS2KH4rC9lu0PDNZl2nX5xJSgGjGnb ZdRL+gU+Ihenv1TyArWpNh1P1BLEP+ItaiVvcJ823yQU6vRhjK56vC72hjVlTaNl9Nxd mfidv7tN4ATl1+iJAfOpo0V/JHU7xyTKw3uuR+E8ElsSBYFQs3QNhR7dp6HL5njjrT0y Ac1m3aLxc6SiBJ+Pc4HTTA3ixHsHkheQsb5BH27q4tQRrF5x81vQXkbmjE4WVwl04dRQ npnV4Gvkj/3+xqVvSW8zXtUnnRaWnenDqIwXFWNduCQQTstcY0BNb1Gb3JFXKDlfZnnB oJOw== 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=8CDeotPCFhWraUTKO4OTKwuHQrhaCDvB5WlDvjgwrqk=; b=u5/fBE2dI3Pc9CfkPUu+ytDr+VDHGZoDk13Qgm2KM+WMYVnojtD2+WLUo1RAyrrfFk 05V/rftP7ub4+2/OMTeQJWNX4Y2Q4HcMPchbE3BmkhdcJSG1W1BUTevxPPG/KHvZ4AkW zUur+h2jLKeoZz2fz8vKuMrx4TPxMMan1zOnvjtkVPJe9WngYvD40ZTiS4+6SR27etjL La+JtBrsBMouChwb7Y1d7iwiM9XdSqxjvXBRZ2OvseayXEuIFHDH71TUuZ6JgYsrrI73 lzfeWFCYLffSrxUxFq9m6iu0ov5A8B328UpTuoZ209sLx4/A0dVMp0WRRdBHDNvgke3/ LTmw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=E3IbYcNP; 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=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id r15-v6si9818936pgf.403.2018.08.10.18.35.20; Fri, 10 Aug 2018 18:35:20 -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=@linaro.org header.s=google header.b=E3IbYcNP; 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=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727274AbeHKEHi (ORCPT + 31 others); Sat, 11 Aug 2018 00:07:38 -0400 Received: from mail-pf1-f196.google.com ([209.85.210.196]:43073 "EHLO mail-pf1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725199AbeHKEHh (ORCPT ); Sat, 11 Aug 2018 00:07:37 -0400 Received: by mail-pf1-f196.google.com with SMTP id j26-v6so5260620pfi.10 for ; Fri, 10 Aug 2018 18:35:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :in-reply-to:references; bh=8CDeotPCFhWraUTKO4OTKwuHQrhaCDvB5WlDvjgwrqk=; b=E3IbYcNPU87ATDvdxX2es1fhPdEJ6mt9XAiAM4FpKCcmNOQ+u05ZGQLRQdmbgGDX/7 n324cRqMlfkDGTUMeBcMGI+vm8cU+fnq3cEOeGV/XwDnW/okCNyO651W3Bvm311XnxFQ vLi6F1Iw3ml9T4VuVSkb3269Ez5wjSdombkNY= 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=8CDeotPCFhWraUTKO4OTKwuHQrhaCDvB5WlDvjgwrqk=; b=LAi/LIoe+r6OKJg6yFOUEtn9Twu4bmtINDfMR7LTLSYXoTO6NvBGAji8Rb65nIutOw cSsMwuNEev1o+XKluwANFhExWxHdFunx192t+2Ngf/BCpXZCrvvDk3R/EdByCbFL4gDe plUjowM616LnvYq1s2QbEKRNfnu+G5V0mmonBUt4Y3D7l5hhS3AYZ9AP5Lgf92HisLyO YilavmlhWSdyzEqCRpf8EugZMOxrIAuijIDsq0/jdCGA5AX7k/eF42EF1WaWDRF6b/23 iAkChnhwFiJRDYlrZdld42MNot2wtrrVEB3b9HTm0miuhP7qbAT67xZyBgFc76o4UAmu 4MWw== X-Gm-Message-State: AOUpUlG2w8Ves/++syqKW4Mfew6L2FQBukoSluapA9+kewGlC/3YSilA pWAV66embesYP/kEWgGVoxlUJg== X-Received: by 2002:a63:ff21:: with SMTP id k33-v6mr8357019pgi.38.1533951317037; Fri, 10 Aug 2018 18:35:17 -0700 (PDT) Received: from ubuntu.localdomain ([45.56.155.48]) by smtp.gmail.com with ESMTPSA id d22-v6sm21722373pfk.69.2018.08.10.18.35.12 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 10 Aug 2018 18:35:16 -0700 (PDT) From: Baolin Wang To: gregkh@linuxfoundation.org, jslaby@suse.com Cc: orsonzhai@gmail.com, baolin.wang@linaro.org, zhang.lyra@gmail.com, broonie@kernel.org, linux-serial@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 3/5] serial: sprd: Remove unnecessary resource validation Date: Fri, 10 Aug 2018 18:34:25 -0700 Message-Id: X-Mailer: git-send-email 1.9.1 In-Reply-To: <50e1f7f4673bff9d71936b4eb34cbf2571b0fda9.1533950271.git.baolin.wang@linaro.org> References: <50e1f7f4673bff9d71936b4eb34cbf2571b0fda9.1533950271.git.baolin.wang@linaro.org> In-Reply-To: <50e1f7f4673bff9d71936b4eb34cbf2571b0fda9.1533950271.git.baolin.wang@linaro.org> References: <50e1f7f4673bff9d71936b4eb34cbf2571b0fda9.1533950271.git.baolin.wang@linaro.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The devm_ioremap_resource() will valid the resources, thus remove the unnecessary resource validation in the driver. Signed-off-by: Baolin Wang --- drivers/tty/serial/sprd_serial.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) -- 1.9.1 diff --git a/drivers/tty/serial/sprd_serial.c b/drivers/tty/serial/sprd_serial.c index e18d8af..03b0cd4 100644 --- a/drivers/tty/serial/sprd_serial.c +++ b/drivers/tty/serial/sprd_serial.c @@ -710,15 +710,12 @@ static int sprd_probe(struct platform_device *pdev) up->uartclk = clk_get_rate(clk); res = platform_get_resource(pdev, IORESOURCE_MEM, 0); - if (!res) { - dev_err(&pdev->dev, "not provide mem resource\n"); - return -ENODEV; - } - up->mapbase = res->start; up->membase = devm_ioremap_resource(&pdev->dev, res); if (IS_ERR(up->membase)) return PTR_ERR(up->membase); + up->mapbase = res->start; + irq = platform_get_irq(pdev, 0); if (irq < 0) { dev_err(&pdev->dev, "not provide irq resource: %d\n", irq); From patchwork Sat Aug 11 01:34:26 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "\(Exiting\) Baolin Wang" X-Patchwork-Id: 143972 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp587843ljj; Fri, 10 Aug 2018 18:35:25 -0700 (PDT) X-Google-Smtp-Source: AA+uWPywk5/yvMaAVvrYOZxUUovh+cSpgecmyBrJxREJghG2iERJPEMxjvnUNlACoSEVmD+byZYs X-Received: by 2002:a63:375b:: with SMTP id g27-v6mr8581091pgn.59.1533951325493; Fri, 10 Aug 2018 18:35:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1533951325; cv=none; d=google.com; s=arc-20160816; b=jHsS3YZOegdLcfWWVL3rcF5suuuXFzH+IjQGg7MzocWw6vm46d6AovJGENAnbILQxk O8oGne58OKrHAJLGmYuwrtIHd/4JeFrxhchcwLE5guS/Tvtsqbsh9HlmXiIJiBpPTxkL 49Zumc09kfRB5SNgVQSqa+RJXW/NDzSSsW8aHssxCjdasRKMrF7HKqy3tEbdELtNE21g TypwwYfjwt2a1OK64k5WVbs/wC+v1XDOLwTXX8pW1wMOJP4t9UbH19itaLjFidrd9PTN jQNH+sk1N/kxaldahQapElymbCJHx835MNkmHpGnb3UwETWAtatHXVD1STXu6olgEpVS 9Xew== 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=NMIMGPdCCPLrDPv8AS7WcTkWP7rJgACQRrnn+5ajOBs=; b=bEo77LJ+6Fv9Vw4zVOFs+3pqDZ6/fKEZm8xQYPWDGtFyNGIljV3OTU+oH5kdK4a8ZG GLfm6N2j8oEnxixUNYZC/+yqc3G5bsIU3YsFx0Y2800t6gc5QUdmhQlAwY73aC199jYH NFOdMTjHmRtI7eaVthyz4zNLCwsrzr3F437i5C9UFvdIoPFfUy3XeCO477fT1Ukq20eW +yOccl0/g7U+XmEfdnPGh17T85+Gu5AocmqOUOatZgBBLQRk9aoOMOW2SQZZ9Ge4Len2 +gst2oD7q03H4MsajKqBVuf+zWNwnIULRmSq4W4B+Z1/ymi6pvf+XWR1I+MvGocHU3k1 yohg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=JAiJ76gp; 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=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id t19-v6si9170916pgu.285.2018.08.10.18.35.25; Fri, 10 Aug 2018 18:35:25 -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=@linaro.org header.s=google header.b=JAiJ76gp; 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=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727319AbeHKEHm (ORCPT + 31 others); Sat, 11 Aug 2018 00:07:42 -0400 Received: from mail-pl0-f66.google.com ([209.85.160.66]:39920 "EHLO mail-pl0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725871AbeHKEHm (ORCPT ); Sat, 11 Aug 2018 00:07:42 -0400 Received: by mail-pl0-f66.google.com with SMTP id w14-v6so4706163plp.6 for ; Fri, 10 Aug 2018 18:35:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :in-reply-to:references; bh=NMIMGPdCCPLrDPv8AS7WcTkWP7rJgACQRrnn+5ajOBs=; b=JAiJ76gpwdRJQsLtQnbO/EbQ4gk/wIyhMdwA9Q2tR4ClBLLP4fkXTeVs0hs++4WEoZ UdtxoRXBC7or16pavVmiAJBSjSYTuBnHdxNPC94dYqUtzs6jnH/EFn+7zrqv+YnOCB65 FwqQO4uQulUD6LMQc9CSX3pja7sNuK1wsUM/4= 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=NMIMGPdCCPLrDPv8AS7WcTkWP7rJgACQRrnn+5ajOBs=; b=VOSVtlneXFXMYqvkctN7P6fiEN/mSATEmXPGDRf3oPNGc3/JL0sxrPffoJzEisgAGp y2QlzEid/hG7rhDLGTm2oIyBH0PeoKPQCt5LzRsqZ1nD3qETVXoJf7EVcweAm6RPmtai rbon7L2tnvPL9Ys/AtZNi5nrMW9dUekEmEDi4Le1hph3mulHY54OCfXNnJC6HPTi8jV+ SZ4DDspiltRSCYsbfo2YFl5UgXndI6nAaDyeVziwZ0UYNJVbncfAO27mCjFc3RW7mJvy lbRnzUB2WQuvKd46u/P8eHSFllMbuhS48oeDo+liF4PlkL++Llp03eaCPn5nPRJKMezz rUnQ== X-Gm-Message-State: AOUpUlG/rn1hFCThA7F7UZIEFeSn5ZR+1aev/OtljzM3lVw7QZoHY+G2 49552P1lnlOzi5bjx3Pi3fwt1w== X-Received: by 2002:a17:902:7202:: with SMTP id ba2-v6mr8072421plb.179.1533951321536; Fri, 10 Aug 2018 18:35:21 -0700 (PDT) Received: from ubuntu.localdomain ([45.56.155.48]) by smtp.gmail.com with ESMTPSA id d22-v6sm21722373pfk.69.2018.08.10.18.35.17 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 10 Aug 2018 18:35:21 -0700 (PDT) From: Baolin Wang To: gregkh@linuxfoundation.org, jslaby@suse.com Cc: orsonzhai@gmail.com, baolin.wang@linaro.org, zhang.lyra@gmail.com, broonie@kernel.org, linux-serial@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 4/5] serial: sprd: Change 'int' to 'unsigned int' Date: Fri, 10 Aug 2018 18:34:26 -0700 Message-Id: <59172367ea674d5d4a3bd7c4d52362445174536e.1533950271.git.baolin.wang@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <50e1f7f4673bff9d71936b4eb34cbf2571b0fda9.1533950271.git.baolin.wang@linaro.org> References: <50e1f7f4673bff9d71936b4eb34cbf2571b0fda9.1533950271.git.baolin.wang@linaro.org> In-Reply-To: <50e1f7f4673bff9d71936b4eb34cbf2571b0fda9.1533950271.git.baolin.wang@linaro.org> References: <50e1f7f4673bff9d71936b4eb34cbf2571b0fda9.1533950271.git.baolin.wang@linaro.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The register offset value should be 'unsigned int' type. Moreover, prefer 'unsigned int' to bare use of 'unsigned'. Signed-off-by: Baolin Wang --- drivers/tty/serial/sprd_serial.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) -- 1.9.1 diff --git a/drivers/tty/serial/sprd_serial.c b/drivers/tty/serial/sprd_serial.c index 03b0cd4..8d5c9cd 100644 --- a/drivers/tty/serial/sprd_serial.c +++ b/drivers/tty/serial/sprd_serial.c @@ -109,12 +109,14 @@ struct sprd_uart_port { static struct sprd_uart_port *sprd_port[UART_NR_MAX]; static int sprd_ports_num; -static inline unsigned int serial_in(struct uart_port *port, int offset) +static inline unsigned int serial_in(struct uart_port *port, + unsigned int offset) { return readl_relaxed(port->membase + offset); } -static inline void serial_out(struct uart_port *port, int offset, int value) +static inline void serial_out(struct uart_port *port, unsigned int offset, + int value) { writel_relaxed(value, port->membase + offset); } @@ -598,8 +600,7 @@ static void sprd_putc(struct uart_port *port, int c) writeb(c, port->membase + SPRD_TXD); } -static void sprd_early_write(struct console *con, const char *s, - unsigned n) +static void sprd_early_write(struct console *con, const char *s, unsigned int n) { struct earlycon_device *dev = con->data; From patchwork Sat Aug 11 01:34:27 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "\(Exiting\) Baolin Wang" X-Patchwork-Id: 143973 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp587883ljj; Fri, 10 Aug 2018 18:35:29 -0700 (PDT) X-Google-Smtp-Source: AA+uWPxlOjMlz9+5HGQTsTLFBRnn6239F1CGZuVYUVaAAZs4J4SxV/xXNhAETOaOewSiCypH/quA X-Received: by 2002:a65:5581:: with SMTP id j1-v6mr8719217pgs.203.1533951329175; Fri, 10 Aug 2018 18:35:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1533951329; cv=none; d=google.com; s=arc-20160816; b=a24Gk70vCQtNSbvlmxZD5YP3EFRjggSTeGKPCc90feJxjtbhw4btzabHEq+Q2fObjl xXbMLGgCVapIJCgqT0/DkvWK1gX8gyXL7ofhQoCDazBQybQIzP8TZXlZN6i5N/01D//e L9bP4D3cEBFo3TnwKT2Kh20xTmNa1Nc4WMMRVecq/iOMp9mxNlAp8efSPWlMoSRuzdRP HIw3e2ALEp3EROnRlJl6J3vSxh54eshoJtL1R4UWNy12WT+rzJxjZcLgsos4OVT10RuK rIei/duSFD/rQN3Ko2J/H7Jd74aFLNmc8UGOfF356BxJBe9HV42rHzQPDwbP4lX3O/Tr 9T5Q== 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=WS73hgKCe7tsfUIogpxbjOL5bwPxakTmgNQf6YebHkM=; b=Ai7xjfS1k0YT+XDhlVg7AZVHHbwa40hqiC7bAG2jy9PtiSTP8WNcPDBPhJYWUljjAr lA3b+u53Y0z3lp/hNdouNP58xRChNFGNcR1q/RqXzMLbyGtfmt61IZHjpmAVwhVoU4qd EiPoSiSYXGQVv2smS1jnphO3zUFE2CuDcmle0jQ+NCYrkI/qNbBnxi6y1QEr4nMBTBz/ tADveYCy43ZWcFqF34GVh4zwY3CQufgoG2WpjJre6avRgnHTr6mYaBS/kSuebaB1MXcg wR35MHxpKk0vuJFMqvfS0N+n0vr5kbJQ5fPrjZ3T0LSMaKjedGX8UM6J3XZauKRkJfHh EaMw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=F1q4Q8kR; 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=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id b8-v6si8735365pls.392.2018.08.10.18.35.28; Fri, 10 Aug 2018 18:35:29 -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=@linaro.org header.s=google header.b=F1q4Q8kR; 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=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727347AbeHKEHr (ORCPT + 31 others); Sat, 11 Aug 2018 00:07:47 -0400 Received: from mail-pg1-f195.google.com ([209.85.215.195]:39193 "EHLO mail-pg1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725871AbeHKEHr (ORCPT ); Sat, 11 Aug 2018 00:07:47 -0400 Received: by mail-pg1-f195.google.com with SMTP id a11-v6so5130254pgw.6 for ; Fri, 10 Aug 2018 18:35:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :in-reply-to:references; bh=WS73hgKCe7tsfUIogpxbjOL5bwPxakTmgNQf6YebHkM=; b=F1q4Q8kRQbiKeV+51mx6Ttf3MQkBrrl3Z4hYw+ukzjG1Ul12iiHG5MgydSNuW4N841 CvG0RFDals/ULGQlX5hser/Qov6yMMY92gf3Q1FLTOfRInL2pW4qbfdBTOqHZxAtiay0 xP0GCVacakhPsBJWPm8wRcFOlGyjUWf9Jw7fE= 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=WS73hgKCe7tsfUIogpxbjOL5bwPxakTmgNQf6YebHkM=; b=htCpvHcS75JemQ70OLMhnXhCEvazkvqqwqYuKp45R6D0wwgH2KY4nAj4xH3sCbJ6hm CAgQ/x8DFpgwXqtb8ficfE0exWiNb177HYYlNml2ossLrcxe9V9NpnT3MXmXF3ULV7j+ 194b+O0zUVEXagcCQBaeC8O2bvR+/KZ7M50TJ6g+O5kCWn7gBnqi/2WJ/cKX3FX+Zoso yBZXux/3eWF3hOTtmL8vbb+hD5Thc9Ptphue6MjvOSKrJj9BCVfGn8u8Bf/6LUcymOmK J3yONA3bCfFbYQCosOOJPGVOwGzctnwFziDndyx7/F8sgMizfPhYZWSFSJRJqojJMylO +DPQ== X-Gm-Message-State: AOUpUlGW7XK8r0vp7S8HM8Dln5M1Ma3yZTVZ61htcSmS7XqvZ0oyyVT3 t2tMBlOUf1Tc2cKmXzJZn4zR4w== X-Received: by 2002:a63:ee56:: with SMTP id n22-v6mr8166569pgk.402.1533951326176; Fri, 10 Aug 2018 18:35:26 -0700 (PDT) Received: from ubuntu.localdomain ([45.56.155.48]) by smtp.gmail.com with ESMTPSA id d22-v6sm21722373pfk.69.2018.08.10.18.35.21 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 10 Aug 2018 18:35:25 -0700 (PDT) From: Baolin Wang To: gregkh@linuxfoundation.org, jslaby@suse.com Cc: orsonzhai@gmail.com, baolin.wang@linaro.org, zhang.lyra@gmail.com, broonie@kernel.org, linux-serial@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 5/5] serial: sprd: Fix the indentation issue Date: Fri, 10 Aug 2018 18:34:27 -0700 Message-Id: <5952d0e2189677a247a8efabf356347e1e087187.1533950271.git.baolin.wang@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <50e1f7f4673bff9d71936b4eb34cbf2571b0fda9.1533950271.git.baolin.wang@linaro.org> References: <50e1f7f4673bff9d71936b4eb34cbf2571b0fda9.1533950271.git.baolin.wang@linaro.org> In-Reply-To: <50e1f7f4673bff9d71936b4eb34cbf2571b0fda9.1533950271.git.baolin.wang@linaro.org> References: <50e1f7f4673bff9d71936b4eb34cbf2571b0fda9.1533950271.git.baolin.wang@linaro.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Make the macros' definition and code have the same correct indentation. Signed-off-by: Baolin Wang --- drivers/tty/serial/sprd_serial.c | 46 +++++++++++++++++++--------------------- 1 file changed, 22 insertions(+), 24 deletions(-) -- 1.9.1 diff --git a/drivers/tty/serial/sprd_serial.c b/drivers/tty/serial/sprd_serial.c index 8d5c9cd..4287ca3 100644 --- a/drivers/tty/serial/sprd_serial.c +++ b/drivers/tty/serial/sprd_serial.c @@ -68,24 +68,24 @@ #define SPRD_LCR_DATA_LEN6 0x4 #define SPRD_LCR_DATA_LEN7 0x8 #define SPRD_LCR_DATA_LEN8 0xc -#define SPRD_LCR_PARITY (BIT(0) | BIT(1)) +#define SPRD_LCR_PARITY (BIT(0) | BIT(1)) #define SPRD_LCR_PARITY_EN 0x2 #define SPRD_LCR_EVEN_PAR 0x0 #define SPRD_LCR_ODD_PAR 0x1 /* control register 1 */ -#define SPRD_CTL1 0x001C +#define SPRD_CTL1 0x001C #define RX_HW_FLOW_CTL_THLD BIT(6) #define RX_HW_FLOW_CTL_EN BIT(7) #define TX_HW_FLOW_CTL_EN BIT(8) #define RX_TOUT_THLD_DEF 0x3E00 -#define RX_HFC_THLD_DEF 0x40 +#define RX_HFC_THLD_DEF 0x40 /* fifo threshold register */ #define SPRD_CTL2 0x0020 -#define THLD_TX_EMPTY 0x40 +#define THLD_TX_EMPTY 0x40 #define THLD_TX_EMPTY_SHIFT 8 -#define THLD_RX_FULL 0x40 +#define THLD_RX_FULL 0x40 /* config baud rate register */ #define SPRD_CLKD0 0x0024 @@ -95,11 +95,11 @@ #define SPRD_CLKD1_SHIFT 16 /* interrupt mask status register */ -#define SPRD_IMSR 0x002C -#define SPRD_IMSR_RX_FIFO_FULL BIT(0) +#define SPRD_IMSR 0x002C +#define SPRD_IMSR_RX_FIFO_FULL BIT(0) #define SPRD_IMSR_TX_FIFO_EMPTY BIT(1) -#define SPRD_IMSR_BREAK_DETECT BIT(7) -#define SPRD_IMSR_TIMEOUT BIT(13) +#define SPRD_IMSR_BREAK_DETECT BIT(7) +#define SPRD_IMSR_TIMEOUT BIT(13) struct sprd_uart_port { struct uart_port port; @@ -229,7 +229,7 @@ static inline void sprd_rx(struct uart_port *port) port->icount.rx++; if (lsr & (SPRD_LSR_BI | SPRD_LSR_PE | - SPRD_LSR_FE | SPRD_LSR_OE)) + SPRD_LSR_FE | SPRD_LSR_OE)) if (handle_lsr_errors(port, &lsr, &flag)) continue; if (uart_handle_sysrq_char(port, ch)) @@ -292,8 +292,8 @@ static irqreturn_t sprd_handle_irq(int irq, void *dev_id) if (ims & SPRD_IMSR_TIMEOUT) serial_out(port, SPRD_ICLR, SPRD_ICLR_TIMEOUT); - if (ims & (SPRD_IMSR_RX_FIFO_FULL | - SPRD_IMSR_BREAK_DETECT | SPRD_IMSR_TIMEOUT)) + if (ims & (SPRD_IMSR_RX_FIFO_FULL | SPRD_IMSR_BREAK_DETECT | + SPRD_IMSR_TIMEOUT)) sprd_rx(port); if (ims & SPRD_IMSR_TX_FIFO_EMPTY) @@ -333,7 +333,7 @@ static int sprd_startup(struct uart_port *port) sp = container_of(port, struct sprd_uart_port, port); snprintf(sp->name, sizeof(sp->name), "sprd_serial%d", port->line); ret = devm_request_irq(port->dev, port->irq, sprd_handle_irq, - IRQF_SHARED, sp->name, port); + IRQF_SHARED, sp->name, port); if (ret) { dev_err(port->dev, "fail to request serial irq %d, ret=%d\n", port->irq, ret); @@ -361,8 +361,8 @@ static void sprd_shutdown(struct uart_port *port) } static void sprd_set_termios(struct uart_port *port, - struct ktermios *termios, - struct ktermios *old) + struct ktermios *termios, + struct ktermios *old) { unsigned int baud, quot; unsigned int lcr = 0, fc; @@ -480,8 +480,7 @@ static void sprd_config_port(struct uart_port *port, int flags) port->type = PORT_SPRD; } -static int sprd_verify_port(struct uart_port *port, - struct serial_struct *ser) +static int sprd_verify_port(struct uart_port *port, struct serial_struct *ser) { if (ser->type != PORT_SPRD) return -EINVAL; @@ -531,7 +530,7 @@ static void sprd_console_putchar(struct uart_port *port, int ch) } static void sprd_console_write(struct console *co, const char *s, - unsigned int count) + unsigned int count) { struct uart_port *port = &sprd_port[co->index]->port; int locked = 1; @@ -594,7 +593,7 @@ static void sprd_putc(struct uart_port *port, int c) unsigned int timeout = SPRD_TIMEOUT; while (timeout-- && - !(readl(port->membase + SPRD_LSR) & SPRD_LSR_TX_OVER)) + !(readl(port->membase + SPRD_LSR) & SPRD_LSR_TX_OVER)) cpu_relax(); writeb(c, port->membase + SPRD_TXD); @@ -607,9 +606,8 @@ static void sprd_early_write(struct console *con, const char *s, unsigned int n) uart_console_write(&dev->port, s, n, sprd_putc); } -static int __init sprd_early_console_setup( - struct earlycon_device *device, - const char *opt) +static int __init sprd_early_console_setup(struct earlycon_device *device, + const char *opt) { if (!device->port.membase) return -ENODEV; @@ -691,8 +689,8 @@ static int sprd_probe(struct platform_device *pdev) index = sprd_probe_dt_alias(index, &pdev->dev); - sprd_port[index] = devm_kzalloc(&pdev->dev, - sizeof(*sprd_port[index]), GFP_KERNEL); + sprd_port[index] = devm_kzalloc(&pdev->dev, sizeof(*sprd_port[index]), + GFP_KERNEL); if (!sprd_port[index]) return -ENOMEM;