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 /fs/squashfs | |
| parent | e70b9d7a74698f1374244b2251216428db920aed (diff) | |
| download | barebox-c0afc799fb9a19a11f651596fe23b4b755593887.tar.gz | |
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 'fs/squashfs')
| -rw-r--r-- | fs/squashfs/squashfs.c | 12 | ||||
| -rw-r--r-- | fs/squashfs/squashfs_fs_sb.h | 2 |
2 files changed, 7 insertions, 7 deletions
diff --git a/fs/squashfs/squashfs.c b/fs/squashfs/squashfs.c index 030be57887..96531be0f6 100644 --- a/fs/squashfs/squashfs.c +++ b/fs/squashfs/squashfs.c @@ -90,7 +90,7 @@ static const struct super_operations squashfs_super_ops = { .destroy_inode = squashfs_destroy_inode, }; -static int squashfs_probe(struct device_d *dev) +static int squashfs_probe(struct device *dev) { struct fs_device_d *fsdev; int ret; @@ -120,7 +120,7 @@ err_out: return ret; } -static void squashfs_remove(struct device_d *dev) +static void squashfs_remove(struct device *dev) { struct fs_device_d *fsdev; struct super_block *sb; @@ -131,7 +131,7 @@ static void squashfs_remove(struct device_d *dev) squashfs_put_super(sb); } -static int squashfs_open(struct device_d *dev, FILE *file, const char *filename) +static int squashfs_open(struct device *dev, FILE *file, const char *filename) { struct inode *inode = file->f_inode; struct squashfs_page *page; @@ -165,7 +165,7 @@ error: return -ENOMEM; } -static int squashfs_close(struct device_d *dev, FILE *f) +static int squashfs_close(struct device *dev, FILE *f) { struct squashfs_page *page = f->priv; int i; @@ -197,8 +197,8 @@ static int squashfs_read_buf(struct squashfs_page *page, int pos, void **buf) return 0; } -static int squashfs_read(struct device_d *_dev, FILE *f, void *buf, - size_t insize) +static int squashfs_read(struct device *_dev, FILE *f, void *buf, + size_t insize) { unsigned int size = insize; unsigned int pos = f->pos; diff --git a/fs/squashfs/squashfs_fs_sb.h b/fs/squashfs/squashfs_fs_sb.h index 2b6f81d33a..c6fc37d48f 100644 --- a/fs/squashfs/squashfs_fs_sb.h +++ b/fs/squashfs/squashfs_fs_sb.h @@ -77,6 +77,6 @@ struct squashfs_sb_info { unsigned int inodes; int xattr_ids; struct cdev *cdev; - struct device_d *dev; + struct device *dev; }; #endif |