| Message ID | d2dbe8e31cd441fa95b3272d155ef43ae370dc2e.1436563183.git.jcd@tribudubois.net |
|---|---|
| State | New |
| Headers | show |
On Fri, Jul 10, 2015 at 4:31 PM, Jean-Christophe Dubois <jcd@tribudubois.net> wrote: > Signed-off-by: Jean-Christophe Dubois <jcd@tribudubois.net> Reviewed-by: Peter Crosthwaite <crosthwaite.peter@gmail.com> > --- > > Changes since v1: > * not present on v1 > > Changes since v2: > * not present on v2 > > Changes since v3: > * not present on v3 > > Changes since v4: > * not present on v4 > > Changes since v5: > * not present on v5 > > Changes since v6: > * not present on v6 > > Changes since v7: > * not present on v7 > > Changes since v8: > * Fix coding style > > Changes since v9: > * no change > > Changes since v10: > * no change. > > Changes since v11: > * no change. > > hw/timer/imx_gpt.c | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/hw/timer/imx_gpt.c b/hw/timer/imx_gpt.c > index f61d4e5..01f802e 100644 > --- a/hw/timer/imx_gpt.c > +++ b/hw/timer/imx_gpt.c > @@ -70,7 +70,7 @@ static char const *imx_gpt_reg_name(uint32_t reg) > #endif > > static const VMStateDescription vmstate_imx_timer_gpt = { > - .name = "imx.gpt", > + .name = TYPE_IMX_GPT, > .version_id = 3, > .minimum_version_id = 3, > .fields = (VMStateField[]) { > @@ -107,7 +107,7 @@ static void imx_gpt_set_freq(IMXGPTState *s) > { > uint32_t clksrc = extract32(s->cr, GPT_CR_CLKSRC_SHIFT, 3); > uint32_t freq = imx_clock_frequency(s->ccm, imx_gpt_clocks[clksrc]) > - / (1 + s->pr); > + / (1 + s->pr); > s->freq = freq; > > DPRINTF("Setting clksrc %d to frequency %d\n", clksrc, freq); > @@ -134,7 +134,7 @@ static uint32_t imx_gpt_update_count(IMXGPTState *s) > } > > static inline uint32_t imx_gpt_find_limit(uint32_t count, uint32_t reg, > - uint32_t timeout) > + uint32_t timeout) > { > if ((count < reg) && (timeout > reg)) { > timeout = reg; > -- > 2.1.4 > >
diff --git a/hw/timer/imx_gpt.c b/hw/timer/imx_gpt.c index f61d4e5..01f802e 100644 --- a/hw/timer/imx_gpt.c +++ b/hw/timer/imx_gpt.c @@ -70,7 +70,7 @@ static char const *imx_gpt_reg_name(uint32_t reg) #endif static const VMStateDescription vmstate_imx_timer_gpt = { - .name = "imx.gpt", + .name = TYPE_IMX_GPT, .version_id = 3, .minimum_version_id = 3, .fields = (VMStateField[]) { @@ -107,7 +107,7 @@ static void imx_gpt_set_freq(IMXGPTState *s) { uint32_t clksrc = extract32(s->cr, GPT_CR_CLKSRC_SHIFT, 3); uint32_t freq = imx_clock_frequency(s->ccm, imx_gpt_clocks[clksrc]) - / (1 + s->pr); + / (1 + s->pr); s->freq = freq; DPRINTF("Setting clksrc %d to frequency %d\n", clksrc, freq); @@ -134,7 +134,7 @@ static uint32_t imx_gpt_update_count(IMXGPTState *s) } static inline uint32_t imx_gpt_find_limit(uint32_t count, uint32_t reg, - uint32_t timeout) + uint32_t timeout) { if ((count < reg) && (timeout > reg)) { timeout = reg;
Signed-off-by: Jean-Christophe Dubois <jcd@tribudubois.net> --- Changes since v1: * not present on v1 Changes since v2: * not present on v2 Changes since v3: * not present on v3 Changes since v4: * not present on v4 Changes since v5: * not present on v5 Changes since v6: * not present on v6 Changes since v7: * not present on v7 Changes since v8: * Fix coding style Changes since v9: * no change Changes since v10: * no change. Changes since v11: * no change. hw/timer/imx_gpt.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)