|
@@ -305,7 +305,7 @@ static struct block2mtd_dev *add_device(char *devname, int erase_size)
|
|
}
|
|
}
|
|
list_add(&dev->list, &blkmtd_device_list);
|
|
list_add(&dev->list, &blkmtd_device_list);
|
|
INFO("mtd%d: [%s] erase_size = %dKiB [%d]", dev->mtd.index,
|
|
INFO("mtd%d: [%s] erase_size = %dKiB [%d]", dev->mtd.index,
|
|
- dev->mtd.name + strlen("blkmtd: "),
|
|
|
|
|
|
+ dev->mtd.name + strlen("block2mtd: "),
|
|
dev->mtd.erasesize >> 10, dev->mtd.erasesize);
|
|
dev->mtd.erasesize >> 10, dev->mtd.erasesize);
|
|
return dev;
|
|
return dev;
|
|
|
|
|
|
@@ -366,9 +366,9 @@ static inline void kill_final_newline(char *str)
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
-#define parse_err(fmt, args...) do { \
|
|
|
|
- ERROR("block2mtd: " fmt "\n", ## args); \
|
|
|
|
- return 0; \
|
|
|
|
|
|
+#define parse_err(fmt, args...) do { \
|
|
|
|
+ ERROR(fmt, ## args); \
|
|
|
|
+ return 0; \
|
|
} while (0)
|
|
} while (0)
|
|
|
|
|
|
#ifndef MODULE
|
|
#ifndef MODULE
|
|
@@ -473,7 +473,7 @@ static void __devexit block2mtd_exit(void)
|
|
block2mtd_sync(&dev->mtd);
|
|
block2mtd_sync(&dev->mtd);
|
|
del_mtd_device(&dev->mtd);
|
|
del_mtd_device(&dev->mtd);
|
|
INFO("mtd%d: [%s] removed", dev->mtd.index,
|
|
INFO("mtd%d: [%s] removed", dev->mtd.index,
|
|
- dev->mtd.name + strlen("blkmtd: "));
|
|
|
|
|
|
+ dev->mtd.name + strlen("block2mtd: "));
|
|
list_del(&dev->list);
|
|
list_del(&dev->list);
|
|
block2mtd_free_device(dev);
|
|
block2mtd_free_device(dev);
|
|
}
|
|
}
|