diff mbox

[v9,07/20] i.MX: improve CCM emulator log consistency

Message ID 1436020465-2069-1-git-send-email-jcd@tribudubois.net
State New
Headers show

Commit Message

Jean-Christophe Dubois July 4, 2015, 2:34 p.m. UTC
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:
    * Improve logs

 hw/misc/imx_ccm.c | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

Comments

Peter Crosthwaite July 5, 2015, 4:19 a.m. UTC | #1
Same comments as for CCM RE commit message generalisation.

With these commit message rewrites, I suggest change the first one to
be the right commit message format and for the rest

git commit --amend -c <earlier commit that is similar but for different dev>

And tweak as needed.

Regards,
Peter

On Sat, Jul 4, 2015 at 7:34 AM, Jean-Christophe Dubois
<jcd@tribudubois.net> wrote:
> 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:
>     * Improve logs
>
>  hw/misc/imx_ccm.c | 11 +++++------
>  1 file changed, 5 insertions(+), 6 deletions(-)
>
> diff --git a/hw/misc/imx_ccm.c b/hw/misc/imx_ccm.c
> index 2e9bd9c..2e19dbb 100644
> --- a/hw/misc/imx_ccm.c
> +++ b/hw/misc/imx_ccm.c
> @@ -16,11 +16,10 @@
>  #define CKIH_FREQ 26000000 /* 26MHz crystal input */
>  #define CKIL_FREQ    32768 /* nominal 32khz clock */
>
> -
>  //#define DEBUG_CCM 1
>  #ifdef DEBUG_CCM
>  #define DPRINTF(fmt, args...) \
> -do { printf("imx_ccm: " fmt , ##args); } while (0)
> +do { printf("%s: " fmt , TYPE_IMX_CCM, ##args); } while (0)
>  #else
>  #define DPRINTF(fmt, args...) do {} while (0)
>  #endif
> @@ -28,7 +27,7 @@ do { printf("imx_ccm: " fmt , ##args); } while (0)
>  static int imx_ccm_post_load(void *opaque, int version_id);
>
>  static const VMStateDescription vmstate_imx_ccm = {
> -    .name = "imx-ccm",
> +    .name = TYPE_IMX_CCM,
>      .version_id = 1,
>      .minimum_version_id = 1,
>      .fields = (VMStateField[]) {
> @@ -110,7 +109,7 @@ static void update_clocks(IMXCCMState *s)
>      s->hsp_clk_freq = s->mcu_clk_freq / (1 + EXTRACT(s->pdr0, HSP));
>      s->ipg_clk_freq = s->hsp_clk_freq / (1 + EXTRACT(s->pdr0, IPG));
>
> -    DPRINTF("Clocks: mcu %uMHz, HSP %uMHz, IPG %uHz\n",
> +    DPRINTF("%s: mcu %uMHz, HSP %uMHz, IPG %uHz\n", __func__,
>              s->mcu_clk_freq / 1000000,
>              s->hsp_clk_freq / 1000000,
>              s->ipg_clk_freq);
> @@ -136,7 +135,7 @@ static uint64_t imx_ccm_read(void *opaque, hwaddr offset,
>  {
>      IMXCCMState *s = (IMXCCMState *)opaque;
>
> -    DPRINTF("read(offset=%x)", offset >> 2);
> +    DPRINTF("%s(offset=%x)", __func__, offset >> 2);
>      switch (offset >> 2) {
>      case 0: /* CCMR */
>          DPRINTF(" ccmr = 0x%x\n", s->ccmr);
> @@ -177,7 +176,7 @@ static void imx_ccm_write(void *opaque, hwaddr offset,
>  {
>      IMXCCMState *s = (IMXCCMState *)opaque;
>
> -    DPRINTF("write(offset=%x, value = %x)\n",
> +    DPRINTF("%s(offset=%x, value = %x)\n", __func__,
>              offset >> 2, (unsigned int)value);
>      switch (offset >> 2) {
>      case 0:
> --
> 2.1.4
>
>
diff mbox

Patch

diff --git a/hw/misc/imx_ccm.c b/hw/misc/imx_ccm.c
index 2e9bd9c..2e19dbb 100644
--- a/hw/misc/imx_ccm.c
+++ b/hw/misc/imx_ccm.c
@@ -16,11 +16,10 @@ 
 #define CKIH_FREQ 26000000 /* 26MHz crystal input */
 #define CKIL_FREQ    32768 /* nominal 32khz clock */
 
-
 //#define DEBUG_CCM 1
 #ifdef DEBUG_CCM
 #define DPRINTF(fmt, args...) \
-do { printf("imx_ccm: " fmt , ##args); } while (0)
+do { printf("%s: " fmt , TYPE_IMX_CCM, ##args); } while (0)
 #else
 #define DPRINTF(fmt, args...) do {} while (0)
 #endif
@@ -28,7 +27,7 @@  do { printf("imx_ccm: " fmt , ##args); } while (0)
 static int imx_ccm_post_load(void *opaque, int version_id);
 
 static const VMStateDescription vmstate_imx_ccm = {
-    .name = "imx-ccm",
+    .name = TYPE_IMX_CCM,
     .version_id = 1,
     .minimum_version_id = 1,
     .fields = (VMStateField[]) {
@@ -110,7 +109,7 @@  static void update_clocks(IMXCCMState *s)
     s->hsp_clk_freq = s->mcu_clk_freq / (1 + EXTRACT(s->pdr0, HSP));
     s->ipg_clk_freq = s->hsp_clk_freq / (1 + EXTRACT(s->pdr0, IPG));
 
-    DPRINTF("Clocks: mcu %uMHz, HSP %uMHz, IPG %uHz\n",
+    DPRINTF("%s: mcu %uMHz, HSP %uMHz, IPG %uHz\n", __func__,
             s->mcu_clk_freq / 1000000,
             s->hsp_clk_freq / 1000000,
             s->ipg_clk_freq);
@@ -136,7 +135,7 @@  static uint64_t imx_ccm_read(void *opaque, hwaddr offset,
 {
     IMXCCMState *s = (IMXCCMState *)opaque;
 
-    DPRINTF("read(offset=%x)", offset >> 2);
+    DPRINTF("%s(offset=%x)", __func__, offset >> 2);
     switch (offset >> 2) {
     case 0: /* CCMR */
         DPRINTF(" ccmr = 0x%x\n", s->ccmr);
@@ -177,7 +176,7 @@  static void imx_ccm_write(void *opaque, hwaddr offset,
 {
     IMXCCMState *s = (IMXCCMState *)opaque;
 
-    DPRINTF("write(offset=%x, value = %x)\n",
+    DPRINTF("%s(offset=%x, value = %x)\n", __func__,
             offset >> 2, (unsigned int)value);
     switch (offset >> 2) {
     case 0: