"Menon, Nishanth" <[email protected]> writes: > Kevin Hilman said the following on 12/19/2009 04:35 AM: >> SR and SRF currenly direclty access OPP struct internals. Use new >> accessor function to get OPP ID. >> >> Also SRF was doing doing direct access of the OPP struct array using a >> convoluted conversion from a 'level' to an OPP ID, when they're >> actually the same thing. >> >> Signed-off-by: Kevin Hilman <[email protected]> >> --- >> arch/arm/mach-omap2/resource34xx.c | 6 +++--- >> arch/arm/mach-omap2/smartreflex.c | 4 ++-- >> 2 files changed, 5 insertions(+), 5 deletions(-) >> >> diff --git a/arch/arm/mach-omap2/resource34xx.c >> b/arch/arm/mach-omap2/resource34xx.c >> index 1fa8bb5..31b8af2 100644 >> --- a/arch/arm/mach-omap2/resource34xx.c >> +++ b/arch/arm/mach-omap2/resource34xx.c >> @@ -204,7 +204,7 @@ static int __deprecated freq_to_opp(u8 *opp_id, struct >> omap_opp *opps, >> opp = opp_find_freq_ceil(opps, &freq); >> if (IS_ERR(opp)) >> return -EINVAL; >> - *opp_id = opp->opp_id; >> + *opp_id = opp_get_opp_id(opp); >> return 0; >> } >> @@ -337,8 +337,8 @@ static int program_opp(int res, struct omap_opp >> *opp, int target_level, >> #ifdef CONFIG_OMAP_SMARTREFLEX >> unsigned long t_opp, c_opp; >> - t_opp = ID_VDD(res) | ID_OPP_NO(opp[target_level - 1].opp_id); >> - c_opp = ID_VDD(res) | ID_OPP_NO(opp[current_level - 1].opp_id); >> + t_opp = ID_VDD(res) | ID_OPP_NO(target_level - 1); >> + c_opp = ID_VDD(res) | ID_OPP_NO(current_level - 1); >> > not sure of this. > target_level = 3, > opp[target_level - 1].opp_id ==3 > BUT, > target_level -1 = 2 > these are not the same.
Hmm, good catch. Now that it's not being used as index into OPP array, I should be using target level directly. Will update in pm-wip-opp. Kevin >> #endif >> /* See if have a freq associated, if not, invalid opp */ >> diff --git a/arch/arm/mach-omap2/smartreflex.c >> b/arch/arm/mach-omap2/smartreflex.c >> index 9c0d5bf..d341857 100644 >> --- a/arch/arm/mach-omap2/smartreflex.c >> +++ b/arch/arm/mach-omap2/smartreflex.c >> @@ -159,7 +159,7 @@ static u8 get_vdd1_opp(void) >> if (IS_ERR(opp)) >> return 0; >> - return opp->opp_id; >> + return opp_get_opp_id(opp); >> } >> static u8 get_vdd2_opp(void) >> @@ -174,7 +174,7 @@ static u8 get_vdd2_opp(void) >> if (IS_ERR(opp)) >> return 0; >> - return opp->opp_id; >> + return opp_get_opp_id(opp); >> } >> > > -- > To unsubscribe from this list: send the line "unsubscribe linux-omap" in > the body of a message to [email protected] > More majordomo info at http://vger.kernel.org/majordomo-info.html -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
