Skip to content

Commit 37fbc1a

Browse files
andy-shevbroonie
authored andcommitted
spi: Drop duplicate device_set_node() call
The SPI core provides the default fwnode for the controller, assigned by device_set_node(). No need to repeat it in the driver. Tested-by: Benoît Monin <benoit.monin@bootlin.com> # dw mobileye Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be> # renesas Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> Link: https://patch.msgid.link/20260112203534.4186261-5-andriy.shevchenko@linux.intel.com Reviewed-by: Linus Walleij <linusw@kernel.org> Signed-off-by: Mark Brown <broonie@kernel.org>
1 parent 103c510 commit 37fbc1a

17 files changed

Lines changed: 0 additions & 28 deletions

drivers/spi/spi-airoha-snfi.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1124,7 +1124,6 @@ static int airoha_snand_probe(struct platform_device *pdev)
11241124
ctrl->bits_per_word_mask = SPI_BPW_MASK(8);
11251125
ctrl->mode_bits = SPI_RX_DUAL;
11261126
ctrl->setup = airoha_snand_setup;
1127-
device_set_node(&ctrl->dev, dev_fwnode(dev));
11281127

11291128
err = airoha_snand_nfi_init(as_ctrl);
11301129
if (err)

drivers/spi/spi-dln2.c

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -682,15 +682,12 @@ static int dln2_spi_probe(struct platform_device *pdev)
682682
struct spi_controller *host;
683683
struct dln2_spi *dln2;
684684
struct dln2_platform_data *pdata = dev_get_platdata(&pdev->dev);
685-
struct device *dev = &pdev->dev;
686685
int ret;
687686

688687
host = spi_alloc_host(&pdev->dev, sizeof(*dln2));
689688
if (!host)
690689
return -ENOMEM;
691690

692-
device_set_node(&host->dev, dev_fwnode(dev));
693-
694691
platform_set_drvdata(pdev, host);
695692

696693
dln2 = spi_controller_get_devdata(host);

drivers/spi/spi-dw-core.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -936,8 +936,6 @@ int dw_spi_add_controller(struct device *dev, struct dw_spi *dws)
936936
if (!ctlr)
937937
return -ENOMEM;
938938

939-
device_set_node(&ctlr->dev, dev_fwnode(dev));
940-
941939
dws->ctlr = ctlr;
942940
dws->dma_addr = (dma_addr_t)(dws->paddr + DW_SPI_DR);
943941

drivers/spi/spi-ep93xx.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -689,7 +689,6 @@ static int ep93xx_spi_probe(struct platform_device *pdev)
689689
/* make sure that the hardware is disabled */
690690
writel(0, espi->mmio + SSPCR1);
691691

692-
device_set_node(&host->dev, dev_fwnode(&pdev->dev));
693692
error = devm_spi_register_controller(&pdev->dev, host);
694693
if (error) {
695694
dev_err(&pdev->dev, "failed to register SPI host\n");

drivers/spi/spi-gpio.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -351,7 +351,6 @@ static int spi_gpio_probe(struct platform_device *pdev)
351351
return -ENOMEM;
352352

353353
if (fwnode) {
354-
device_set_node(&host->dev, fwnode);
355354
host->use_gpio_descriptors = true;
356355
} else {
357356
status = spi_gpio_probe_pdata(pdev, host);

drivers/spi/spi-ljca.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -238,7 +238,6 @@ static int ljca_spi_probe(struct auxiliary_device *auxdev,
238238
controller->auto_runtime_pm = false;
239239
controller->max_speed_hz = LJCA_SPI_BUS_MAX_HZ;
240240

241-
device_set_node(&ljca_spi->controller->dev, dev_fwnode(&auxdev->dev));
242241
auxiliary_set_drvdata(auxdev, controller);
243242

244243
ret = spi_register_controller(controller);

drivers/spi/spi-loongson-core.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -210,7 +210,6 @@ int loongson_spi_init_controller(struct device *dev, void __iomem *regs)
210210
controller->unprepare_message = loongson_spi_unprepare_message;
211211
controller->set_cs = loongson_spi_set_cs;
212212
controller->num_chipselect = 4;
213-
device_set_node(&controller->dev, dev_fwnode(dev));
214213
dev_set_drvdata(dev, controller);
215214

216215
spi = spi_controller_get_devdata(controller);

drivers/spi/spi-mpc512x-psc.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -480,8 +480,6 @@ static int mpc512x_psc_spi_of_probe(struct platform_device *pdev)
480480
host->use_gpio_descriptors = true;
481481
host->cleanup = mpc512x_psc_spi_cleanup;
482482

483-
device_set_node(&host->dev, dev_fwnode(dev));
484-
485483
tempp = devm_platform_get_and_ioremap_resource(pdev, 0, NULL);
486484
if (IS_ERR(tempp))
487485
return dev_err_probe(dev, PTR_ERR(tempp), "could not ioremap I/O port range\n");

drivers/spi/spi-mpc52xx-psc.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -319,8 +319,6 @@ static int mpc52xx_psc_spi_of_probe(struct platform_device *pdev)
319319
host->transfer_one_message = mpc52xx_psc_spi_transfer_one_message;
320320
host->cleanup = mpc52xx_psc_spi_cleanup;
321321

322-
device_set_node(&host->dev, dev_fwnode(dev));
323-
324322
mps->psc = devm_platform_get_and_ioremap_resource(pdev, 0, NULL);
325323
if (IS_ERR(mps->psc))
326324
return dev_err_probe(dev, PTR_ERR(mps->psc), "could not ioremap I/O port range\n");

drivers/spi/spi-nxp-fspi.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1383,8 +1383,6 @@ static int nxp_fspi_probe(struct platform_device *pdev)
13831383
else
13841384
ctlr->mem_caps = &nxp_fspi_mem_caps;
13851385

1386-
device_set_node(&ctlr->dev, fwnode);
1387-
13881386
ret = devm_add_action_or_reset(dev, nxp_fspi_cleanup, f);
13891387
if (ret)
13901388
return ret;

0 commit comments

Comments
 (0)