diff options
author | Sascha Hauer <s.hauer@pengutronix.de> | 2022-12-14 13:35:08 +0100 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2023-01-10 15:43:46 +0100 |
commit | e70b9d7a74698f1374244b2251216428db920aed (patch) | |
tree | b8091531241075d04501751b5236ab54afbe48c2 /drivers/spi | |
parent | 12763d0fe56899d3729d0e6755446ed7c740a88a (diff) | |
download | barebox-e70b9d7a74698f1374244b2251216428db920aed.tar.gz barebox-e70b9d7a74698f1374244b2251216428db920aed.tar.xz |
Rename device_d::device_node to device_d::of_node
Linux struct device has the member of_node for the device_node pointer.
Rename this in barebox accordingly to minimize the necessary changes
when porting Linux code. This was done with the semantic patch:
@@ struct device_d E; @@
- E.device_node
+ E.of_node
@@ struct device_d *E; @@
- E->device_node
+ E->of_node
Plus some manual adjustments.
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Reviewed-by: Marco Felsch <m.felsch@pengutronix.de>
Link: https://lore.barebox.org/20221214123512.189688-2-s.hauer@pengutronix.de
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'drivers/spi')
-rw-r--r-- | drivers/spi/ath79_spi.c | 2 | ||||
-rw-r--r-- | drivers/spi/atmel_spi.c | 2 | ||||
-rw-r--r-- | drivers/spi/dspi_spi.c | 6 | ||||
-rw-r--r-- | drivers/spi/gpio_spi.c | 2 | ||||
-rw-r--r-- | drivers/spi/imx_spi.c | 4 | ||||
-rw-r--r-- | drivers/spi/mvebu_spi.c | 2 | ||||
-rw-r--r-- | drivers/spi/omap3_spi.c | 4 | ||||
-rw-r--r-- | drivers/spi/spi-fsl-dspi.c | 6 | ||||
-rw-r--r-- | drivers/spi/spi-fsl-qspi.c | 2 | ||||
-rw-r--r-- | drivers/spi/spi-nxp-fspi.c | 2 | ||||
-rw-r--r-- | drivers/spi/spi-sifive.c | 2 | ||||
-rw-r--r-- | drivers/spi/spi.c | 8 | ||||
-rw-r--r-- | drivers/spi/stm32_spi.c | 2 | ||||
-rw-r--r-- | drivers/spi/zynq_qspi.c | 2 |
14 files changed, 23 insertions, 23 deletions
diff --git a/drivers/spi/ath79_spi.c b/drivers/spi/ath79_spi.c index 383570b253..5b1f984be4 100644 --- a/drivers/spi/ath79_spi.c +++ b/drivers/spi/ath79_spi.c @@ -238,7 +238,7 @@ static int ath79_spi_probe(struct device_d *dev) master->num_chipselect = 3; if (IS_ENABLED(CONFIG_OFDEVICE)) { - struct device_node *node = dev->device_node; + struct device_node *node = dev->of_node; u32 num_cs; int ret; diff --git a/drivers/spi/atmel_spi.c b/drivers/spi/atmel_spi.c index ec90330e53..6c2809cfff 100644 --- a/drivers/spi/atmel_spi.c +++ b/drivers/spi/atmel_spi.c @@ -389,7 +389,7 @@ static int atmel_spi_probe(struct device_d *dev) int ret = 0; int i; struct spi_master *master; - struct device_node *node = dev->device_node; + struct device_node *node = dev->of_node; struct atmel_spi *as; struct at91_spi_platform_data *pdata = dev->platform_data; diff --git a/drivers/spi/dspi_spi.c b/drivers/spi/dspi_spi.c index fcfa2a830d..6e498dd67e 100644 --- a/drivers/spi/dspi_spi.c +++ b/drivers/spi/dspi_spi.c @@ -319,7 +319,7 @@ static int dspi_probe(struct device_d *dev) struct resource *io; struct fsl_dspi *dspi; struct spi_master *master; - struct device_node *np = dev->device_node; + struct device_node *np = dev->of_node; int ret = 0; uint32_t bus_num = 0; @@ -351,9 +351,9 @@ static int dspi_probe(struct device_d *dev) else master->bus_num = dev->id; - of_property_read_u32(dev->device_node, "fsl,spi-cs-sck-delay", + of_property_read_u32(dev->of_node, "fsl,spi-cs-sck-delay", &dspi->cs_sck_delay); - of_property_read_u32(dev->device_node, "fsl,spi-sck-cs-delay", + of_property_read_u32(dev->of_node, "fsl,spi-sck-cs-delay", &dspi->sck_cs_delay); io = dev_request_mem_resource(dev, 0); diff --git a/drivers/spi/gpio_spi.c b/drivers/spi/gpio_spi.c index 1956eed9cc..8434c37cc9 100644 --- a/drivers/spi/gpio_spi.c +++ b/drivers/spi/gpio_spi.c @@ -128,7 +128,7 @@ static int gpio_spi_setup(struct spi_device *spi) static int gpio_spi_of_probe(struct device_d *dev) { - struct device_node *np = dev->device_node; + struct device_node *np = dev->of_node; struct gpio_spi_pdata *pdata; int n, sck; diff --git a/drivers/spi/imx_spi.c b/drivers/spi/imx_spi.c index 3e0ad2db00..f70b543b4c 100644 --- a/drivers/spi/imx_spi.c +++ b/drivers/spi/imx_spi.c @@ -562,7 +562,7 @@ static __maybe_unused struct spi_imx_devtype_data spi_imx_devtype_data_2_3 = { static int imx_spi_dt_probe(struct imx_spi *imx) { - struct device_node *node = imx->master.dev->device_node; + struct device_node *node = imx->master.dev->of_node; int i; if (!node) @@ -603,7 +603,7 @@ static int imx_spi_probe(struct device_d *dev) master->num_chipselect = pdata->num_chipselect; imx->cs_array = pdata->chipselect; } else if (IS_ENABLED(CONFIG_OFDEVICE)) { - ret = of_alias_get_id(dev->device_node, "spi"); + ret = of_alias_get_id(dev->of_node, "spi"); if (ret < 0) goto err_free; master->bus_num = ret; diff --git a/drivers/spi/mvebu_spi.c b/drivers/spi/mvebu_spi.c index 3325138604..8584adfd07 100644 --- a/drivers/spi/mvebu_spi.c +++ b/drivers/spi/mvebu_spi.c @@ -356,7 +356,7 @@ static int mvebu_spi_probe(struct device_d *dev) const struct of_device_id *match; int ret = 0; - match = of_match_node(mvebu_spi_dt_ids, dev->device_node); + match = of_match_node(mvebu_spi_dt_ids, dev->of_node); if (!match) return -EINVAL; diff --git a/drivers/spi/omap3_spi.c b/drivers/spi/omap3_spi.c index 44c35673d8..ca79eaf111 100644 --- a/drivers/spi/omap3_spi.c +++ b/drivers/spi/omap3_spi.c @@ -334,10 +334,10 @@ static int omap3_spi_setup(struct spi_device *spi) static int omap3_spi_probe_dt(struct device_d *dev, struct omap3_spi_master *omap3_master) { - if (!IS_ENABLED(CONFIG_OFDEVICE) || !dev->device_node) + if (!IS_ENABLED(CONFIG_OFDEVICE) || !dev->of_node) return -ENODEV; - if (of_property_read_bool(dev->device_node, "ti,pindir-d0-out-d1-in")) + if (of_property_read_bool(dev->of_node, "ti,pindir-d0-out-d1-in")) omap3_master->swap_miso_mosi = 1; return 0; diff --git a/drivers/spi/spi-fsl-dspi.c b/drivers/spi/spi-fsl-dspi.c index 21cf84233b..5c8469576b 100644 --- a/drivers/spi/spi-fsl-dspi.c +++ b/drivers/spi/spi-fsl-dspi.c @@ -462,10 +462,10 @@ static int dspi_setup(struct spi_device *spi) return -ENOMEM; } - of_property_read_u32(spi->dev.device_node, "fsl,spi-cs-sck-delay", + of_property_read_u32(spi->dev.of_node, "fsl,spi-cs-sck-delay", &cs_sck_delay); - of_property_read_u32(spi->dev.device_node, "fsl,spi-sck-cs-delay", + of_property_read_u32(spi->dev.of_node, "fsl,spi-sck-cs-delay", &sck_cs_delay); chip->void_write_data = 0; @@ -555,7 +555,7 @@ static void dspi_init(struct fsl_dspi *dspi) static int dspi_probe(struct device_d *dev) { - struct device_node *np = dev->device_node; + struct device_node *np = dev->of_node; const struct regmap_config *regmap_config; struct spi_master *master; int ret, cs_num, bus_num = -1; diff --git a/drivers/spi/spi-fsl-qspi.c b/drivers/spi/spi-fsl-qspi.c index f9bf888603..835c93565c 100644 --- a/drivers/spi/spi-fsl-qspi.c +++ b/drivers/spi/spi-fsl-qspi.c @@ -751,7 +751,7 @@ static const char *fsl_qspi_get_name(struct spi_mem *mem) * mtd/spi-nor/fsl-quadspi.c, we set a custom name derived from the * platform_device of the controller. */ - if (of_get_available_child_count(q->dev->device_node) == 1) + if (of_get_available_child_count(q->dev->of_node) == 1) return dev_name(q->dev); name = basprintf("%s-%d", dev_name(q->dev), mem->spi->chip_select); diff --git a/drivers/spi/spi-nxp-fspi.c b/drivers/spi/spi-nxp-fspi.c index 673b91d6dc..b0378126a3 100644 --- a/drivers/spi/spi-nxp-fspi.c +++ b/drivers/spi/spi-nxp-fspi.c @@ -942,7 +942,7 @@ static const char *nxp_fspi_get_name(struct spi_mem *mem) /* Set custom name derived from the platform_device of the controller. */ - if (of_get_available_child_count(f->dev->device_node) == 1) + if (of_get_available_child_count(f->dev->of_node) == 1) return dev_name(f->dev); name = basprintf("%s-%d", dev_name(f->dev), mem->spi->chip_select); diff --git a/drivers/spi/spi-sifive.c b/drivers/spi/spi-sifive.c index 713bcc0c3b..eb87ba1d8c 100644 --- a/drivers/spi/spi-sifive.c +++ b/drivers/spi/spi-sifive.c @@ -457,7 +457,7 @@ static const struct spi_controller_mem_ops sifive_spi_mem_ops = { static void sifive_spi_dt_probe(struct sifive_spi *spi) { - struct device_node *node = spi->ctlr.dev->device_node; + struct device_node *node = spi->ctlr.dev->of_node; spi->fifo_depth = SIFIVE_SPI_DEFAULT_DEPTH; of_property_read_u32(node, "sifive,fifo-depth", &spi->fifo_depth); diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c index b840dbe286..15c8a9f447 100644 --- a/drivers/spi/spi.c +++ b/drivers/spi/spi.c @@ -71,7 +71,7 @@ struct spi_device *spi_new_device(struct spi_controller *ctrl, /* allocate a free id for this chip */ proxy->dev.id = DEVICE_ID_DYNAMIC; proxy->dev.type_data = proxy; - proxy->dev.device_node = chip->device_node; + proxy->dev.of_node = chip->device_node; proxy->dev.parent = ctrl->dev; proxy->master = proxy->controller = ctrl; @@ -110,7 +110,7 @@ static void spi_of_register_slaves(struct spi_controller *ctrl) struct device_node *n; struct spi_board_info chip; struct property *reg; - struct device_node *node = ctrl->dev->device_node; + struct device_node *node = ctrl->dev->of_node; if (!IS_ENABLED(CONFIG_OFDEVICE)) return; @@ -259,8 +259,8 @@ int spi_register_controller(struct spi_controller *ctrl) if (ctrl->num_chipselect == 0) return -EINVAL; - if ((ctrl->bus_num < 0) && ctrl->dev->device_node) - ctrl->bus_num = of_alias_get_id(ctrl->dev->device_node, "spi"); + if ((ctrl->bus_num < 0) && ctrl->dev->of_node) + ctrl->bus_num = of_alias_get_id(ctrl->dev->of_node, "spi"); /* convention: dynamically assigned bus IDs count down from the max */ if (ctrl->bus_num < 0) diff --git a/drivers/spi/stm32_spi.c b/drivers/spi/stm32_spi.c index 639c4f1740..1d7ce1224a 100644 --- a/drivers/spi/stm32_spi.c +++ b/drivers/spi/stm32_spi.c @@ -511,7 +511,7 @@ static int stm32_spi_get_fifo_size(struct stm32_spi_priv *priv) static void stm32_spi_dt_probe(struct stm32_spi_priv *priv) { - struct device_node *node = priv->master.dev->device_node; + struct device_node *node = priv->master.dev->of_node; int i; priv->master.num_chipselect = of_gpio_named_count(node, "cs-gpios"); diff --git a/drivers/spi/zynq_qspi.c b/drivers/spi/zynq_qspi.c index f0edc41c37..f8073d8f90 100644 --- a/drivers/spi/zynq_qspi.c +++ b/drivers/spi/zynq_qspi.c @@ -541,7 +541,7 @@ static const struct spi_controller_mem_ops zynq_qspi_mem_ops = { static int zynq_qspi_probe(struct device_d *dev) { - struct device_node *np = dev->device_node; + struct device_node *np = dev->of_node; struct spi_controller *ctlr; struct zynq_qspi *xqspi; struct resource *iores; |