From 534f56ff2e870859e06c951ac8dfc0c6bf17c5ee Mon Sep 17 00:00:00 2001 From: Axel Lin Date: Wed, 27 Mar 2013 17:48:29 +0800 Subject: [PATCH] --- yaml --- r: 365038 b: refs/heads/master c: 292349287f6dfedf0c1b6ae678cb508d9d63d7ac h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/regulator/ab8500.c | 13 ------------- 2 files changed, 1 insertion(+), 14 deletions(-) diff --git a/[refs] b/[refs] index 2e8b29504467..855ce738646a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 530158b6d2feeb227e0079c8826b4d2a42333e80 +refs/heads/master: 292349287f6dfedf0c1b6ae678cb508d9d63d7ac diff --git a/trunk/drivers/regulator/ab8500.c b/trunk/drivers/regulator/ab8500.c index d9443b9b384a..f1453a66a0fd 100644 --- a/trunk/drivers/regulator/ab8500.c +++ b/trunk/drivers/regulator/ab8500.c @@ -42,7 +42,6 @@ * @voltage_reg: register to control regulator voltage * @voltage_mask: mask to control regulator voltage * @voltage_shift: shift to control regulator voltage - * @delay: startup/set voltage delay in us */ struct ab8500_regulator_info { struct device *dev; @@ -60,7 +59,6 @@ struct ab8500_regulator_info { u8 voltage_reg; u8 voltage_mask; u8 voltage_shift; - unsigned int delay; }; /* voltage tables for the vauxn/vintcore supplies */ @@ -337,15 +335,6 @@ static int ab8500_regulator_set_voltage_sel(struct regulator_dev *rdev, return ret; } -static int ab8500_regulator_set_voltage_time_sel(struct regulator_dev *rdev, - unsigned int old_sel, - unsigned int new_sel) -{ - struct ab8500_regulator_info *info = rdev_get_drvdata(rdev); - - return info->delay; -} - static struct regulator_ops ab8500_regulator_volt_mode_ops = { .enable = ab8500_regulator_enable, .disable = ab8500_regulator_disable, @@ -356,7 +345,6 @@ static struct regulator_ops ab8500_regulator_volt_mode_ops = { .get_voltage_sel = ab8500_regulator_get_voltage_sel, .set_voltage_sel = ab8500_regulator_set_voltage_sel, .list_voltage = regulator_list_voltage_table, - .set_voltage_time_sel = ab8500_regulator_set_voltage_time_sel, }; static struct regulator_ops ab8500_regulator_mode_ops = { @@ -492,7 +480,6 @@ static struct ab8500_regulator_info .min_uV = 2000000, .enable_time = 10000, }, - .delay = 10000, .load_lp_uA = 1000, .update_bank = 0x03, .update_reg = 0x80,