Some drivers made their way upstream during the switch to removal
of the _d suffix. There's a define to support the old naming still,
so there was no breakage, but let's use the modern naming everywhere.
Signed-off-by: Ahmad Fatoum <a.fatoum@xxxxxxxxxxxxxx>
---
drivers/firmware/qemu_fw_cfg.c | 2 +-
drivers/net/designware_imx8.c | 2 +-
test/self/regulator.c | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/firmware/qemu_fw_cfg.c b/drivers/firmware/qemu_fw_cfg.c
index 4c7d90815be2..1ba81d1b5002 100644
--- a/drivers/firmware/qemu_fw_cfg.c
+++ b/drivers/firmware/qemu_fw_cfg.c
@@ -289,7 +289,7 @@ static const struct of_device_id qemu_fw_cfg_of_match[] = {
};
MODULE_DEVICE_TABLE(of, qemu_fw_cfg_of_match);
-static struct driver_d qemu_fw_cfg_drv = {
+static struct driver qemu_fw_cfg_drv = {
.name = "fw_cfg",
.probe = fw_cfg_probe,
.of_compatible = of_match_ptr(qemu_fw_cfg_of_match),
diff --git a/drivers/net/designware_imx8.c b/drivers/net/designware_imx8.c
index d81dd499ab29..3dbe5824e6ce 100644
--- a/drivers/net/designware_imx8.c
+++ b/drivers/net/designware_imx8.c
@@ -186,7 +186,7 @@ static __maybe_unused struct of_device_id eqos_imx8_ids[] = {
};
MODULE_DEVICE_TABLE(of, eqos_imx8_ids);
-static struct driver_d eqos_imx8_driver = {
+static struct driver eqos_imx8_driver = {
.name = "eqos-imx8",
.probe = eqos_probe_imx8,
.remove = eqos_remove_imx8,
diff --git a/test/self/regulator.c b/test/self/regulator.c
index e89164700ef1..08073cfc9158 100644
--- a/test/self/regulator.c
+++ b/test/self/regulator.c
@@ -161,7 +161,7 @@ static struct driver regulator_test_driver = {
.of_match_table = test_regulator_of_match,
};
-static struct device_d *dev;
+static struct device *dev;
static void test_regulator(void)
{
--
2.39.2
