aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/spi/spi-pxa2xx.c
diff options
context:
space:
mode:
authorMika Westerberg <mika.westerberg@linux.intel.com>2015-11-20 06:55:21 -0500
committerMark Brown <broonie@kernel.org>2015-11-20 13:19:14 -0500
commitd599af65fda384b5e91780485f243c9f2d3e757d (patch)
treea26138e65612699dcac2a9eaf4adc512ce6e9fd6 /drivers/spi/spi-pxa2xx.c
parent8005c49d9aea74d382f474ce11afbbc7d7130bec (diff)
spi: pxa2xx: Remove redundant call to lpss_ssp_setup() in probe
Commit 8b136baa5892 ("spi: pxa2xx: Detect number of enabled Intel LPSS SPI chip select signals") added a block where lpss_ssp_setup() gets called again for Intel LPSS SPI host controllers before checking number of chip selects from the capabilities register. There is no point in calling the function twice in probe so remove the first call. Reported-by: Aaron Lu <aaron.lu@intel.com> Signed-off-by: Mika Westerberg <mika.westerberg@linux.intel.com> Acked-by: Jarkko Nikula <jarkko.nikula@linux.intel.com> Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'drivers/spi/spi-pxa2xx.c')
-rw-r--r--drivers/spi/spi-pxa2xx.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/spi/spi-pxa2xx.c b/drivers/spi/spi-pxa2xx.c
index b25dc71b0ea9..ab9914ad8365 100644
--- a/drivers/spi/spi-pxa2xx.c
+++ b/drivers/spi/spi-pxa2xx.c
@@ -1567,9 +1567,6 @@ static int pxa2xx_spi_probe(struct platform_device *pdev)
1567 if (!is_quark_x1000_ssp(drv_data)) 1567 if (!is_quark_x1000_ssp(drv_data))
1568 pxa2xx_spi_write(drv_data, SSPSP, 0); 1568 pxa2xx_spi_write(drv_data, SSPSP, 0);
1569 1569
1570 if (is_lpss_ssp(drv_data))
1571 lpss_ssp_setup(drv_data);
1572
1573 if (is_lpss_ssp(drv_data)) { 1570 if (is_lpss_ssp(drv_data)) {
1574 lpss_ssp_setup(drv_data); 1571 lpss_ssp_setup(drv_data);
1575 config = lpss_get_config(drv_data); 1572 config = lpss_get_config(drv_data);