diff options
Diffstat (limited to 'drivers/spi/spi_bfin5xx.c')
-rw-r--r-- | drivers/spi/spi_bfin5xx.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/drivers/spi/spi_bfin5xx.c b/drivers/spi/spi_bfin5xx.c index d54058a903be..73e24ef5a2f9 100644 --- a/drivers/spi/spi_bfin5xx.c +++ b/drivers/spi/spi_bfin5xx.c | |||
@@ -1010,12 +1010,6 @@ static int bfin_spi_setup(struct spi_device *spi) | |||
1010 | struct driver_data *drv_data = spi_master_get_devdata(spi->master); | 1010 | struct driver_data *drv_data = spi_master_get_devdata(spi->master); |
1011 | int ret; | 1011 | int ret; |
1012 | 1012 | ||
1013 | /* Abort device setup if requested features are not supported */ | ||
1014 | if (spi->mode & ~(SPI_CPOL | SPI_CPHA | SPI_LSB_FIRST)) { | ||
1015 | dev_err(&spi->dev, "requested mode not fully supported\n"); | ||
1016 | return -EINVAL; | ||
1017 | } | ||
1018 | |||
1019 | if (spi->bits_per_word != 8 && spi->bits_per_word != 16) | 1013 | if (spi->bits_per_word != 8 && spi->bits_per_word != 16) |
1020 | return -EINVAL; | 1014 | return -EINVAL; |
1021 | 1015 | ||
@@ -1283,6 +1277,9 @@ static int __init bfin_spi_probe(struct platform_device *pdev) | |||
1283 | drv_data->pdev = pdev; | 1277 | drv_data->pdev = pdev; |
1284 | drv_data->pin_req = platform_info->pin_req; | 1278 | drv_data->pin_req = platform_info->pin_req; |
1285 | 1279 | ||
1280 | /* the spi->mode bits supported by this driver: */ | ||
1281 | master->mode_bits = SPI_CPOL | SPI_CPHA | SPI_LSB_FIRST; | ||
1282 | |||
1286 | master->bus_num = pdev->id; | 1283 | master->bus_num = pdev->id; |
1287 | master->num_chipselect = platform_info->num_chipselect; | 1284 | master->num_chipselect = platform_info->num_chipselect; |
1288 | master->cleanup = bfin_spi_cleanup; | 1285 | master->cleanup = bfin_spi_cleanup; |