]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commit
spi/spi-ep93xx.c: use dma_transfer_direction instead of dma_data_direction
authorH Hartley Sweeten <hartleys@visionengravers.com>
Wed, 18 Apr 2012 01:46:36 +0000 (18:46 -0700)
committerGrant Likely <grant.likely@secretlab.ca>
Fri, 27 Apr 2012 17:11:28 +0000 (11:11 -0600)
commitd4b9b578cba7231c1fbafbe901a2e8f38654e056
tree29daa1cec9737e4ec34f52354133d7ddfac987d0
parentdbabe0d659d3cfe42830a779909ab3cd42f7b027
spi/spi-ep93xx.c: use dma_transfer_direction instead of dma_data_direction

A new enum indicating the dma channel direction was introduced by:

commit 49920bc66984a512f4bcc7735a61642cd0e4d6f2
    dmaengine: add new enum dma_transfer_direction

The following commit changed spi-ep93xx to use the new enum:

commit a485df4b4404379786c4bdd258bc528b2617449d
    spi, serial: move to dma_transfer_direction

In doing so a sparse warning was introduced:

warning: mixing different enum types
   int enum dma_data_direction  versus
   int enum dma_transfer_direction

This is produced because the 'dir' passed in ep93xx_spi_dma_prepare
is an enum dma_data_direction and is being used to set the
dma_slave_config 'direction' which is now an enum dma_transfer_direction.

Fix this by converting spi-ep93xx to use the new enum type in all
places.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Acked-by: Mika Westerberg <mika.westerberg@iki.fi>
Acked-by: Vinod Koul <vinod.koul@intel.com>
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
drivers/spi/spi-ep93xx.c