spi: pxa2xx: Remove redundant call to lpss_ssp_setup() in probe
authorMika Westerberg <mika.westerberg@linux.intel.com>
Fri, 20 Nov 2015 11:55:21 +0000 (13:55 +0200)
committerMark Brown <broonie@kernel.org>
Fri, 20 Nov 2015 18:19:14 +0000 (18:19 +0000)
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>
drivers/spi/spi-pxa2xx.c

index b25dc71b0ea918de43184625c8d359be43684dad..ab9914ad8365a6b1fb31f107dab21dac4ef94b17 100644 (file)
@@ -1567,9 +1567,6 @@ static int pxa2xx_spi_probe(struct platform_device *pdev)
        if (!is_quark_x1000_ssp(drv_data))
                pxa2xx_spi_write(drv_data, SSPSP, 0);
 
-       if (is_lpss_ssp(drv_data))
-               lpss_ssp_setup(drv_data);
-
        if (is_lpss_ssp(drv_data)) {
                lpss_ssp_setup(drv_data);
                config = lpss_get_config(drv_data);