From 3145b69873c8c16320fd8a8cd08f07cafc897c5d Mon Sep 17 00:00:00 2001 From: Axel Lin Date: Tue, 2 Aug 2011 15:34:12 +0800 Subject: [PATCH] --- yaml --- r: 272403 b: refs/heads/master c: 0fcdb109a50afb8b26709175937ba3de9486770b h: refs/heads/master i: 272401: 03705fb9e1da4a6cd418f0f24155eb7054891c70 272399: 4cb2174f59b30b82da42d99f81deedcfd4bfa390 v: v3 --- [refs] | 2 +- trunk/drivers/regulator/tps6507x-regulator.c | 8 +------- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/[refs] b/[refs] index 654febf72e13..6253061380a3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: dd32e11cdbc73e570f9fe7425fa820c97070a2c4 +refs/heads/master: 0fcdb109a50afb8b26709175937ba3de9486770b diff --git a/trunk/drivers/regulator/tps6507x-regulator.c b/trunk/drivers/regulator/tps6507x-regulator.c index bfffabc21eda..bdef70365f52 100644 --- a/trunk/drivers/regulator/tps6507x-regulator.c +++ b/trunk/drivers/regulator/tps6507x-regulator.c @@ -90,12 +90,6 @@ static const u16 LDO2_VSEL_table[] = { 3000, 3100, 3200, 3300, }; -static unsigned int num_voltages[] = {ARRAY_SIZE(VDCDCx_VSEL_table), - ARRAY_SIZE(VDCDCx_VSEL_table), - ARRAY_SIZE(VDCDCx_VSEL_table), - ARRAY_SIZE(LDO1_VSEL_table), - ARRAY_SIZE(LDO2_VSEL_table)}; - struct tps_info { const char *name; unsigned min_uV; @@ -598,7 +592,7 @@ int tps6507x_pmic_probe(struct platform_device *pdev) tps->desc[i].name = info->name; tps->desc[i].id = i; - tps->desc[i].n_voltages = num_voltages[i]; + tps->desc[i].n_voltages = info->table_len; tps->desc[i].ops = (i > TPS6507X_DCDC_3 ? &tps6507x_pmic_ldo_ops : &tps6507x_pmic_dcdc_ops); tps->desc[i].type = REGULATOR_VOLTAGE;