Skip to contentSkip to conversation

spi: mpc52xx: Replace of_gpio_count() by gpiod_count()

PATCH In review Andy Shevchenko 2 participants 2 messages Sep 14, 2022 – Sep 15, 2022 SPI

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 spi: mpc52xx: Replace of_gpio_count() by gpiod_count()

As a preparation to unexport of_gpio_named_count(), convert the driver to use gpiod_count() instead.

---
 drivers/spi/spi-mpc52xx.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/spi/spi-mpc52xx.c +2 -1
index bc5e36fd4288..97cdd6545ee1 100644
@@ -15,6 +15,7 @@
 #include <linux/of_platform.h>
 #include <linux/interrupt.h>
 #include <linux/delay.h>
+#include <linux/gpio/consumer.h>
 #include <linux/spi/spi.h>
 #include <linux/io.h>
 #include <linux/of_gpio.h>
@@ -438,7 +439,7 @@ static int mpc52xx_spi_probe(struct platform_device *op)
 	ms->irq1 = irq_of_parse_and_map(op->dev.of_node, 1);
 	ms->state = mpc52xx_spi_fsmstate_idle;
 	ms->ipb_freq = mpc5xxx_get_bus_frequency(&op->dev);
-	ms->gpio_cs_count = of_gpio_count(op->dev.of_node);
+	ms->gpio_cs_count = gpiod_count(&op->dev, NULL);
 	if (ms->gpio_cs_count > 0) {
 		master->num_chipselect = ms->gpio_cs_count;
 		ms->gpio_cs = kmalloc_array(ms->gpio_cs_count,
Signature · 1 line
2.35.1
maintainer
#1 lore raw
Quoted 4 lines · Andy Shevchenko

As a preparation to unexport of_gpio_named_count(), convert the driver to use gpiod_count() instead.

Applied to

broonie/spi.git for-next

Thanks!

[1/1] spi: mpc52xx: Replace of_gpio_count() by gpiod_count()

      commit: a0c4b120431172490793fb21d43c908b35fd3e50

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