diff options
Diffstat (limited to 'drivers/spi/spi_mpc83xx.c')
-rw-r--r-- | drivers/spi/spi_mpc83xx.c | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/drivers/spi/spi_mpc83xx.c b/drivers/spi/spi_mpc83xx.c index 0926a3e293e0..ce61be98e06d 100644 --- a/drivers/spi/spi_mpc83xx.c +++ b/drivers/spi/spi_mpc83xx.c | |||
@@ -419,10 +419,6 @@ static void mpc83xx_spi_work(struct work_struct *work) | |||
419 | spin_unlock_irq(&mpc83xx_spi->lock); | 419 | spin_unlock_irq(&mpc83xx_spi->lock); |
420 | } | 420 | } |
421 | 421 | ||
422 | /* the spi->mode bits understood by this driver: */ | ||
423 | #define MODEBITS (SPI_CPOL | SPI_CPHA | SPI_CS_HIGH \ | ||
424 | | SPI_LSB_FIRST | SPI_LOOP) | ||
425 | |||
426 | static int mpc83xx_spi_setup(struct spi_device *spi) | 422 | static int mpc83xx_spi_setup(struct spi_device *spi) |
427 | { | 423 | { |
428 | struct mpc83xx_spi *mpc83xx_spi; | 424 | struct mpc83xx_spi *mpc83xx_spi; |
@@ -430,12 +426,6 @@ static int mpc83xx_spi_setup(struct spi_device *spi) | |||
430 | u32 hw_mode; | 426 | u32 hw_mode; |
431 | struct spi_mpc83xx_cs *cs = spi->controller_state; | 427 | struct spi_mpc83xx_cs *cs = spi->controller_state; |
432 | 428 | ||
433 | if (spi->mode & ~MODEBITS) { | ||
434 | dev_dbg(&spi->dev, "setup: unsupported mode bits %x\n", | ||
435 | spi->mode & ~MODEBITS); | ||
436 | return -EINVAL; | ||
437 | } | ||
438 | |||
439 | if (!spi->max_speed_hz) | 429 | if (!spi->max_speed_hz) |
440 | return -EINVAL; | 430 | return -EINVAL; |
441 | 431 | ||
@@ -562,6 +552,10 @@ mpc83xx_spi_probe(struct device *dev, struct resource *mem, unsigned int irq) | |||
562 | 552 | ||
563 | dev_set_drvdata(dev, master); | 553 | dev_set_drvdata(dev, master); |
564 | 554 | ||
555 | /* the spi->mode bits understood by this driver: */ | ||
556 | master->mode_bits = SPI_CPOL | SPI_CPHA | SPI_CS_HIGH | ||
557 | | SPI_LSB_FIRST | SPI_LOOP; | ||
558 | |||
565 | master->setup = mpc83xx_spi_setup; | 559 | master->setup = mpc83xx_spi_setup; |
566 | master->transfer = mpc83xx_spi_transfer; | 560 | master->transfer = mpc83xx_spi_transfer; |
567 | master->cleanup = mpc83xx_spi_cleanup; | 561 | master->cleanup = mpc83xx_spi_cleanup; |