aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/spi/spi-tegra20-slink.c
diff options
context:
space:
mode:
authorLaxman Dewangan <ldewangan@nvidia.com>2013-01-04 13:47:15 -0500
committerGrant Likely <grant.likely@secretlab.ca>2013-02-05 08:11:53 -0500
commitbeb96c2ad4cd5012e39587b960aa7e41661c78ca (patch)
treeb4ca8fb93b305e5454fea912df0104e7a748876e /drivers/spi/spi-tegra20-slink.c
parent059b8ffeee5b427949872bb6ed5db5ae0788054e (diff)
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>
Diffstat (limited to 'drivers/spi/spi-tegra20-slink.c')
-rw-r--r--drivers/spi/spi-tegra20-slink.c6
1 files changed, 3 insertions, 3 deletions
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,
725 unsigned long command2; 725 unsigned long command2;
726 726
727 bits_per_word = t->bits_per_word; 727 bits_per_word = t->bits_per_word;
728 speed = t->speed_hz ? t->speed_hz : spi->max_speed_hz; 728 speed = t->speed_hz;
729 if (!speed)
730 speed = tspi->spi_max_frequency;
731 if (speed != tspi->cur_speed) { 729 if (speed != tspi->cur_speed) {
732 clk_set_rate(tspi->clk, speed * 4); 730 clk_set_rate(tspi->clk, speed * 4);
733 tspi->cur_speed = speed; 731 tspi->cur_speed = speed;
@@ -838,6 +836,8 @@ static int tegra_slink_setup(struct spi_device *spi)
838 836
839 BUG_ON(spi->chip_select >= MAX_CHIP_SELECT); 837 BUG_ON(spi->chip_select >= MAX_CHIP_SELECT);
840 838
839 /* Set speed to the spi max fequency if spi device has not set */
840 spi->max_speed_hz = spi->max_speed_hz ? : tspi->spi_max_frequency;
841 ret = pm_runtime_get_sync(tspi->dev); 841 ret = pm_runtime_get_sync(tspi->dev);
842 if (ret < 0) { 842 if (ret < 0) {
843 dev_err(tspi->dev, "pm runtime failed, e = %d\n", ret); 843 dev_err(tspi->dev, "pm runtime failed, e = %d\n", ret);