regulator: ab8500-ext: Make the return type of ab8500_ext_regulator_e…

…xit() void ab8500_ext_regulator_exit() never fails. Signed-off-by: Axel Lin <[email protected]> Acked-by: Bengt Jonsson <[email protected]> Signed-off-by: Mark Brown <[email protected]>
josf · Apr 11, 2013 · 3480c0c · 3480c0c
1 parent e343ab0
commit 3480c0c
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 10 deletions.
diff --git a/drivers/regulator/ab8500-ext.c b/drivers/regulator/ab8500-ext.c
@@ -394,7 +394,7 @@ int ab8500_ext_regulator_init(struct platform_device *pdev)
 	return 0;
 }
 
-int ab8500_ext_regulator_exit(struct platform_device *pdev)
+void ab8500_ext_regulator_exit(struct platform_device *pdev)
 {
 	int i;
 
@@ -407,8 +407,6 @@ int ab8500_ext_regulator_exit(struct platform_device *pdev)
 
 		regulator_unregister(info->rdev);
 	}
-
-	return 0;
 }
 
 MODULE_LICENSE("GPL v2");

diff --git a/drivers/regulator/ab8500.c b/drivers/regulator/ab8500.c
@@ -3194,12 +3194,9 @@ static int ab8500_regulator_remove(struct platform_device *pdev)
 		regulator_unregister(info->regulator);
 	}
 
-	if (!is_ab8505(ab8500)) {
-		/* remove external regulators (after Vaux1, 2 and 3) */
-		err = ab8500_ext_regulator_exit(pdev);
-		if (err)
-			return err;
-	}
+	/* remove external regulators (after Vaux1, 2 and 3) */
+	if (!is_ab8505(ab8500))
+		ab8500_ext_regulator_exit(pdev);
 
 	/* remove regulator debug */
 	err = ab8500_regulator_debug_exit(pdev);

diff --git a/include/linux/regulator/ab8500.h b/include/linux/regulator/ab8500.h
@@ -338,6 +338,6 @@ static inline int ab8500_regulator_debug_exit(struct platform_device *pdev)
 
 /* AB8500 external regulator functions. */
 int ab8500_ext_regulator_init(struct platform_device *pdev);
-int ab8500_ext_regulator_exit(struct platform_device *pdev);
+void ab8500_ext_regulator_exit(struct platform_device *pdev);
 
 #endif