|
@@ -38,6 +38,8 @@
|
|
|
|
|
|
#include <asm/uaccess.h>
|
|
|
|
|
|
+#include "mtdcore.h"
|
|
|
+
|
|
|
static DEFINE_MUTEX(mtd_mutex);
|
|
|
|
|
|
/*
|
|
@@ -365,7 +367,6 @@ static void mtdchar_erase_callback (struct erase_info *instr)
|
|
|
wake_up((wait_queue_head_t *)instr->priv);
|
|
|
}
|
|
|
|
|
|
-#ifdef CONFIG_HAVE_MTD_OTP
|
|
|
static int otp_select_filemode(struct mtd_file_info *mfi, int mode)
|
|
|
{
|
|
|
struct mtd_info *mtd = mfi->mtd;
|
|
@@ -395,9 +396,6 @@ static int otp_select_filemode(struct mtd_file_info *mfi, int mode)
|
|
|
|
|
|
return 0;
|
|
|
}
|
|
|
-#else
|
|
|
-# define otp_select_filemode(f,m) -EOPNOTSUPP
|
|
|
-#endif
|
|
|
|
|
|
static int mtdchar_writeoob(struct file *file, struct mtd_info *mtd,
|
|
|
uint64_t start, uint32_t length, void __user *ptr,
|
|
@@ -890,7 +888,6 @@ static int mtdchar_ioctl(struct file *file, u_int cmd, u_long arg)
|
|
|
break;
|
|
|
}
|
|
|
|
|
|
-#ifdef CONFIG_HAVE_MTD_OTP
|
|
|
case OTPSELECT:
|
|
|
{
|
|
|
int mode;
|
|
@@ -946,7 +943,6 @@ static int mtdchar_ioctl(struct file *file, u_int cmd, u_long arg)
|
|
|
ret = mtd_lock_user_prot_reg(mtd, oinfo.start, oinfo.length);
|
|
|
break;
|
|
|
}
|
|
|
-#endif
|
|
|
|
|
|
/* This ioctl is being deprecated - it truncates the ECC layout */
|
|
|
case ECCGETLAYOUT:
|
|
@@ -1242,7 +1238,7 @@ static struct file_system_type mtd_inodefs_type = {
|
|
|
};
|
|
|
MODULE_ALIAS_FS("mtd_inodefs");
|
|
|
|
|
|
-static int __init init_mtdchar(void)
|
|
|
+int __init init_mtdchar(void)
|
|
|
{
|
|
|
int ret;
|
|
|
|
|
@@ -1268,18 +1264,10 @@ err_unregister_chdev:
|
|
|
return ret;
|
|
|
}
|
|
|
|
|
|
-static void __exit cleanup_mtdchar(void)
|
|
|
+void __exit cleanup_mtdchar(void)
|
|
|
{
|
|
|
unregister_filesystem(&mtd_inodefs_type);
|
|
|
__unregister_chrdev(MTD_CHAR_MAJOR, 0, 1 << MINORBITS, "mtd");
|
|
|
}
|
|
|
|
|
|
-module_init(init_mtdchar);
|
|
|
-module_exit(cleanup_mtdchar);
|
|
|
-
|
|
|
-MODULE_ALIAS_CHARDEV_MAJOR(MTD_CHAR_MAJOR);
|
|
|
-
|
|
|
-MODULE_LICENSE("GPL");
|
|
|
-MODULE_AUTHOR("David Woodhouse <dwmw2@infradead.org>");
|
|
|
-MODULE_DESCRIPTION("Direct character-device access to MTD devices");
|
|
|
MODULE_ALIAS_CHARDEV_MAJOR(MTD_CHAR_MAJOR);
|