Message ID | 1433634771-23438-1-git-send-email-hauke@hauke-m.de |
---|---|
State | Awaiting Upstream, archived |
Delegated to: | David Miller |
Headers | show |
On Sun, 7 Jun 2015 01:52:51 +0200 Hauke Mehrtens <hauke@hauke-m.de> wrote: > Dan Carpenter reported missing brackets which resulted in reading a > wrong crystalfreq value. I also noticed that the result of this > function is ignored. > > Reported-By: Dan Carpenter <dan.carpenter@oracle.com> > Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> > --- > drivers/ssb/driver_chipcommon_pmu.c | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/drivers/ssb/driver_chipcommon_pmu.c b/drivers/ssb/driver_chipcommon_pmu.c > index 0942841..c5352ea 100644 > --- a/drivers/ssb/driver_chipcommon_pmu.c > +++ b/drivers/ssb/driver_chipcommon_pmu.c > @@ -621,8 +621,8 @@ static u32 ssb_pmu_get_alp_clock_clk0(struct ssb_chipcommon *cc) > u32 crystalfreq; > const struct pmu0_plltab_entry *e = NULL; > > - crystalfreq = chipco_read32(cc, SSB_CHIPCO_PMU_CTL) & > - SSB_CHIPCO_PMU_CTL_XTALFREQ >> SSB_CHIPCO_PMU_CTL_XTALFREQ_SHIFT; > + crystalfreq = (chipco_read32(cc, SSB_CHIPCO_PMU_CTL) & > + SSB_CHIPCO_PMU_CTL_XTALFREQ) >> SSB_CHIPCO_PMU_CTL_XTALFREQ_SHIFT; > e = pmu0_plltab_find_entry(crystalfreq); > BUG_ON(!e); > return e->freq * 1000; > @@ -634,7 +634,7 @@ u32 ssb_pmu_get_alp_clock(struct ssb_chipcommon *cc) > > switch (bus->chip_id) { > case 0x5354: > - ssb_pmu_get_alp_clock_clk0(cc); > + return ssb_pmu_get_alp_clock_clk0(cc); > default: > ssb_err("ERROR: PMU alp clock unknown for device %04X\n", > bus->chip_id); Looks good. Signed-off-by: Michael Buesch <m@bues.ch> Can some MIPS people take this, please?
On Sun, Jun 07, 2015 at 09:02:23AM +0200, Michael Büsch wrote: > Signed-off-by: Michael Buesch <m@bues.ch> > > Can some MIPS people take this, please? Will do, as usual. Unfortunately this missed my last pull request so it's going to Linus by the end of the week. Ralf -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/ssb/driver_chipcommon_pmu.c b/drivers/ssb/driver_chipcommon_pmu.c index 0942841..c5352ea 100644 --- a/drivers/ssb/driver_chipcommon_pmu.c +++ b/drivers/ssb/driver_chipcommon_pmu.c @@ -621,8 +621,8 @@ static u32 ssb_pmu_get_alp_clock_clk0(struct ssb_chipcommon *cc) u32 crystalfreq; const struct pmu0_plltab_entry *e = NULL; - crystalfreq = chipco_read32(cc, SSB_CHIPCO_PMU_CTL) & - SSB_CHIPCO_PMU_CTL_XTALFREQ >> SSB_CHIPCO_PMU_CTL_XTALFREQ_SHIFT; + crystalfreq = (chipco_read32(cc, SSB_CHIPCO_PMU_CTL) & + SSB_CHIPCO_PMU_CTL_XTALFREQ) >> SSB_CHIPCO_PMU_CTL_XTALFREQ_SHIFT; e = pmu0_plltab_find_entry(crystalfreq); BUG_ON(!e); return e->freq * 1000; @@ -634,7 +634,7 @@ u32 ssb_pmu_get_alp_clock(struct ssb_chipcommon *cc) switch (bus->chip_id) { case 0x5354: - ssb_pmu_get_alp_clock_clk0(cc); + return ssb_pmu_get_alp_clock_clk0(cc); default: ssb_err("ERROR: PMU alp clock unknown for device %04X\n", bus->chip_id);
Dan Carpenter reported missing brackets which resulted in reading a wrong crystalfreq value. I also noticed that the result of this function is ignored. Reported-By: Dan Carpenter <dan.carpenter@oracle.com> Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> --- drivers/ssb/driver_chipcommon_pmu.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)