From patchwork Mon Mar 19 22:16:22 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Agner X-Patchwork-Id: 10295565 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 3F706602C2 for ; Mon, 19 Mar 2018 22:16:33 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 24BDC294FB for ; Mon, 19 Mar 2018 22:16:33 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 1996E29504; Mon, 19 Mar 2018 22:16:33 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8291C29505 for ; Mon, 19 Mar 2018 22:16:32 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S936315AbeCSWQ3 (ORCPT ); Mon, 19 Mar 2018 18:16:29 -0400 Received: from mail.kmu-office.ch ([178.209.48.109]:45075 "EHLO mail.kmu-office.ch" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S936292AbeCSWQ0 (ORCPT ); Mon, 19 Mar 2018 18:16:26 -0400 Received: from trochilidae.lan (unknown [IPv6:2001:1620:c6e::edf]) by mail.kmu-office.ch (Postfix) with ESMTPSA id F41665C1BC4; Mon, 19 Mar 2018 23:16:04 +0100 (CET) From: Stefan Agner To: broonie@kernel.org Cc: geert+renesas@glider.be, linux-spi@vger.kernel.org, linux-kernel@vger.kernel.org, Stefan Agner Subject: [PATCH v2] spi: rspi: use correct enum for DMA transfer direction Date: Mon, 19 Mar 2018 23:16:22 +0100 Message-Id: <20180319221622.16867-1-stefan@agner.ch> X-Mailer: git-send-email 2.16.2 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=agner.ch; s=dkim; t=1521497765; bh=9sF6P/yqk5/uXpzrzjEiCytdTLRICkNHPxQ02BtdOfA=; h=From:To:Cc:Subject:Date:Message-Id; b=KAVMGnOt8pRgTp80TYVtLATfQqY4SGr9ijkbcZpOdxieEp37+vpVTpVGOLHh7txPZ0l5BY8azprScKYsdlJ2yoHaDYkuNsHvXpJ1B6Xx2kEV2AU5ESpoW+rfRjUUwmQPV4ydEL2ZrXWfy0t5WSzoByBcO8cI433wZ4xxjEGh8tY= Sender: linux-spi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-spi@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Use enum dma_transfer_direction as required by dmaengine_prep_slave_sg instead of enum dma_data_direction. This won't change behavior in practice as the enum values are equivalent. This fixes two warnings when building with clang: drivers/spi/spi-rspi.c:538:26: warning: implicit conversion from enumeration type 'enum dma_data_direction' to different enumeration type 'enum dma_transfer_direction' [-Wenum-conversion] rx->sgl, rx->nents, DMA_FROM_DEVICE, ^~~~~~~~~~~~~~~ drivers/spi/spi-rspi.c:558:26: warning: implicit conversion from enumeration type 'enum dma_data_direction' to different enumeration type 'enum dma_transfer_direction' [-Wenum-conversion] tx->sgl, tx->nents, DMA_TO_DEVICE, ^~~~~~~~~~~~~ Signed-off-by: Stefan Agner Reviewed-by: Geert Uytterhoeven --- drivers/spi/spi-rspi.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/spi/spi-rspi.c b/drivers/spi/spi-rspi.c index 0835a8d88fb8..95dc4d78618d 100644 --- a/drivers/spi/spi-rspi.c +++ b/drivers/spi/spi-rspi.c @@ -535,7 +535,7 @@ static int rspi_dma_transfer(struct rspi_data *rspi, struct sg_table *tx, /* First prepare and submit the DMA request(s), as this may fail */ if (rx) { desc_rx = dmaengine_prep_slave_sg(rspi->master->dma_rx, - rx->sgl, rx->nents, DMA_FROM_DEVICE, + rx->sgl, rx->nents, DMA_DEV_TO_MEM, DMA_PREP_INTERRUPT | DMA_CTRL_ACK); if (!desc_rx) { ret = -EAGAIN; @@ -555,7 +555,7 @@ static int rspi_dma_transfer(struct rspi_data *rspi, struct sg_table *tx, if (tx) { desc_tx = dmaengine_prep_slave_sg(rspi->master->dma_tx, - tx->sgl, tx->nents, DMA_TO_DEVICE, + tx->sgl, tx->nents, DMA_MEM_TO_DEV, DMA_PREP_INTERRUPT | DMA_CTRL_ACK); if (!desc_tx) { ret = -EAGAIN;