6 files changed, 22 insertions, 16 deletions
diff --git a/fs/squashfs/Kconfig b/fs/squashfs/Kconfig
index 19b8297af6..af187a2a8a 100644
--- a/fs/squashfs/Kconfig
+++ b/fs/squashfs/Kconfig
@@ -1,3 +1,5 @@
+# SPDX-License-Identifier: GPL-2.0-only
+
 menuconfig FS_SQUASHFS
 	bool
 	prompt "squashfs support"
diff --git a/fs/squashfs/Makefile b/fs/squashfs/Makefile
index 81fc7e570d..59a78a24b0 100644
--- a/fs/squashfs/Makefile
+++ b/fs/squashfs/Makefile
@@ -1,3 +1,5 @@
+# SPDX-License-Identifier: GPL-2.0-only
+
 obj-y	+= squashfs.o
 obj-y	+= block.o
 obj-y	+= cache.o
diff --git a/fs/squashfs/squashfs.c b/fs/squashfs/squashfs.c
index be03618b2f..f2e5769a19 100644
--- a/fs/squashfs/squashfs.c
+++ b/fs/squashfs/squashfs.c
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: GPL-2.0-only
+
 #include <common.h>
 #include <malloc.h>
 #include <driver.h>
@@ -39,7 +41,7 @@ char *squashfs_devread(struct squashfs_sb_info *fs, int byte_offset,
 	return buf;
 }
 
-static void squashfs_set_rootarg(struct fs_device_d *fsdev)
+static void squashfs_set_rootarg(struct fs_device *fsdev)
 {
 	struct ubi_volume_desc *ubi_vol;
 	struct ubi_volume_info vi = {};
@@ -88,9 +90,9 @@ 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;
+	struct fs_device *fsdev;
 	int ret;
 	struct super_block *sb;
 
@@ -118,9 +120,9 @@ 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 fs_device *fsdev;
 	struct super_block *sb;
 
 	fsdev = dev_to_fs_device(dev);
@@ -129,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;
@@ -163,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;
@@ -195,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;
@@ -249,7 +251,7 @@ struct squashfs_dir {
 	char root_d_name[256];
 };
 
-static struct fs_driver_d squashfs_driver = {
+static struct fs_driver squashfs_driver = {
 	.open		= squashfs_open,
 	.close		= squashfs_close,
 	.read		= squashfs_read,
diff --git a/fs/squashfs/squashfs.h b/fs/squashfs/squashfs.h
index 825df2aedd..d22e83dc3c 100644
--- a/fs/squashfs/squashfs.h
+++ b/fs/squashfs/squashfs.h
@@ -17,7 +17,7 @@
  * squashfs.h
  */
 
-#include <printk.h>
+#include <linux/printk.h>
 #include <fs.h>
 #include <linux/fs.h>
 #include <linux/kernel.h>
@@ -54,8 +54,8 @@ static inline struct squashfs_page *squashfs_page(struct page *page)
 
 char *squashfs_devread(struct squashfs_sb_info *fs, int byte_offset,
 		int byte_len);
-extern int squashfs_mount(struct fs_device_d *fsdev,
-		int silent);
+extern int squashfs_mount(struct fs_device *fsdev,
+			  int silent);
 extern void squashfs_put_super(struct super_block *sb);
 
 /* block.c */
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
diff --git a/fs/squashfs/super.c b/fs/squashfs/super.c
index 35df3a0307..2e34c0e540 100644
--- a/fs/squashfs/super.c
+++ b/fs/squashfs/super.c
@@ -91,7 +91,7 @@ void squashfs_put_super(struct super_block *sb)
 static int squashfs_fill_super(struct super_block *sb, void *data, int silent)
 {
 	struct squashfs_sb_info *msblk;
-	struct fs_device_d *fsdev = (struct fs_device_d *)data;
+	struct fs_device *fsdev = (struct fs_device *)data;
 	struct squashfs_super_block *sblk = NULL;
 	struct inode *root;
 	long long root_inode;
@@ -321,7 +321,7 @@ failed_mount:
 }
 
 
-int squashfs_mount(struct fs_device_d *fsdev, int silent)
+int squashfs_mount(struct fs_device *fsdev, int silent)
 {
 	struct super_block *sb = &fsdev->sb;