diff options
-rw-r--r-- | drivers/spi/spi_bfin5xx.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/drivers/spi/spi_bfin5xx.c b/drivers/spi/spi_bfin5xx.c index 5e07f498b495..045c82a36164 100644 --- a/drivers/spi/spi_bfin5xx.c +++ b/drivers/spi/spi_bfin5xx.c | |||
@@ -44,9 +44,6 @@ MODULE_LICENSE("GPL"); | |||
44 | #define QUEUE_RUNNING 0 | 44 | #define QUEUE_RUNNING 0 |
45 | #define QUEUE_STOPPED 1 | 45 | #define QUEUE_STOPPED 1 |
46 | 46 | ||
47 | /* Value to send if no TX value is supplied */ | ||
48 | #define SPI_IDLE_TXVAL 0x0000 | ||
49 | |||
50 | struct driver_data { | 47 | struct driver_data { |
51 | /* Driver model hookup */ | 48 | /* Driver model hookup */ |
52 | struct platform_device *pdev; | 49 | struct platform_device *pdev; |
@@ -581,7 +578,7 @@ static void bfin_spi_pump_transfers(unsigned long data) | |||
581 | udelay(previous->delay_usecs); | 578 | udelay(previous->delay_usecs); |
582 | } | 579 | } |
583 | 580 | ||
584 | /* Setup the transfer state based on the type of transfer */ | 581 | /* Flush any existing transfers that may be sitting in the hardware */ |
585 | if (bfin_spi_flush(drv_data) == 0) { | 582 | if (bfin_spi_flush(drv_data) == 0) { |
586 | dev_err(&drv_data->pdev->dev, "pump_transfers: flush failed\n"); | 583 | dev_err(&drv_data->pdev->dev, "pump_transfers: flush failed\n"); |
587 | message->status = -EIO; | 584 | message->status = -EIO; |
@@ -661,7 +658,6 @@ static void bfin_spi_pump_transfers(unsigned long data) | |||
661 | "transfer: drv_data->write is %p, chip->write is %p\n", | 658 | "transfer: drv_data->write is %p, chip->write is %p\n", |
662 | drv_data->write, chip->write); | 659 | drv_data->write, chip->write); |
663 | 660 | ||
664 | /* speed and width has been set on per message */ | ||
665 | message->state = RUNNING_STATE; | 661 | message->state = RUNNING_STATE; |
666 | dma_config = 0; | 662 | dma_config = 0; |
667 | 663 | ||
@@ -966,7 +962,7 @@ static u16 ssel[][MAX_SPI_SSEL] = { | |||
966 | P_SPI2_SSEL6, P_SPI2_SSEL7}, | 962 | P_SPI2_SSEL6, P_SPI2_SSEL7}, |
967 | }; | 963 | }; |
968 | 964 | ||
969 | /* first setup for new devices */ | 965 | /* setup for devices (may be called multiple times -- not just first setup) */ |
970 | static int bfin_spi_setup(struct spi_device *spi) | 966 | static int bfin_spi_setup(struct spi_device *spi) |
971 | { | 967 | { |
972 | struct bfin5xx_spi_chip *chip_info; | 968 | struct bfin5xx_spi_chip *chip_info; |