Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e884f7d5 authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Greg Kroah-Hartman
Browse files

mmc: pxamci: fix enum type confusion 



commit e60a582bcde01158a64ff948fb799f21f5d31a11 upstream.

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: 6464b714 ("mmc: pxamci: switch over to dmaengine use")
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Reviewed-by: default avatarNathan Chancellor <natechancellor@gmail.com>
Acked-by: default avatarRobert Jarzmik <robert.jarzmik@free.fr>
Cc: stable@vger.kernel.org
Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 6b50202a

drivers/mmc/host/pxamci.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -181,7 +181,7 @@ static void pxamci_dma_irq(void *param); 
static void pxamci_setup_data(struct pxamci_host *host, struct mmc_data *data)

static void pxamci_setup_data(struct pxamci_host *host, struct mmc_data *data)

{

{

	struct dma_async_tx_descriptor *tx;

	struct dma_async_tx_descriptor *tx;

	enum dma_data_direction direction;

	enum dma_transfer_direction direction;

	struct dma_slave_config	config;

	struct dma_slave_config	config;

	struct dma_chan *chan;

	struct dma_chan *chan;

	unsigned int nob = data->blocks;

	unsigned int nob = data->blocks;