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>

2 files changed, 13 insertions, 13 deletions

diff --git a/fs/pstore/fs.c b/fs/pstore/fs.c
index b41c87665c..24b5306d15 100644
--- a/fs/pstore/fs.c
+++ b/fs/pstore/fs.c
@@ -138,7 +138,7 @@ static struct pstore_private *pstore_get_by_name(struct list_head *head,
 	return NULL;
 }
 
-static int pstore_open(struct device_d *dev, FILE *file, const char *filename)
+static int pstore_open(struct device *dev, FILE *file, const char *filename)
 {
 	struct list_head *head = dev->priv;
 	struct pstore_private *d;
@@ -157,12 +157,12 @@ static int pstore_open(struct device_d *dev, FILE *file, const char *filename)
 	return 0;
 }
 
-static int pstore_close(struct device_d *dev, FILE *file)
+static int pstore_close(struct device *dev, FILE *file)
 {
 	return 0;
 }
 
-static int pstore_read(struct device_d *dev, FILE *file, void *buf,
+static int pstore_read(struct device *dev, FILE *file, void *buf,
 		       size_t insize)
 {
 	struct pstore_private *d = file->priv;
@@ -173,7 +173,7 @@ static int pstore_read(struct device_d *dev, FILE *file, void *buf,
 	return insize;
 }
 
-static int pstore_lseek(struct device_d *dev, FILE *file, loff_t pos)
+static int pstore_lseek(struct device *dev, FILE *file, loff_t pos)
 {
 	struct pstore_private *d = file->priv;
 
@@ -182,7 +182,7 @@ static int pstore_lseek(struct device_d *dev, FILE *file, loff_t pos)
 	return 0;
 }
 
-static DIR *pstore_opendir(struct device_d *dev, const char *pathname)
+static DIR *pstore_opendir(struct device *dev, const char *pathname)
 {
 	DIR *dir;
 
@@ -196,7 +196,7 @@ static DIR *pstore_opendir(struct device_d *dev, const char *pathname)
 	return dir;
 }
 
-static struct dirent *pstore_readdir(struct device_d *dev, DIR *dir)
+static struct dirent *pstore_readdir(struct device *dev, DIR *dir)
 {
 	struct pstore_private *d = dir->priv;
 
@@ -209,14 +209,14 @@ static struct dirent *pstore_readdir(struct device_d *dev, DIR *dir)
 	return &dir->d;
 }
 
-static int pstore_closedir(struct device_d *dev, DIR *dir)
+static int pstore_closedir(struct device *dev, DIR *dir)
 {
 	free(dir);
 
 	return 0;
 }
 
-static int pstore_stat(struct device_d *dev, const char *filename,
+static int pstore_stat(struct device *dev, const char *filename,
 		       struct stat *s)
 {
 	struct pstore_private *d;
@@ -234,7 +234,7 @@ static int pstore_stat(struct device_d *dev, const char *filename,
 	return 0;
 }
 
-static void pstore_remove(struct device_d *dev)
+static void pstore_remove(struct device *dev)
 {
 	struct pstore_private *d, *tmp;
 
@@ -243,7 +243,7 @@ static void pstore_remove(struct device_d *dev)
 	}
 }
 
-static int pstore_probe(struct device_d *dev)
+static int pstore_probe(struct device *dev)
 {
 	struct list_head *priv = &allpstore;
 
diff --git a/fs/pstore/ram.c b/fs/pstore/ram.c
index c1c8b0caab..6a57586543 100644
--- a/fs/pstore/ram.c
+++ b/fs/pstore/ram.c
@@ -410,7 +410,7 @@ static int ramoops_init_prz(const char *name,
 	return 0;
 }
 
-static int ramoops_parse_dt_size(struct device_d *dev,
+static int ramoops_parse_dt_size(struct device *dev,
 				 const char *propname, u32 *value)
 {
 	u32 val32 = 0;
@@ -432,7 +432,7 @@ static int ramoops_parse_dt_size(struct device_d *dev,
 	return 0;
 }
 
-static int ramoops_parse_dt(struct device_d *dev,
+static int ramoops_parse_dt(struct device *dev,
 			    struct ramoops_platform_data *pdata)
 {
 	struct device_node *of_node = dev->of_node;
@@ -517,7 +517,7 @@ static int ramoops_of_fixup(struct device_node *root, void *data)
 	return 0;
 }
 
-static int ramoops_probe(struct device_d *dev)
+static int ramoops_probe(struct device *dev)
 {
 	struct ramoops_platform_data *pdata = dummy_data;
 	struct ramoops_context *cxt = &oops_cxt;