From patchwork Thu Oct 4 02:37:54 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nathan Chancellor X-Patchwork-Id: 978626 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=linux-ide-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="d1TefeZk"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 42QcWV1Zptz9s7T for ; Thu, 4 Oct 2018 12:38:13 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726277AbeJDJ3P (ORCPT ); Thu, 4 Oct 2018 05:29:15 -0400 Received: from mail-wr1-f66.google.com ([209.85.221.66]:34216 "EHLO mail-wr1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726268AbeJDJ3P (ORCPT ); Thu, 4 Oct 2018 05:29:15 -0400 Received: by mail-wr1-f66.google.com with SMTP id z4-v6so8172337wrb.1; Wed, 03 Oct 2018 19:38:10 -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:mime-version :content-transfer-encoding; bh=JGDDzdaPEjNNa54cMH5hLj2C5VcbK/COpXqvwNROqlw=; b=d1TefeZk7TlU9UlzUIIR2ABnRhj23olMfgCSblzLysQqPxyHAxY5NlpAJr51Y1lELo PffGx3gLEltcMSTafnmvZ04pHQeqIiCMgIimlMNi8b2Z9Z/lEzCZZ0HvN/NPW1pHO6My g3TOviU1ssBed0TL0ACfRIAOjOiDd0IkGoh0l6KVQAfjii6mxLWg2Fki+Gyvetj4fvD3 LBphXt3NfAaE+VkxlbcwUrbUiAzK6LR95l5xvtj5K5TEOhGzJQFXuEE/+q4KXpFE0bRQ t+P3uyNAmSAS7+pVIfMVtA2DWyusw244O+OCTTlaODXUWrE07BO0YTBsEONh/XMJ5rIN SM5Q== 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:mime-version :content-transfer-encoding; bh=JGDDzdaPEjNNa54cMH5hLj2C5VcbK/COpXqvwNROqlw=; b=HPMqRFJxbZ/KD6uSwsIokBEZryCGZWqAYVuPx+bkhsxsHFIQRiH7m+gi9jP6nN3x6v SeOjKbrpTn/GTD4c8qtvhEaAJflvACrg5+3uEDKxkjZ2BKDWDxoideqi+h6kzkkbXUMb rR+sUqVLcvXcHovyGVQRSVlR5L/jpmBDZ2JugiHsVKldc79o6GLhtx/5A/ScGCjFCXD3 8ByUyWVysI+rKGcvjErdzktY9f0mY8zKnOueIp0/GL9O5aeGOurH0QGQGmz2t7gq6nOw NIZnlGRnATQvsVs17zVNiE3ejEG+EPosDnGpW2jP7zC23/Go8JaxQRWLfa7A1ow4OJ7C ZBiA== X-Gm-Message-State: ABuFfoiAvYAJiple4ByTQ13CyJ/XuWKWh3fQEzicNXaZPXVxiMWOvATl JJwVv+OQSB1uELZd2L/HL/c= X-Google-Smtp-Source: ACcGV62fBppLVhzJO8pCxfL5tccLOJ95xl3n5guGNOwm4UXO4A07EKz5Dcmq0MtU0EkXM/Aao7Jq4g== X-Received: by 2002:adf:c513:: with SMTP id q19-v6mr1020314wrf.46.1538620689000; Wed, 03 Oct 2018 19:38:09 -0700 (PDT) Received: from localhost.localdomain ([2a01:4f8:10b:24a5::2]) by smtp.gmail.com with ESMTPSA id d2-v6sm2052666wrn.20.2018.10.03.19.38.08 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 03 Oct 2018 19:38:08 -0700 (PDT) From: Nathan Chancellor To: Bartlomiej Zolnierkiewicz , Jens Axboe Cc: linux-ide@vger.kernel.org, linux-kernel@vger.kernel.org, Nick Desaulniers , Nathan Chancellor Subject: [PATCH] ata: ep93xx: Use proper enums for directions Date: Wed, 3 Oct 2018 19:37:54 -0700 Message-Id: <20181004023754.15477-1-natechancellor@gmail.com> X-Mailer: git-send-email 2.19.0 MIME-Version: 1.0 Sender: linux-ide-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-ide@vger.kernel.org Clang warns when one enumerated type is implicitly converted to another. drivers/ata/pata_ep93xx.c:662:36: warning: implicit conversion from enumeration type 'enum dma_data_direction' to different enumeration type 'enum dma_transfer_direction' [-Wenum-conversion] drv_data->dma_rx_data.direction = DMA_FROM_DEVICE; ~ ^~~~~~~~~~~~~~~ drivers/ata/pata_ep93xx.c:670:36: warning: implicit conversion from enumeration type 'enum dma_data_direction' to different enumeration type 'enum dma_transfer_direction' [-Wenum-conversion] drv_data->dma_tx_data.direction = DMA_TO_DEVICE; ~ ^~~~~~~~~~~~~ drivers/ata/pata_ep93xx.c:681:19: warning: implicit conversion from enumeration type 'enum dma_data_direction' to different enumeration type 'enum dma_transfer_direction' [-Wenum-conversion] conf.direction = DMA_FROM_DEVICE; ~ ^~~~~~~~~~~~~~~ drivers/ata/pata_ep93xx.c:692:19: warning: implicit conversion from enumeration type 'enum dma_data_direction' to different enumeration type 'enum dma_transfer_direction' [-Wenum-conversion] conf.direction = DMA_TO_DEVICE; ~ ^~~~~~~~~~~~~ Use the equivalent valued enums from the expected type so that Clang no longer warns about a conversion. DMA_TO_DEVICE = DMA_MEM_TO_DEV = 1 DMA_FROM_DEVICE = DMA_DEV_TO_MEM = 2 Signed-off-by: Nathan Chancellor Acked-by: Bartlomiej Zolnierkiewicz --- drivers/ata/pata_ep93xx.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/ata/pata_ep93xx.c b/drivers/ata/pata_ep93xx.c index 0a550190955a..cc6d06c1b2c7 100644 --- a/drivers/ata/pata_ep93xx.c +++ b/drivers/ata/pata_ep93xx.c @@ -659,7 +659,7 @@ static void ep93xx_pata_dma_init(struct ep93xx_pata_data *drv_data) * start of new transfer. */ drv_data->dma_rx_data.port = EP93XX_DMA_IDE; - drv_data->dma_rx_data.direction = DMA_FROM_DEVICE; + drv_data->dma_rx_data.direction = DMA_DEV_TO_MEM; drv_data->dma_rx_data.name = "ep93xx-pata-rx"; drv_data->dma_rx_channel = dma_request_channel(mask, ep93xx_pata_dma_filter, &drv_data->dma_rx_data); @@ -667,7 +667,7 @@ static void ep93xx_pata_dma_init(struct ep93xx_pata_data *drv_data) return; drv_data->dma_tx_data.port = EP93XX_DMA_IDE; - drv_data->dma_tx_data.direction = DMA_TO_DEVICE; + drv_data->dma_tx_data.direction = DMA_MEM_TO_DEV; drv_data->dma_tx_data.name = "ep93xx-pata-tx"; drv_data->dma_tx_channel = dma_request_channel(mask, ep93xx_pata_dma_filter, &drv_data->dma_tx_data); @@ -678,7 +678,7 @@ static void ep93xx_pata_dma_init(struct ep93xx_pata_data *drv_data) /* Configure receive channel direction and source address */ memset(&conf, 0, sizeof(conf)); - conf.direction = DMA_FROM_DEVICE; + conf.direction = DMA_DEV_TO_MEM; conf.src_addr = drv_data->udma_in_phys; conf.src_addr_width = DMA_SLAVE_BUSWIDTH_4_BYTES; if (dmaengine_slave_config(drv_data->dma_rx_channel, &conf)) { @@ -689,7 +689,7 @@ static void ep93xx_pata_dma_init(struct ep93xx_pata_data *drv_data) /* Configure transmit channel direction and destination address */ memset(&conf, 0, sizeof(conf)); - conf.direction = DMA_TO_DEVICE; + conf.direction = DMA_MEM_TO_DEV; conf.dst_addr = drv_data->udma_out_phys; conf.dst_addr_width = DMA_SLAVE_BUSWIDTH_4_BYTES; if (dmaengine_slave_config(drv_data->dma_tx_channel, &conf)) {