lkml.org 
[lkml]   [2019]   [Nov]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 4.19 075/237] macintosh/windfarm_smu_sat: Fix debug output
    Date
    From: Benjamin Herrenschmidt <benh@kernel.crashing.org>

    [ Upstream commit fc0c8b36d379a046525eacb9c3323ca635283757 ]

    There's some antiquated debug output that's trying
    to do a hand-made hexdump and turning into horrible
    1-byte-per-line output these days.

    Use print_hex_dump() instead

    Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
    Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/macintosh/windfarm_smu_sat.c | 25 +++++++------------------
    1 file changed, 7 insertions(+), 18 deletions(-)

    diff --git a/drivers/macintosh/windfarm_smu_sat.c b/drivers/macintosh/windfarm_smu_sat.c
    index da7f4fc1a51d1..a0f61eb853c55 100644
    --- a/drivers/macintosh/windfarm_smu_sat.c
    +++ b/drivers/macintosh/windfarm_smu_sat.c
    @@ -22,14 +22,6 @@

    #define VERSION "1.0"

    -#define DEBUG
    -
    -#ifdef DEBUG
    -#define DBG(args...) printk(args)
    -#else
    -#define DBG(args...) do { } while(0)
    -#endif
    -
    /* If the cache is older than 800ms we'll refetch it */
    #define MAX_AGE msecs_to_jiffies(800)

    @@ -106,13 +98,10 @@ struct smu_sdbp_header *smu_sat_get_sdb_partition(unsigned int sat_id, int id,
    buf[i+2] = data[3];
    buf[i+3] = data[2];
    }
    -#ifdef DEBUG
    - DBG(KERN_DEBUG "sat %d partition %x:", sat_id, id);
    - for (i = 0; i < len; ++i)
    - DBG(" %x", buf[i]);
    - DBG("\n");
    -#endif

    + printk(KERN_DEBUG "sat %d partition %x:", sat_id, id);
    + print_hex_dump(KERN_DEBUG, " ", DUMP_PREFIX_OFFSET,
    + 16, 1, buf, len, false);
    if (size)
    *size = len;
    return (struct smu_sdbp_header *) buf;
    @@ -132,13 +121,13 @@ static int wf_sat_read_cache(struct wf_sat *sat)
    if (err < 0)
    return err;
    sat->last_read = jiffies;
    +
    #ifdef LOTSA_DEBUG
    {
    int i;
    - DBG(KERN_DEBUG "wf_sat_get: data is");
    - for (i = 0; i < 16; ++i)
    - DBG(" %.2x", sat->cache[i]);
    - DBG("\n");
    + printk(KERN_DEBUG "wf_sat_get: data is");
    + print_hex_dump(KERN_DEBUG, " ", DUMP_PREFIX_OFFSET,
    + 16, 1, sat->cache, 16, false);
    }
    #endif
    return 0;
    --
    2.20.1
    \
     
     \ /
      Last update: 2019-11-16 16:43    [W:4.658 / U:0.132 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site