Skip to contentSkip to conversation

mtd: Make deregister_mtd_parser return void

PATCH In review Axel Lin 2 participants 3 messages Dec 1, 2013 – Dec 9, 2013 Memory technology devices (MTD)

lore
Share & tools
lore

Axel Lin

author
#0 lore raw

PATCH 1/2 mtd: Make deregister_mtd_parser return void

deregister_mtd_parser never fails, hence make it return void.

Signed-off-by Axel Lin <[email protected]>
---
 drivers/mtd/mtdpart.c          | 3 +--
 include/linux/mtd/partitions.h | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)
drivers/mtd/mtdpart.c +1 -2
index 67a89bb..29ee91e 100644
@@ -682,12 +682,11 @@ int register_mtd_parser(struct mtd_part_parser *p)
 }
 EXPORT_SYMBOL_GPL(register_mtd_parser);
 
-int deregister_mtd_parser(struct mtd_part_parser *p)
+void deregister_mtd_parser(struct mtd_part_parser *p)
 {
 	spin_lock(&part_parser_lock);
 	list_del(&p->list);
 	spin_unlock(&part_parser_lock);
-	return 0;
 }
 EXPORT_SYMBOL_GPL(deregister_mtd_parser);
include/linux/mtd/partitions.h +1 -1
index 335ffca..d513ffb 100644
@@ -77,7 +77,7 @@ struct mtd_part_parser {
 };
 
 extern int register_mtd_parser(struct mtd_part_parser *parser);
-extern int deregister_mtd_parser(struct mtd_part_parser *parser);
+extern void deregister_mtd_parser(struct mtd_part_parser *parser);
 
 int mtd_is_partition(const struct mtd_info *mtd);
 int mtd_add_partition(struct mtd_info *master, const char *name,
Signature · 1 line
1.8.1.2
author
#1 lore raw

PATCH 2/2 mtd: Make register_mtd_parser return void

register_mtd_parser never fails, hence make it return void.

Signed-off-by Axel Lin <[email protected]>
---
 drivers/mtd/afs.c              |  3 ++-
 drivers/mtd/ar7part.c          |  3 ++-
 drivers/mtd/bcm47xxpart.c      |  3 ++-
 drivers/mtd/bcm63xxpart.c      |  3 ++-
 drivers/mtd/cmdlinepart.c      |  3 ++-
 drivers/mtd/mtdpart.c          |  4 +---
 drivers/mtd/ofpart.c           | 15 +++------------
 drivers/mtd/redboot.c          |  3 ++-
 include/linux/mtd/partitions.h |  2 +-
 9 files changed, 17 insertions(+), 22 deletions(-)
drivers/mtd/afs.c +2 -1
index 5a3942b..96a33e3 100644
@@ -264,7 +264,8 @@ static struct mtd_part_parser afs_parser = {
 
 static int __init afs_parser_init(void)
 {
-	return register_mtd_parser(&afs_parser);
+	register_mtd_parser(&afs_parser);
+	return 0;
 }
 
 static void __exit afs_parser_exit(void)
drivers/mtd/ar7part.c +2 -1
index ddc0a42..7c9172a 100644
@@ -139,7 +139,8 @@ static struct mtd_part_parser ar7_parser = {
 
 static int __init ar7_parser_init(void)
 {
-	return register_mtd_parser(&ar7_parser);
+	register_mtd_parser(&ar7_parser);
+	return 0;
 }
 
 static void __exit ar7_parser_exit(void)
drivers/mtd/bcm47xxpart.c +2 -1
index 7a6384b..931746d 100644
@@ -243,7 +243,8 @@ static struct mtd_part_parser bcm47xxpart_mtd_parser = {
 
 static int __init bcm47xxpart_init(void)
 {
-	return register_mtd_parser(&bcm47xxpart_mtd_parser);
+	register_mtd_parser(&bcm47xxpart_mtd_parser);
+	return 0;
 }
 
 static void __exit bcm47xxpart_exit(void)
drivers/mtd/bcm63xxpart.c +2 -1
index 5c81390..b2443f7 100644
@@ -221,7 +221,8 @@ static struct mtd_part_parser bcm63xx_cfe_parser = {
 
 static int __init bcm63xx_cfe_parser_init(void)
 {
-	return register_mtd_parser(&bcm63xx_cfe_parser);
+	register_mtd_parser(&bcm63xx_cfe_parser);
+	return 0;
 }
 
 static void __exit bcm63xx_cfe_parser_exit(void)
drivers/mtd/cmdlinepart.c +2 -1
index 721caeb..3e829b3 100644
@@ -395,7 +395,8 @@ static int __init cmdline_parser_init(void)
 {
 	if (mtdparts)
 		mtdpart_setup(mtdparts);
-	return register_mtd_parser(&cmdline_parser);
+	register_mtd_parser(&cmdline_parser);
+	return 0;
 }
 
 static void __exit cmdline_parser_exit(void)
drivers/mtd/mtdpart.c +1 -3
index 29ee91e..3c7d6d7 100644
@@ -672,13 +672,11 @@ static struct mtd_part_parser *get_partition_parser(const char *name)
 
 #define put_partition_parser(p) do { module_put((p)->owner); } while (0)
 
-int register_mtd_parser(struct mtd_part_parser *p)
+void register_mtd_parser(struct mtd_part_parser *p)
 {
 	spin_lock(&part_parser_lock);
 	list_add(&p->list, &part_parsers);
 	spin_unlock(&part_parser_lock);
-
-	return 0;
 }
 EXPORT_SYMBOL_GPL(register_mtd_parser);
drivers/mtd/ofpart.c +3 -12
index f0a708b..aa26c32 100644
@@ -173,18 +173,9 @@ static struct mtd_part_parser ofoldpart_parser = {
 
 static int __init ofpart_parser_init(void)
 {
-	int rc;
-	rc = register_mtd_parser(&ofpart_parser);
-	if (rc)
-		goto out;
-
-	rc = register_mtd_parser(&ofoldpart_parser);
-	if (!rc)
-		return 0;
-
-	deregister_mtd_parser(&ofoldpart_parser);
-out:
-	return rc;
+	register_mtd_parser(&ofpart_parser);
+	register_mtd_parser(&ofoldpart_parser);
+	return 0;
 }
 
 static void __exit ofpart_parser_exit(void)
drivers/mtd/redboot.c +2 -1
index 580035c..5da911e 100644
@@ -300,7 +300,8 @@ MODULE_ALIAS("RedBoot");
 
 static int __init redboot_parser_init(void)
 {
-	return register_mtd_parser(&redboot_parser);
+	register_mtd_parser(&redboot_parser);
+	return 0;
 }
 
 static void __exit redboot_parser_exit(void)
include/linux/mtd/partitions.h +1 -1
index d513ffb..6a35e6d 100644
@@ -76,7 +76,7 @@ struct mtd_part_parser {
 			struct mtd_part_parser_data *);
 };
 
-extern int register_mtd_parser(struct mtd_part_parser *parser);
+extern void register_mtd_parser(struct mtd_part_parser *parser);
 extern void deregister_mtd_parser(struct mtd_part_parser *parser);
 
 int mtd_is_partition(const struct mtd_info *mtd);
Signature · 1 line
1.8.1.2