Skip to contentSkip to conversation

spi: pxa2xx: Remove redundant call to lpss_ssp_setup() in probe

PATCH In review Mika Westerberg 3 participants 4 messages Nov 20, 2015 2 messages not in the archive

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 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.

---
 drivers/spi/spi-pxa2xx.c | 3 ---
 1 file changed, 3 deletions(-)
drivers/spi/spi-pxa2xx.c +0 -3
index b25dc71b0ea9..ab9914ad8365 100644
@@ -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);
Signature · 6 lines
2.6.2

--
To unsubscribe from this list: send the line "unsubscribe linux-spi" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

A message that is not in the archive (sent off-list or not yet received): 1448020521-94914-1-git-send-email-mika.westerberg-VuQAYsv1563Yd54FQh9/[email protected]

Acked-by
#2 lore raw
Quoted 19 lines · Mika Westerberg

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.

---
  drivers/spi/spi-pxa2xx.c | 3 ---
  1 file changed, 3 deletions(-)
drivers/spi/spi-pxa2xx.c +0 -0
index b25dc71b0ea9..ab9914ad8365 100644

drivers/spi/spi-pxa2xx.c static int pxa2xx_spi_probe(struct platform_device *pdev) · line 1572

Quoted 9 lines
drivers/spi/spi-pxa2xx.c +0 -3
@@ -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.

--
To unsubscribe from this list: send the line "unsubscribe linux-spi" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html

A message that is not in the archive (sent off-list or not yet received): 564F0EB1.8020306-VuQAYsv1563Yd54FQh9/[email protected]

Acked-by
#4 lore raw
Quoted 35 lines · Jarkko Nikula
Quoted 29 lines · Mika Westerberg

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.

---
  drivers/spi/spi-pxa2xx.c | 3 ---
  1 file changed, 3 deletions(-)
drivers/spi/spi-pxa2xx.c +0 -3
index b25dc71b0ea9..ab9914ad8365 100644
@@ -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);
Quoted 1 line
          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.

Quoted 1 line

Another blind copy-paste. Right ack below. Sorry the noise.

--
To unsubscribe from this list: send the line "unsubscribe linux-spi" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html

#5 lore raw

Applied "spi: pxa2xx: Remove redundant call to lpss_ssp_setup() in probe" to the spi tree

In reply to a message not in the archive

The patch

spi: pxa2xx: Remove redundant call to lpss_ssp_setup() in probe

has been applied to the spi tree at

git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git

All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted.

You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.

If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.

Please add any relevant lists and maintainers to the CCs when replying to this mail.

Thanks,
Mark

Quoted 1 line

From d599af65fda384b5e91780485f243c9f2d3e757d Mon Sep 17 00:00:00 2001

From: Mika Westerberg <mika.westerberg-VuQAYsv1563Yd54FQh9/[email protected]>
Date: Fri, 20 Nov 2015 13:55:21 +0200
Subject: [PATCH] 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.

---
 drivers/spi/spi-pxa2xx.c | 3 ---
 1 file changed, 3 deletions(-)
drivers/spi/spi-pxa2xx.c +0 -3
index b25dc71b0ea9..ab9914ad8365 100644
@@ -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);
Signature · 6 lines
2.6.2

--
To unsubscribe from this list: send the line "unsubscribe linux-spi" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html