Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 212320
b: refs/heads/master
c: ab09e04
h: refs/heads/master
v: v3
  • Loading branch information
Mike Frysinger committed Oct 18, 2010
1 parent 80266c6 commit 3398f12
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 7 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 5cc0159a5779f297d1b987d5f6d0feb6dc36a27a
refs/heads/master: ab09e0406ffd42d26fc9a6dcbb626f9eb1da9160
8 changes: 2 additions & 6 deletions trunk/drivers/spi/spi_bfin5xx.c
Original file line number Diff line number Diff line change
Expand Up @@ -44,9 +44,6 @@ MODULE_LICENSE("GPL");
#define QUEUE_RUNNING 0
#define QUEUE_STOPPED 1

/* Value to send if no TX value is supplied */
#define SPI_IDLE_TXVAL 0x0000

struct driver_data {
/* Driver model hookup */
struct platform_device *pdev;
Expand Down Expand Up @@ -581,7 +578,7 @@ static void bfin_spi_pump_transfers(unsigned long data)
udelay(previous->delay_usecs);
}

/* Setup the transfer state based on the type of transfer */
/* Flush any existing transfers that may be sitting in the hardware */
if (bfin_spi_flush(drv_data) == 0) {
dev_err(&drv_data->pdev->dev, "pump_transfers: flush failed\n");
message->status = -EIO;
Expand Down Expand Up @@ -661,7 +658,6 @@ static void bfin_spi_pump_transfers(unsigned long data)
"transfer: drv_data->write is %p, chip->write is %p\n",
drv_data->write, chip->write);

/* speed and width has been set on per message */
message->state = RUNNING_STATE;
dma_config = 0;

Expand Down Expand Up @@ -966,7 +962,7 @@ static u16 ssel[][MAX_SPI_SSEL] = {
P_SPI2_SSEL6, P_SPI2_SSEL7},
};

/* first setup for new devices */
/* setup for devices (may be called multiple times -- not just first setup) */
static int bfin_spi_setup(struct spi_device *spi)
{
struct bfin5xx_spi_chip *chip_info;
Expand Down

0 comments on commit 3398f12

Please sign in to comment.