From patchwork Mon Jul 21 09:42:04 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wolfram Sang X-Patchwork-Id: 4593961 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id F394A9F295 for ; Mon, 21 Jul 2014 09:45:56 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 4094020109 for ; Mon, 21 Jul 2014 09:45:56 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 600D620115 for ; Mon, 21 Jul 2014 09:45:55 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1X9A7z-00019z-M5; Mon, 21 Jul 2014 09:43:27 +0000 Received: from sauhun.de ([89.238.76.85] helo=pokefinder.org) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1X9A7p-00010J-67 for linux-arm-kernel@lists.infradead.org; Mon, 21 Jul 2014 09:43:18 +0000 Received: from p4fe25634.dip0.t-ipconnect.de ([79.226.86.52]:39501 helo=localhost) by pokefinder.org with esmtpsa (TLS1.2:RSA_AES_128_CBC_SHA1:128) (Exim 4.80) (envelope-from ) id 1X9A7P-0007nT-41; Mon, 21 Jul 2014 11:42:51 +0200 From: Wolfram Sang To: linux-arm-kernel@lists.infradead.org Subject: [PATCH 2/2] drivers/tty/serial: use correct type for dma_map/unmap Date: Mon, 21 Jul 2014 11:42:04 +0200 Message-Id: <1405935725-10457-3-git-send-email-wsa@the-dreams.de> X-Mailer: git-send-email 2.0.0 In-Reply-To: <1405935725-10457-1-git-send-email-wsa@the-dreams.de> References: <1405935725-10457-1-git-send-email-wsa@the-dreams.de> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140721_024317_401394_44546E76 X-CRM114-Status: UNSURE ( 8.26 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -0.0 (/) Cc: Wolfram Sang , Greg Kroah-Hartman , Nicolas Ferre , linux-kernel@vger.kernel.org, linux-serial@vger.kernel.org, Jiri Slaby X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.18-1 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=-1.9 required=5.0 tests=BAYES_00,RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable 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 dma_{un}map_* uses 'enum dma_data_direction' not 'enum dma_transfer_direction'. Signed-off-by: Wolfram Sang --- drivers/tty/serial/atmel_serial.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/tty/serial/atmel_serial.c b/drivers/tty/serial/atmel_serial.c index c4f750314100..7b63677475c1 100644 --- a/drivers/tty/serial/atmel_serial.c +++ b/drivers/tty/serial/atmel_serial.c @@ -706,7 +706,7 @@ static void atmel_release_tx_dma(struct uart_port *port) dmaengine_terminate_all(chan); dma_release_channel(chan); dma_unmap_sg(port->dev, &atmel_port->sg_tx, 1, - DMA_MEM_TO_DEV); + DMA_TO_DEVICE); } atmel_port->desc_tx = NULL; @@ -804,7 +804,7 @@ static int atmel_prepare_tx_dma(struct uart_port *port) nent = dma_map_sg(port->dev, &atmel_port->sg_tx, 1, - DMA_MEM_TO_DEV); + DMA_TO_DEVICE); if (!nent) { dev_dbg(port->dev, "need to release resource of dma\n"); @@ -883,7 +883,7 @@ static void atmel_release_rx_dma(struct uart_port *port) dmaengine_terminate_all(chan); dma_release_channel(chan); dma_unmap_sg(port->dev, &atmel_port->sg_rx, 1, - DMA_DEV_TO_MEM); + DMA_FROM_DEVICE); } atmel_port->desc_rx = NULL; @@ -968,7 +968,7 @@ static int atmel_prepare_rx_dma(struct uart_port *port) nent = dma_map_sg(port->dev, &atmel_port->sg_rx, 1, - DMA_DEV_TO_MEM); + DMA_FROM_DEVICE); if (!nent) { dev_dbg(port->dev, "need to release resource of dma\n");