From c0afc799fb9a19a11f651596fe23b4b755593887 Mon Sep 17 00:00:00 2001 From: Sascha Hauer Date: Wed, 14 Dec 2022 13:35:09 +0100 Subject: Rename struct device_d to device The '_d' suffix was originally introduced in case we want to import Linux struct device as a separate struct into barebox. Over time it became clear that this won't happen, instead barebox struct device_d is basically the same as Linux struct device. Rename the struct name accordingly to make porting Linux code easier. Signed-off-by: Sascha Hauer Reviewed-by: Marco Felsch Link: https://lore.barebox.org/20221214123512.189688-3-s.hauer@pengutronix.de Signed-off-by: Sascha Hauer --- drivers/pinctrl/imx-iomux-v1.c | 4 ++-- drivers/pinctrl/imx-iomux-v2.c | 2 +- drivers/pinctrl/imx-iomux-v3.c | 4 ++-- drivers/pinctrl/mvebu/armada-370.c | 2 +- drivers/pinctrl/mvebu/armada-xp.c | 2 +- drivers/pinctrl/mvebu/common.c | 2 +- drivers/pinctrl/mvebu/common.h | 2 +- drivers/pinctrl/mvebu/dove.c | 2 +- drivers/pinctrl/mvebu/kirkwood.c | 2 +- drivers/pinctrl/pinctrl-at91-pio4.c | 4 ++-- drivers/pinctrl/pinctrl-at91.c | 8 ++++---- drivers/pinctrl/pinctrl-bcm2835.c | 2 +- drivers/pinctrl/pinctrl-mxs.c | 2 +- drivers/pinctrl/pinctrl-rockchip.c | 8 ++++---- drivers/pinctrl/pinctrl-single.c | 2 +- drivers/pinctrl/pinctrl-stm32.c | 11 ++++++----- drivers/pinctrl/pinctrl-tegra-xusb.c | 6 +++--- drivers/pinctrl/pinctrl-tegra20.c | 2 +- drivers/pinctrl/pinctrl-tegra30.c | 2 +- drivers/pinctrl/pinctrl-vf610.c | 2 +- drivers/pinctrl/pinctrl.c | 4 ++-- 21 files changed, 38 insertions(+), 37 deletions(-) (limited to 'drivers/pinctrl') diff --git a/drivers/pinctrl/imx-iomux-v1.c b/drivers/pinctrl/imx-iomux-v1.c index c276f51cb3..f7fc2ae35a 100644 --- a/drivers/pinctrl/imx-iomux-v1.c +++ b/drivers/pinctrl/imx-iomux-v1.c @@ -251,7 +251,7 @@ static struct pinctrl_ops imx_iomux_v1_ops = { .set_state = imx_iomux_v1_set_state, }; -static int imx_pinctrl_dt(struct device_d *dev, void __iomem *base) +static int imx_pinctrl_dt(struct device *dev, void __iomem *base) { struct imx_iomux_v1 *iomux; int ret; @@ -270,7 +270,7 @@ static int imx_pinctrl_dt(struct device_d *dev, void __iomem *base) return ret; } -static int imx_iomux_v1_probe(struct device_d *dev) +static int imx_iomux_v1_probe(struct device *dev) { int ret = 0; void __iomem *base; diff --git a/drivers/pinctrl/imx-iomux-v2.c b/drivers/pinctrl/imx-iomux-v2.c index 35772d13a8..f1f6486930 100644 --- a/drivers/pinctrl/imx-iomux-v2.c +++ b/drivers/pinctrl/imx-iomux-v2.c @@ -105,7 +105,7 @@ int imx_iomux_setup_multiple_pins(const unsigned int *pin_list, unsigned count) return 0; } -static int imx_iomux_probe(struct device_d *dev) +static int imx_iomux_probe(struct device *dev) { struct resource *iores; iores = dev_request_mem_resource(dev, 0); diff --git a/drivers/pinctrl/imx-iomux-v3.c b/drivers/pinctrl/imx-iomux-v3.c index e09934fe85..5331bb90c5 100644 --- a/drivers/pinctrl/imx-iomux-v3.c +++ b/drivers/pinctrl/imx-iomux-v3.c @@ -156,7 +156,7 @@ static struct pinctrl_ops imx_iomux_v3_ops = { .set_state = imx_iomux_v3_set_state, }; -static int imx_pinctrl_dt(struct device_d *dev, void __iomem *base) +static int imx_pinctrl_dt(struct device *dev, void __iomem *base) { struct imx_iomux_v3 *iomux; const struct imx_iomux_v3_data *drvdata; @@ -179,7 +179,7 @@ static int imx_pinctrl_dt(struct device_d *dev, void __iomem *base) return ret; } -static int imx_iomux_v3_probe(struct device_d *dev) +static int imx_iomux_v3_probe(struct device *dev) { void __iomem *base; struct resource *iores; diff --git a/drivers/pinctrl/mvebu/armada-370.c b/drivers/pinctrl/mvebu/armada-370.c index 23000986ff..017982adf3 100644 --- a/drivers/pinctrl/mvebu/armada-370.c +++ b/drivers/pinctrl/mvebu/armada-370.c @@ -385,7 +385,7 @@ static struct of_device_id armada_370_pinctrl_of_match[] = { { }, }; -static int armada_370_pinctrl_probe(struct device_d *dev) +static int armada_370_pinctrl_probe(struct device *dev) { struct resource *iores; const struct of_device_id *match = diff --git a/drivers/pinctrl/mvebu/armada-xp.c b/drivers/pinctrl/mvebu/armada-xp.c index f0761c4d3d..d6abf1cc7f 100644 --- a/drivers/pinctrl/mvebu/armada-xp.c +++ b/drivers/pinctrl/mvebu/armada-xp.c @@ -367,7 +367,7 @@ static struct of_device_id armada_xp_pinctrl_of_match[] = { { }, }; -static int armada_xp_pinctrl_probe(struct device_d *dev) +static int armada_xp_pinctrl_probe(struct device *dev) { struct resource *iores; const struct of_device_id *match = diff --git a/drivers/pinctrl/mvebu/common.c b/drivers/pinctrl/mvebu/common.c index 265e57aaa3..6ff8023b2c 100644 --- a/drivers/pinctrl/mvebu/common.c +++ b/drivers/pinctrl/mvebu/common.c @@ -93,7 +93,7 @@ static struct pinctrl_ops mvebu_pinctrl_ops = { .set_state = mvebu_pinctrl_set_state, }; -int mvebu_pinctrl_probe(struct device_d *dev, +int mvebu_pinctrl_probe(struct device *dev, struct mvebu_pinctrl_soc_info *soc) { struct mvebu_pinctrl *pctl; diff --git a/drivers/pinctrl/mvebu/common.h b/drivers/pinctrl/mvebu/common.h index 079a47679e..203b0530d8 100644 --- a/drivers/pinctrl/mvebu/common.h +++ b/drivers/pinctrl/mvebu/common.h @@ -136,7 +136,7 @@ static inline int default_mpp_ctrl_set(void __iomem *base, unsigned int pid, return 0; } -int mvebu_pinctrl_probe(struct device_d *dev, +int mvebu_pinctrl_probe(struct device *dev, struct mvebu_pinctrl_soc_info *soc); #endif diff --git a/drivers/pinctrl/mvebu/dove.c b/drivers/pinctrl/mvebu/dove.c index 5177abed3b..a21fda2cfc 100644 --- a/drivers/pinctrl/mvebu/dove.c +++ b/drivers/pinctrl/mvebu/dove.c @@ -690,7 +690,7 @@ static struct of_device_id dove_pinctrl_of_match[] = { { } }; -static int dove_pinctrl_probe(struct device_d *dev) +static int dove_pinctrl_probe(struct device *dev) { struct resource *iores; const struct of_device_id *match = diff --git a/drivers/pinctrl/mvebu/kirkwood.c b/drivers/pinctrl/mvebu/kirkwood.c index bceb561c5f..067cfe2897 100644 --- a/drivers/pinctrl/mvebu/kirkwood.c +++ b/drivers/pinctrl/mvebu/kirkwood.c @@ -426,7 +426,7 @@ static struct of_device_id kirkwood_pinctrl_of_match[] = { { } }; -static int kirkwood_pinctrl_probe(struct device_d *dev) +static int kirkwood_pinctrl_probe(struct device *dev) { struct resource *iores; const struct of_device_id *match = diff --git a/drivers/pinctrl/pinctrl-at91-pio4.c b/drivers/pinctrl/pinctrl-at91-pio4.c index afe74a12c0..0262429fdf 100644 --- a/drivers/pinctrl/pinctrl-at91-pio4.c +++ b/drivers/pinctrl/pinctrl-at91-pio4.c @@ -226,7 +226,7 @@ static struct gpio_ops at91_gpio4_ops = { .set = at91_gpio4_set, }; -static int pinctrl_at91_pio4_gpiochip_add(struct device_d *dev, +static int pinctrl_at91_pio4_gpiochip_add(struct device *dev, struct pinctrl_at91_pio4 *pinctrl) { const struct at91_pinctrl_data *drvdata; @@ -269,7 +269,7 @@ static struct pinctrl_ops pinctrl_at91_pio4_ops = { .set_state = pinctrl_at91_pio4_set_state, }; -static int pinctrl_at91_pio4_probe(struct device_d *dev) +static int pinctrl_at91_pio4_probe(struct device *dev) { struct device_node *np = dev->of_node; struct pinctrl_at91_pio4 *pinctrl; diff --git a/drivers/pinctrl/pinctrl-at91.c b/drivers/pinctrl/pinctrl-at91.c index 1551b0eda9..197ee54f56 100644 --- a/drivers/pinctrl/pinctrl-at91.c +++ b/drivers/pinctrl/pinctrl-at91.c @@ -96,7 +96,7 @@ int at91_mux_pin(unsigned pin, enum at91_mux mux, int use_pullup) { struct at91_gpio_chip *at91_gpio = pin_to_controller(pin); void __iomem *pio; - struct device_d *dev; + struct device *dev; unsigned mask = pin_to_mask(pin); int bank = pin_to_bank(pin); @@ -371,7 +371,7 @@ static struct of_device_id at91_pinctrl_dt_ids[] = { } }; -static struct at91_pinctrl_mux_ops *at91_pinctrl_get_driver_data(struct device_d *dev) +static struct at91_pinctrl_mux_ops *at91_pinctrl_get_driver_data(struct device *dev) { struct at91_pinctrl_mux_ops *ops_data = NULL; int rc; @@ -469,7 +469,7 @@ static struct pinctrl_ops at91_pinctrl_ops = { .set_state = at91_pinctrl_set_state, }; -static int at91_pinctrl_probe(struct device_d *dev) +static int at91_pinctrl_probe(struct device *dev) { struct at91_pinctrl *info; int ret; @@ -616,7 +616,7 @@ static struct of_device_id at91_gpio_dt_ids[] = { }, }; -static int at91_gpio_probe(struct device_d *dev) +static int at91_gpio_probe(struct device *dev) { struct at91_gpio_chip *at91_gpio; struct clk *clk; diff --git a/drivers/pinctrl/pinctrl-bcm2835.c b/drivers/pinctrl/pinctrl-bcm2835.c index 933445294f..aed679ffc6 100644 --- a/drivers/pinctrl/pinctrl-bcm2835.c +++ b/drivers/pinctrl/pinctrl-bcm2835.c @@ -141,7 +141,7 @@ static struct pinctrl_ops bcm2835_pinctrl_ops = { .set_state = bcm2835_pinctrl_set_state, }; -static int bcm2835_gpio_probe(struct device_d *dev) +static int bcm2835_gpio_probe(struct device *dev) { const struct plat_data *plat_data; struct resource *iores; diff --git a/drivers/pinctrl/pinctrl-mxs.c b/drivers/pinctrl/pinctrl-mxs.c index acee8178a5..c70e2f943e 100644 --- a/drivers/pinctrl/pinctrl-mxs.c +++ b/drivers/pinctrl/pinctrl-mxs.c @@ -119,7 +119,7 @@ static struct pinctrl_ops mxs_pinctrl_ops = { .set_state = mxs_pinctrl_set_state, }; -static int mxs_pinctrl_probe(struct device_d *dev) +static int mxs_pinctrl_probe(struct device *dev) { struct mxs_pinctrl *iomux; int ret = 0; diff --git a/drivers/pinctrl/pinctrl-rockchip.c b/drivers/pinctrl/pinctrl-rockchip.c index bd780399fe..d7ded69675 100644 --- a/drivers/pinctrl/pinctrl-rockchip.c +++ b/drivers/pinctrl/pinctrl-rockchip.c @@ -324,7 +324,7 @@ static struct gpio_ops rockchip_gpio_ops = { .get_direction = rockchip_gpiov2_get_direction, }; -static int rockchip_gpio_probe(struct device_d *dev) +static int rockchip_gpio_probe(struct device *dev) { struct rockchip_pinctrl *info = dev->parent->priv; struct rockchip_pin_ctrl *ctrl = info->ctrl; @@ -836,7 +836,7 @@ static struct pinctrl_ops rockchip_pinctrl_ops = { }; static int rockchip_get_bank_data(struct rockchip_pin_bank *bank, - struct device_d *dev) + struct device *dev) { struct resource node_res, *res; @@ -870,7 +870,7 @@ static int rockchip_get_bank_data(struct rockchip_pin_bank *bank, static struct of_device_id rockchip_pinctrl_dt_match[]; static struct rockchip_pin_ctrl *rockchip_pinctrl_get_soc_data( - struct rockchip_pinctrl *d, struct device_d *dev) + struct rockchip_pinctrl *d, struct device *dev) { const struct of_device_id *match; struct device_node *node = dev->of_node; @@ -995,7 +995,7 @@ static struct rockchip_pin_ctrl *rockchip_pinctrl_get_soc_data( return ctrl; } -static int rockchip_pinctrl_probe(struct device_d *dev) +static int rockchip_pinctrl_probe(struct device *dev) { struct rockchip_pinctrl *info; struct rockchip_pin_ctrl *ctrl; diff --git a/drivers/pinctrl/pinctrl-single.c b/drivers/pinctrl/pinctrl-single.c index f45948a447..18af3a4034 100644 --- a/drivers/pinctrl/pinctrl-single.c +++ b/drivers/pinctrl/pinctrl-single.c @@ -119,7 +119,7 @@ static struct pinctrl_ops pcs_ops = { .set_state = pcs_set_state, }; -int pinctrl_single_probe(struct device_d *dev) +int pinctrl_single_probe(struct device *dev) { struct resource *iores; struct pinctrl_single *pcs; diff --git a/drivers/pinctrl/pinctrl-stm32.c b/drivers/pinctrl/pinctrl-stm32.c index deaec56b16..4badb6bb25 100644 --- a/drivers/pinctrl/pinctrl-stm32.c +++ b/drivers/pinctrl/pinctrl-stm32.c @@ -86,7 +86,8 @@ static inline u32 stm32_gpio_get_alt(u32 function) return 0; } -static int __stm32_pinctrl_set_state(struct device_d *dev, struct device_node *pins) +static int __stm32_pinctrl_set_state(struct device *dev, + struct device_node *pins) { int ret; @@ -178,7 +179,7 @@ static int __stm32_pinctrl_set_state(struct device_d *dev, struct device_node *p static int stm32_pinctrl_set_state(struct pinctrl_device *pdev, struct device_node *np) { struct stm32_pinctrl *pinctrl = to_stm32_pinctrl(pdev); - struct device_d *dev = pdev->dev; + struct device *dev = pdev->dev; struct device_node *pins; void *prop; int ret; @@ -268,9 +269,9 @@ static struct gpio_ops stm32_gpio_ops = { static int stm32_gpiochip_add(struct stm32_gpio_bank *bank, struct device_node *np, - struct device_d *parent) + struct device *parent) { - struct device_d *dev; + struct device *dev; struct resource *iores; enum { PINCTRL_PHANDLE, GPIOCTRL_OFFSET, PINCTRL_OFFSET, PINCOUNT, GPIO_RANGE_NCELLS }; const __be32 *gpio_ranges; @@ -339,7 +340,7 @@ static struct pinctrl_ops stm32_pinctrl_ops = { .set_state = stm32_pinctrl_set_state, }; -static int stm32_pinctrl_probe(struct device_d *dev) +static int stm32_pinctrl_probe(struct device *dev) { struct stm32_pinctrl *pinctrl; unsigned nbanks = 0; diff --git a/drivers/pinctrl/pinctrl-tegra-xusb.c b/drivers/pinctrl/pinctrl-tegra-xusb.c index b288689154..f40da72a9c 100644 --- a/drivers/pinctrl/pinctrl-tegra-xusb.c +++ b/drivers/pinctrl/pinctrl-tegra-xusb.c @@ -62,7 +62,7 @@ struct tegra_xusb_padctl_lane { }; struct tegra_xusb_padctl { - struct device_d *dev; + struct device *dev; void __iomem *regs; struct reset_control *rst; @@ -268,7 +268,7 @@ static const struct phy_ops sata_phy_ops = { .power_off = sata_phy_power_off, }; -static struct phy *tegra_xusb_padctl_xlate(struct device_d *dev, +static struct phy *tegra_xusb_padctl_xlate(struct device *dev, struct of_phandle_args *args) { struct tegra_xusb_padctl *padctl = dev->priv; @@ -365,7 +365,7 @@ static struct pinctrl_ops pinctrl_tegra_xusb_ops = { .set_state = pinctrl_tegra_xusb_set_state, }; -static int pinctrl_tegra_xusb_probe(struct device_d *dev) +static int pinctrl_tegra_xusb_probe(struct device *dev) { struct resource *iores; struct tegra_xusb_padctl *padctl; diff --git a/drivers/pinctrl/pinctrl-tegra20.c b/drivers/pinctrl/pinctrl-tegra20.c index 53254d073e..cb24e84b19 100644 --- a/drivers/pinctrl/pinctrl-tegra20.c +++ b/drivers/pinctrl/pinctrl-tegra20.c @@ -282,7 +282,7 @@ static struct pinctrl_ops pinctrl_tegra20_ops = { .set_state = pinctrl_tegra20_set_state, }; -static int pinctrl_tegra20_probe(struct device_d *dev) +static int pinctrl_tegra20_probe(struct device *dev) { struct resource *iores; struct pinctrl_tegra20 *ctrl; diff --git a/drivers/pinctrl/pinctrl-tegra30.c b/drivers/pinctrl/pinctrl-tegra30.c index 71c0a1357d..771dc9c23f 100644 --- a/drivers/pinctrl/pinctrl-tegra30.c +++ b/drivers/pinctrl/pinctrl-tegra30.c @@ -857,7 +857,7 @@ static struct pinctrl_ops pinctrl_tegra30_ops = { .set_state = pinctrl_tegra30_set_state, }; -static int pinctrl_tegra30_probe(struct device_d *dev) +static int pinctrl_tegra30_probe(struct device *dev) { struct resource *iores; struct pinctrl_tegra30 *ctrl; diff --git a/drivers/pinctrl/pinctrl-vf610.c b/drivers/pinctrl/pinctrl-vf610.c index 28474ed278..36d877578c 100644 --- a/drivers/pinctrl/pinctrl-vf610.c +++ b/drivers/pinctrl/pinctrl-vf610.c @@ -113,7 +113,7 @@ static struct pinctrl_ops pinctrl_vf610_ops = { .get_direction = pinctrl_vf610_get_direction, }; -static int pinctrl_vf610_probe(struct device_d *dev) +static int pinctrl_vf610_probe(struct device *dev) { int ret; struct resource *io; diff --git a/drivers/pinctrl/pinctrl.c b/drivers/pinctrl/pinctrl.c index a441adaf08..1f272daef7 100644 --- a/drivers/pinctrl/pinctrl.c +++ b/drivers/pinctrl/pinctrl.c @@ -161,7 +161,7 @@ int of_pinctrl_select_state_default(struct device_node *np) return of_pinctrl_select_state(np, "default"); } -int pinctrl_select_state(struct device_d *dev, const char *name) +int pinctrl_select_state(struct device *dev, const char *name) { struct device_node *np; @@ -172,7 +172,7 @@ int pinctrl_select_state(struct device_d *dev, const char *name) return of_pinctrl_select_state(np, name); } -int pinctrl_select_state_default(struct device_d *dev) +int pinctrl_select_state_default(struct device *dev) { return pinctrl_select_state(dev, "default"); } -- cgit v1.2.3