treewide: Rename remaining struct device_d -> device

struct device_d was renamed to struct device. Rename the remaining
occurences of device_d.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

7 files changed, 20 insertions, 20 deletions

diff --git a/common/globalvar.c b/common/globalvar.c
index b3a7f6d755..a83529f98f 100644
--- a/common/globalvar.c
+++ b/common/globalvar.c
@@ -130,15 +130,15 @@ void dev_param_init_from_nv(struct device *dev, const char *name)
 /**
  * nvvar_device_dispatch - dispatch dev.<dev>.<param> name into device and parameter name
  * @name: The incoming name in the form dev.<dev>.<param>
- * @dev: The returned device_d * belonging to <dev>
+ * @dev: The returned device * belonging to <dev>
  * @pname: the parameter name
  *
- * Given a dev.<dev>.<param> string this function finds the device_d * belonging to
+ * Given a dev.<dev>.<param> string this function finds the device * belonging to
  * <dev> and the parameter name from <param>.
  *
  * Return: When incoming string does not belong to the device namespace (does not begin
  * with "dev." this function returns 0. A value > 0 is returned when the incoming string
- * is in the device namespace and the string can be dispatched into a device_d * and a
+ * is in the device namespace and the string can be dispatched into a device * and a
  * parameter name. A negative error code is returned when the incoming string belongs to
  * the device namespace, but cannot be dispatched.
  */
diff --git a/drivers/base/regmap/regmap-i2c.c b/drivers/base/regmap/regmap-i2c.c
index 583bfffc1b..a64570d8dc 100644
--- a/drivers/base/regmap/regmap-i2c.c
+++ b/drivers/base/regmap/regmap-i2c.c
@@ -11,7 +11,7 @@ static int regmap_i2c_read(void *context,
 			   const void *reg, size_t reg_size,
 			   void *val, size_t val_size)
 {
-	struct device_d *dev = context;
+	struct device *dev = context;
 	struct i2c_client *i2c = to_i2c_client(dev);
 	struct i2c_msg xfer[2];
 	int ret;
@@ -37,7 +37,7 @@ static int regmap_i2c_read(void *context,
 
 static int regmap_i2c_write(void *context, const void *data, size_t count)
 {
-	struct device_d *dev = context;
+	struct device *dev = context;
 	struct i2c_client *i2c = to_i2c_client(dev);
 	int ret;
 
diff --git a/drivers/base/regmap/regmap-spi.c b/drivers/base/regmap/regmap-spi.c
index 5a0e418065..cb6e6f2b37 100644
--- a/drivers/base/regmap/regmap-spi.c
+++ b/drivers/base/regmap/regmap-spi.c
@@ -11,7 +11,7 @@
 
 static int regmap_spi_write(void *context, const void *data, size_t count)
 {
-	struct device_d *dev = context;
+	struct device *dev = context;
 	struct spi_device *spi = to_spi_device(dev);
 
 	return spi_write(spi, data, count);
@@ -21,7 +21,7 @@ static int regmap_spi_read(void *context,
 			   const void *reg, size_t reg_size,
 			   void *val, size_t val_size)
 {
-	struct device_d *dev = context;
+	struct device *dev = context;
 	struct spi_device *spi = to_spi_device(dev);
 
 	return spi_write_then_read(spi, reg, reg_size, val, val_size);
diff --git a/drivers/firmware/qemu_fw_cfg.c b/drivers/firmware/qemu_fw_cfg.c
index 3fad90bbde..661fe5fe3e 100644
--- a/drivers/firmware/qemu_fw_cfg.c
+++ b/drivers/firmware/qemu_fw_cfg.c
@@ -171,7 +171,7 @@ static ssize_t fw_cfg_write(struct cdev *cdev, const void *buf, size_t count,
 			    loff_t pos, unsigned long flags)
 {
 	struct fw_cfg *fw_cfg = to_fw_cfg(cdev);
-	struct device_d *dev = cdev->dev;
+	struct device *dev = cdev->dev;
 	struct fw_cfg_dma __iomem *acc = fw_cfg->acc_virt;
 	dma_addr_t mapping;
 
@@ -212,7 +212,7 @@ static int fw_cfg_param_select(struct param_d *p, void *priv)
 	return fw_cfg->sel <= U16_MAX ? 0 : -EINVAL;
 }
 
-static int fw_cfg_probe(struct device_d *dev)
+static int fw_cfg_probe(struct device *dev)
 {
 	struct device_node *np = dev_of_node(dev);
 	struct resource *parent_res, *iores;
diff --git a/drivers/net/designware_imx8.c b/drivers/net/designware_imx8.c
index e64fc57c3e..bf32e35b89 100644
--- a/drivers/net/designware_imx8.c
+++ b/drivers/net/designware_imx8.c
@@ -19,7 +19,7 @@
 
 
 struct eqos_imx8_priv {
-	struct device_d *dev;
+	struct device *dev;
 	struct clk_bulk_data *clks;
 	int num_clks;
 	struct regmap *intf_regmap;
@@ -109,7 +109,7 @@ static void eqos_imx8_set_interface_mode(struct eqos *eqos)
 			   GPR_ENET_QOS_INTF_MODE_MASK, val);
 }
 
-static int eqos_init_imx8(struct device_d *dev, struct eqos *eqos)
+static int eqos_init_imx8(struct device *dev, struct eqos *eqos)
 {
 	struct device_node *np = dev->device_node;
 	struct eqos_imx8_priv *priv = eqos->priv;
@@ -164,12 +164,12 @@ static struct eqos_ops imx8_ops = {
 	.config_mac = EQOS_MAC_RXQ_CTRL0_RXQ0EN_ENABLED_DCB,
 };
 
-static int eqos_probe_imx8(struct device_d *dev)
+static int eqos_probe_imx8(struct device *dev)
 {
 	return eqos_probe(dev, &imx8_ops, xzalloc(sizeof(struct eqos_imx8_priv)));
 }
 
-static void eqos_remove_imx8(struct device_d *dev)
+static void eqos_remove_imx8(struct device *dev)
 {
 	struct eqos *eqos = dev->priv;
 	struct eqos_imx8_priv *priv = eqos->priv;
diff --git a/include/linux/scmi_protocol.h b/include/linux/scmi_protocol.h
index 7dfc3b0d02..7c15c23a34 100644
--- a/include/linux/scmi_protocol.h
+++ b/include/linux/scmi_protocol.h
@@ -91,12 +91,12 @@ struct scmi_clk_proto_ops {
  * @limits_get: gets limits on the performance level of a domain
  * @level_set: sets the performance level of a domain
  * @level_get: gets the performance level of a domain
- * @device_domain_id: gets the scmi domain id for a given device_d
- * @transition_latency_get: gets the DVFS transition latency for a given device_d
- * @device_opps_add: adds all the OPPs for a given device_d
- * @freq_set: sets the frequency for a given device_d using sustained frequency
+ * @device_domain_id: gets the scmi domain id for a given device
+ * @transition_latency_get: gets the DVFS transition latency for a given device
+ * @device_opps_add: adds all the OPPs for a given device
+ * @freq_set: sets the frequency for a given device using sustained frequency
  *	to sustained performance level mapping
- * @freq_get: gets the frequency for a given device_d using sustained frequency
+ * @freq_get: gets the frequency for a given device using sustained frequency
  *	to sustained performance level mapping
  * @est_power_get: gets the estimated power cost for a given performance domain
  *	at a given frequency
@@ -543,7 +543,7 @@ struct scmi_voltage_proto_ops {
 /**
  * struct scmi_handle - Handle returned to ARM SCMI clients for usage.
  *
- * @dev: pointer to the SCMI device_d
+ * @dev: pointer to the SCMI device
  * @version: pointer to the structure containing SCMI version information
  * @protocol_get: method to acquire a protocol and get specific
  *		       operations and a dedicated protocol handler
diff --git a/include/spi/spi.h b/include/spi/spi.h
index 5071dd6965..fa9329b08c 100644
--- a/include/spi/spi.h
+++ b/include/spi/spi.h
@@ -556,7 +556,7 @@ static inline ssize_t spi_w8r8(struct spi_device *spi, u8 cmd)
 
 extern struct bus_type spi_bus;
 
-static inline bool dev_bus_is_spi(struct device_d *dev)
+static inline bool dev_bus_is_spi(struct device *dev)
 {
 	return IS_ENABLED(CONFIG_SPI) && dev->bus == &spi_bus;
 }