From patchwork Sat Aug 3 14:09:15 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Huang Shijie X-Patchwork-Id: 2838243 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 42694BF535 for ; Sat, 3 Aug 2013 02:06:18 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 335C1201E2 for ; Sat, 3 Aug 2013 02:06:17 +0000 (UTC) Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 35EE7201DA for ; Sat, 3 Aug 2013 02:06:16 +0000 (UTC) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1V5REA-0005k1-De; Sat, 03 Aug 2013 02:05:54 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1V5RE0-0002tf-Fz; Sat, 03 Aug 2013 02:05:44 +0000 Received: from mail-pd0-x235.google.com ([2607:f8b0:400e:c02::235]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1V5RDx-0002rt-9C for linux-arm-kernel@lists.infradead.org; Sat, 03 Aug 2013 02:05:42 +0000 Received: by mail-pd0-f181.google.com with SMTP id g10so1264038pdj.12 for ; Fri, 02 Aug 2013 19:05:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; bh=7IjRmqGC05SwEnzMS/MkfDjGTAf1IJkaibamqBr/JHg=; b=BjksirANU1XWQWBGCgGekl8UZIXNVwkke4Yruu/Q7oGYS6IQFym5LzTg37YZlRVCH/ /BC7gWITz/bgsVAVkgfTmNtUAclLlk3eOGXaaTHIIYA4cAhfr+jAFQe2Ln3RKeBtH8yf SXfcyWBK8N8O/mfr+7EBZfFopqw15W+vybHxCJwab0+yYi6dRifmBG3c9e6OV77zLoks lvTERKEze1+kBociGEGf+HOR4UonoBdYe4MmXa0jt45wPdEJGNbV9Psyhu54GuXrpyc1 AOdu+KaWm3Vw/Qj1ZQ7d7MUzhyXDSoAjjIiigKbmqPAqXUkkFVzoKEghlE9M0D/wprqr ACTg== X-Received: by 10.68.196.37 with SMTP id ij5mr10673603pbc.175.1375495519779; Fri, 02 Aug 2013 19:05:19 -0700 (PDT) Received: from localhost.localdomain.Home ([218.81.151.176]) by mx.google.com with ESMTPSA id ss8sm13506703pab.6.2013.08.02.19.05.14 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Fri, 02 Aug 2013 19:05:19 -0700 (PDT) From: Huang Shijie To: gregkh@linuxfoundation.org Subject: [PATCH v3 2/3] serial: mxs: remove the MXS_AUART_DMA_CONFIG Date: Sat, 3 Aug 2013 10:09:15 -0400 Message-Id: <1375538956-15862-3-git-send-email-shijie8@gmail.com> X-Mailer: git-send-email 1.7.4.4 In-Reply-To: <1375538956-15862-1-git-send-email-shijie8@gmail.com> References: <1375538956-15862-1-git-send-email-shijie8@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130802_220541_435562_17A3C7BF X-CRM114-Status: GOOD ( 11.08 ) X-Spam-Score: 1.4 (+) Cc: shawn.guo@linaro.org, Huang Shijie , linux-arm-kernel@lists.infradead.org, linux-serial@vger.kernel.org, u.kleine-koenig@pengutronix.de X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-2.3 required=5.0 tests=BAYES_00, DATE_IN_FUTURE_12_24, DKIM_ADSP_CUSTOM_MED,DKIM_SIGNED,FREEMAIL_FROM,RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The MXS_AUART_DMA_CONFIG is originally used to check if the DT node is configured with the DMA property. But now, the MXS_AUART_DMA_CONFIG is set unconditionally in the serial_mxs_probe_dt(), so the check in the mxs_auart_settermios() is not necessary anymore. This patch removes this macro. Signed-off-by: Huang Shijie --- drivers/tty/serial/mxs-auart.c | 5 +---- 1 files changed, 1 insertions(+), 4 deletions(-) diff --git a/drivers/tty/serial/mxs-auart.c b/drivers/tty/serial/mxs-auart.c index eac7b58..10e9d70 100644 --- a/drivers/tty/serial/mxs-auart.c +++ b/drivers/tty/serial/mxs-auart.c @@ -133,7 +133,6 @@ enum mxs_auart_type { struct mxs_auart_port { struct uart_port port; -#define MXS_AUART_DMA_CONFIG 0x1 #define MXS_AUART_DMA_ENABLED 0x2 #define MXS_AUART_DMA_TX_SYNC 2 /* bit 2 */ #define MXS_AUART_DMA_RX_READY 3 /* bit 3 */ @@ -640,7 +639,7 @@ static void mxs_auart_settermios(struct uart_port *u, * we can only implement the DMA support for auart * in mx28. */ - if (is_imx28_auart(s) && (s->flags & MXS_AUART_DMA_CONFIG) + if (is_imx28_auart(s) && test_bit(MXS_AUART_RTSCTS, &s->flags)) { if (!mxs_auart_dma_init(s)) /* enable DMA tranfer */ @@ -1009,8 +1008,6 @@ static int serial_mxs_probe_dt(struct mxs_auart_port *s, } s->port.line = ret; - s->flags |= MXS_AUART_DMA_CONFIG; - if (of_get_property(np, "fsl,uart-has-rtscts", NULL)) set_bit(MXS_AUART_RTSCTS, &s->flags);