From f662623968e17a5044ba546fd1834ceb40241e48 Mon Sep 17 00:00:00 2001 From: Sascha Hauer Date: Wed, 14 Dec 2022 13:35:10 +0100 Subject: Rename struct driver_d to driver The '_d' suffix was originally meant to distinguish barebox struct names from Linux struct names. struct driver doesn't exist in Linux, so we can rename it and remove the meaningless suffix. Signed-off-by: Sascha Hauer Reviewed-by: Marco Felsch Link: https://lore.barebox.org/20221214123512.189688-4-s.hauer@pengutronix.de Signed-off-by: Sascha Hauer --- drivers/misc/jtag.c | 2 +- drivers/misc/mem.c | 2 +- drivers/misc/sram.c | 2 +- drivers/misc/starfive-pwrseq.c | 2 +- drivers/misc/state.c | 2 +- drivers/misc/storage-by-uuid.c | 2 +- drivers/misc/ubootvar.c | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) (limited to 'drivers/misc') diff --git a/drivers/misc/jtag.c b/drivers/misc/jtag.c index ab241106af..e884e58bac 100644 --- a/drivers/misc/jtag.c +++ b/drivers/misc/jtag.c @@ -358,7 +358,7 @@ static void jtag_remove(struct device *pdev) dev_notice(pdev, "Device removed\n"); } -static struct driver_d jtag_driver = { +static struct driver jtag_driver = { .name = JTAG_NAME, .probe = jtag_probe, .remove = jtag_remove, diff --git a/drivers/misc/mem.c b/drivers/misc/mem.c index e1eabbffdb..0cf021cf97 100644 --- a/drivers/misc/mem.c +++ b/drivers/misc/mem.c @@ -41,7 +41,7 @@ static int mem_probe(struct device *dev) return 0; } -static struct driver_d mem_drv = { +static struct driver mem_drv = { .name = "mem", .probe = mem_probe, }; diff --git a/drivers/misc/sram.c b/drivers/misc/sram.c index 7e4e8dcdd9..e4492c65aa 100644 --- a/drivers/misc/sram.c +++ b/drivers/misc/sram.c @@ -54,7 +54,7 @@ static __maybe_unused struct of_device_id sram_dt_ids[] = { }, }; -static struct driver_d sram_driver = { +static struct driver sram_driver = { .name = "mmio-sram", .probe = sram_probe, .of_compatible = sram_dt_ids, diff --git a/drivers/misc/starfive-pwrseq.c b/drivers/misc/starfive-pwrseq.c index e8b52b57bb..45f3b1c9ff 100644 --- a/drivers/misc/starfive-pwrseq.c +++ b/drivers/misc/starfive-pwrseq.c @@ -37,7 +37,7 @@ static struct of_device_id starfive_pwrseq_dt_ids[] = { { /* sentinel */ } }; -static struct driver_d starfive_pwrseq_driver = { +static struct driver starfive_pwrseq_driver = { .name = "starfive_pwrseq", .probe = starfive_pwrseq_probe, .of_compatible = starfive_pwrseq_dt_ids, diff --git a/drivers/misc/state.c b/drivers/misc/state.c index 3dbfe7dd20..9c332339f5 100644 --- a/drivers/misc/state.c +++ b/drivers/misc/state.c @@ -45,7 +45,7 @@ static __maybe_unused struct of_device_id state_ids[] = { } }; -static struct driver_d state_driver = { +static struct driver state_driver = { .name = "state", .probe = state_probe, .of_compatible = DRV_OF_COMPAT(state_ids), diff --git a/drivers/misc/storage-by-uuid.c b/drivers/misc/storage-by-uuid.c index 6434a077ea..a938bfaaa2 100644 --- a/drivers/misc/storage-by-uuid.c +++ b/drivers/misc/storage-by-uuid.c @@ -190,7 +190,7 @@ static struct of_device_id storage_by_uuid_dt_ids[] = { } }; -static struct driver_d storage_by_uuid_driver = { +static struct driver storage_by_uuid_driver = { .name = "storage-by-uuid", .probe = storage_by_uuid_probe, .of_compatible = storage_by_uuid_dt_ids, diff --git a/drivers/misc/ubootvar.c b/drivers/misc/ubootvar.c index 059059c92f..92830f91c5 100644 --- a/drivers/misc/ubootvar.c +++ b/drivers/misc/ubootvar.c @@ -351,7 +351,7 @@ static struct of_device_id ubootenv_dt_ids[] = { } }; -static struct driver_d ubootenv_driver = { +static struct driver ubootenv_driver = { .name = "uboot-environment", .probe = ubootenv_probe, .of_compatible = ubootenv_dt_ids, -- cgit v1.2.3