diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2022-12-14 13:35:09 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2023-01-10 15:43:47 +0100 |
| commit | c0afc799fb9a19a11f651596fe23b4b755593887 (patch) | |
| tree | 9c27f1533193d31757744b22b2af9186d23e67ed /arch/mips | |
| parent | e70b9d7a74698f1374244b2251216428db920aed (diff) | |
| download | barebox-c0afc799fb9a19a11f651596fe23b4b755593887.tar.gz barebox-c0afc799fb9a19a11f651596fe23b4b755593887.tar.xz | |
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 <s.hauer@pengutronix.de>
Reviewed-by: Marco Felsch <m.felsch@pengutronix.de>
Link: https://lore.barebox.org/20221214123512.189688-3-s.hauer@pengutronix.de
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch/mips')
| -rw-r--r-- | arch/mips/mach-ar231x/ar231x_reset.c | 2 | ||||
| -rw-r--r-- | arch/mips/mach-ath79/art.c | 6 | ||||
| -rw-r--r-- | arch/mips/mach-xburst/include/mach/devices.h | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/arch/mips/mach-ar231x/ar231x_reset.c b/arch/mips/mach-ar231x/ar231x_reset.c index 91414edd26..bdaceb65b2 100644 --- a/arch/mips/mach-ar231x/ar231x_reset.c +++ b/arch/mips/mach-ar231x/ar231x_reset.c @@ -48,7 +48,7 @@ void ar231x_reset_bit(u32 val, enum reset_state state) } EXPORT_SYMBOL(ar231x_reset_bit); -static int ar231x_reset_probe(struct device_d *dev) +static int ar231x_reset_probe(struct device *dev) { struct resource *iores; iores = dev_request_mem_resource(dev, 0); diff --git a/arch/mips/mach-ath79/art.c b/arch/mips/mach-ath79/art.c index de9f638e1c..c1a9263559 100644 --- a/arch/mips/mach-ath79/art.c +++ b/arch/mips/mach-ath79/art.c @@ -18,7 +18,7 @@ struct ar9300_eeprom { u8 mac_addr[6]; }; -static int art_set_mac(struct device_d *dev, struct ar9300_eeprom *eeprom) +static int art_set_mac(struct device *dev, struct ar9300_eeprom *eeprom) { struct device_node *node = dev->of_node; struct device_node *rnode; @@ -36,7 +36,7 @@ static int art_set_mac(struct device_d *dev, struct ar9300_eeprom *eeprom) return 0; } -static int art_read_mac(struct device_d *dev, const char *file) +static int art_read_mac(struct device *dev, const char *file) { int fd, rbytes; struct ar9300_eeprom eeprom; @@ -73,7 +73,7 @@ static int art_read_mac(struct device_d *dev, const char *file) return art_set_mac(dev, &eeprom); } -static int art_probe(struct device_d *dev) +static int art_probe(struct device *dev) { char *path; int ret; diff --git a/arch/mips/mach-xburst/include/mach/devices.h b/arch/mips/mach-xburst/include/mach/devices.h index 1e5e9476aa..ea567a3161 100644 --- a/arch/mips/mach-xburst/include/mach/devices.h +++ b/arch/mips/mach-xburst/include/mach/devices.h @@ -5,6 +5,6 @@ #include <driver.h> -struct device_d *jz_add_uart(int id, unsigned long base, unsigned int clock); +struct device *jz_add_uart(int id, unsigned long base, unsigned int clock); #endif /* __MACH_XBURST_DEVICES_H */ |