[PATCH 3/4] regulator: ab8500-ext: Remove unnecessary checking forab9540 and ab8540

From: Axel Lin
Date: Sun Apr 07 2013 - 11:15:34 EST


This code was added by commit 0fe17e20a6
"regulator: ab8500-ext: Add support for AB9540 regulators"
and commit bd44e2cb "regulator: ab8500: Also check for AB8505 based platforms"

The original patch[1] is to set info->desc.ops = &ab9540_ext_regulator_ops.

However, ab9540_ext_regulator_ops is identical to ab8500_ext_regulator_ops[2].
Thus we can complete remove the unnecessary checking for ab9540 and ab8540.

[1] https://lkml.org/lkml/2013/3/28/333
[2] https://lkml.org/lkml/2013/4/1/178

Signed-off-by: Axel Lin <axel.lin@xxxxxxxxxx>
---
drivers/regulator/ab8500-ext.c | 7 -------
1 file changed, 7 deletions(-)

diff --git a/drivers/regulator/ab8500-ext.c b/drivers/regulator/ab8500-ext.c
index 5e604a2..c7896af 100644
--- a/drivers/regulator/ab8500-ext.c
+++ b/drivers/regulator/ab8500-ext.c
@@ -389,15 +389,8 @@ int ab8500_ext_regulator_init(struct platform_device *pdev)
config.init_data = &pdata->ext_regulator[i];
config.driver_data = info;

- if ((is_ab9540(ab8500) || is_ab8540(ab8500)) &&
- ((info->desc.id == AB8500_EXT_SUPPLY1) ||
- (info->desc.id == AB8500_EXT_SUPPLY2) ||
- (info->desc.id == AB8500_EXT_SUPPLY3)))
- info->desc.ops = &ab8500_ext_regulator_ops;
-
/* register regulator with framework */
info->rdev = regulator_register(&info->desc, &config);
-
if (IS_ERR(info->rdev)) {
err = PTR_ERR(info->rdev);
dev_err(&pdev->dev, "failed to register regulator %s\n",
--
1.7.10.4



--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/