From bcbba9de0f66d30621a489dc8af07350f8d477fd Mon Sep 17 00:00:00 2001 From: Axel Lin Date: Sun, 7 Apr 2013 23:15:24 +0800 Subject: [PATCH] regulator: ab8500-ext: Remove unnecessary checking for ab9540 and ab8540 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 Acked-by: Lee Jones Signed-off-by: Mark Brown --- 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 5e604a2ad7cd..c7896af4aaa8 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", -- 2.39.5