mmc: pxamci: fix enum type confusion

arndb · storulf · commit e60a582bcde0 · 2019-03-18T11:00:41.000+01:00
clang points out several instances of mismatched types in this drivers, all coming from a single declaration: drivers/mmc/host/pxamci.c:193:15: error: implicit conversion from enumeration type 'enum dma_transfer_direction' to different enumeration type 'enum dma_data_direction' [-Werror,-Wenum-conversion] direction = DMA_DEV_TO_MEM; ~ ^~~~~~~~~~~~~~ drivers/mmc/host/pxamci.c:212:62: error: implicit conversion from enumeration type 'enum dma_data_direction' to different enumeration type 'enum dma_transfer_direction' [-Werror,-Wenum-conversion] tx = dmaengine_prep_slave_sg(chan, data->sg, host->dma_len, direction, The behavior is correct, so this must be a simply typo from dma_data_direction and dma_transfer_direction being similarly named types with a similar purpose. Fixes: 6464b71 ("mmc: pxamci: switch over to dmaengine use") Signed-off-by: Arnd Bergmann <arnd@arndb.de> Reviewed-by: Nathan Chancellor <natechancellor@gmail.com> Acked-by: Robert Jarzmik <robert.jarzmik@free.fr> Cc: stable@vger.kernel.org Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
diff --git a/drivers/mmc/host/pxamci.c b/drivers/mmc/host/pxamci.c
@@ -162,7 +162,7 @@ static void pxamci_dma_irq(void *param);
 static void pxamci_setup_data(struct pxamci_host *host, struct mmc_data *data)
 {
 	struct dma_async_tx_descriptor *tx;
-	enum dma_data_direction direction;
+	enum dma_transfer_direction direction;
 	struct dma_slave_config	config;
 	struct dma_chan *chan;
 	unsigned int nob = data->blocks;

Original file line number	Diff line number	Diff line change
`@@ -162,7 +162,7 @@ static void pxamci_dma_irq(void *param);`
`162`	`162`	`static void pxamci_setup_data(struct pxamci_host host, struct mmc_data data)`
`163`	`163`	`{`
`164`	`164`	`struct dma_async_tx_descriptor *tx;`
`165`		`- enum dma_data_direction direction;`
	`165`	`+ enum dma_transfer_direction direction;`
`166`	`166`	`struct dma_slave_config config;`
`167`	`167`	`struct dma_chan *chan;`
`168`	`168`	`unsigned int nob = data->blocks;`