| Message ID | 1448020521-94914-1-git-send-email-mika.westerberg@linux.intel.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | d599af65fda384b5e91780485f243c9f2d3e757d |
| Headers | show |
On 11/20/2015 01:55 PM, Mika Westerberg wrote: > 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> > --- > drivers/spi/spi-pxa2xx.c | 3 --- > 1 file changed, 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) > 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); Right, obvious, I just ponder why I was blind to see this myself when I split the original patch. Acked-by: Jarkko Nikula <jarkko.nikula@bitmer.com> -- To unsubscribe from this list: send the line "unsubscribe linux-spi" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On 11/20/2015 02:14 PM, Jarkko Nikula wrote: > On 11/20/2015 01:55 PM, Mika Westerberg wrote: >> 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> >> --- >> drivers/spi/spi-pxa2xx.c | 3 --- >> 1 file changed, 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) >> 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); > > Right, obvious, I just ponder why I was blind to see this myself when I > split the original patch. > > Acked-by: Jarkko Nikula <jarkko.nikula@bitmer.com> Another blind copy-paste. Right ack below. Sorry the noise. Acked-by: Jarkko Nikula <jarkko.nikula@linux.intel.com> -- To unsubscribe from this list: send the line "unsubscribe linux-spi" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
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) 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);
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> --- drivers/spi/spi-pxa2xx.c | 3 --- 1 file changed, 3 deletions(-)