spi/tegra: remove checks for valid speed

SPI core make sure that all transfer has proper speed set
before calling low level spi transfer. Hence, it is not
require to have check in spi driver.

Remove the check for speed validity from transfer and use it directly.

Signed-off-by: Laxman Dewangan <ldewangan@nvidia.com>
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>

2 files changed, 14 insertions, 6 deletions

diff --git a/drivers/spi/spi-tegra20-sflash.c b/drivers/spi/spi-tegra20-sflash.c
index 448a8cc71df3..9a42c158e245 100644
--- a/drivers/spi/spi-tegra20-sflash.c
+++ b/drivers/spi/spi-tegra20-sflash.c
@@ -269,9 +269,7 @@ static int tegra_sflash_start_transfer_one(struct spi_device *spi,
         u32 speed;
         unsigned long command;
 
-        speed = t->speed_hz ? t->speed_hz : spi->max_speed_hz;
-        if (!speed)
-                speed = tsd->spi_max_frequency;
+        speed = t->speed_hz;
         if (speed != tsd->cur_speed) {
                 clk_set_rate(tsd->clk, speed);
                 tsd->cur_speed = speed;
@@ -319,6 +317,15 @@ static int tegra_sflash_start_transfer_one(struct spi_device *spi,
         return  tegra_sflash_start_cpu_based_transfer(tsd, t);
 }
 
+static int tegra_sflash_setup(struct spi_device *spi)
+{
+        struct tegra_sflash_data *tsd = spi_master_get_devdata(spi->master);
+
+        /* Set speed to the spi max fequency if spi device has not set */
+        spi->max_speed_hz = spi->max_speed_hz ? : tsd->spi_max_frequency;
+        return 0;
+}
+
 static int tegra_sflash_transfer_one_message(struct spi_master *master,
                         struct spi_message *msg)
 {
@@ -492,6 +499,7 @@ static int tegra_sflash_probe(struct platform_device *pdev)
 
         /* the spi->mode bits understood by this driver: */
         master->mode_bits = SPI_CPOL | SPI_CPHA;
+        master->setup = tegra_sflash_setup;
         master->transfer_one_message = tegra_sflash_transfer_one_message;
         master->num_chipselect = MAX_CHIP_SELECT;
         master->bus_num = -1;
diff --git a/drivers/spi/spi-tegra20-slink.c b/drivers/spi/spi-tegra20-slink.c
index 7a95bddfb604..8d51db8dea6d 100644
--- a/drivers/spi/spi-tegra20-slink.c
+++ b/drivers/spi/spi-tegra20-slink.c
@@ -725,9 +725,7 @@ static int tegra_slink_start_transfer_one(struct spi_device *spi,
         unsigned long command2;
 
         bits_per_word = t->bits_per_word;
-        speed = t->speed_hz ? t->speed_hz : spi->max_speed_hz;
-        if (!speed)
-                speed = tspi->spi_max_frequency;
+        speed = t->speed_hz;
         if (speed != tspi->cur_speed) {
                 clk_set_rate(tspi->clk, speed * 4);
                 tspi->cur_speed = speed;
@@ -838,6 +836,8 @@ static int tegra_slink_setup(struct spi_device *spi)
 
         BUG_ON(spi->chip_select >= MAX_CHIP_SELECT);
 
+        /* Set speed to the spi max fequency if spi device has not set */
+        spi->max_speed_hz = spi->max_speed_hz ? : tspi->spi_max_frequency;
         ret = pm_runtime_get_sync(tspi->dev);
         if (ret < 0) {
                 dev_err(tspi->dev, "pm runtime failed, e = %d\n", ret);