Merge branch 'remotes/lorenzo/pci/dwc'

[sfrench/cifs-2.6.git] / drivers / macintosh / windfarm_smu_sat.c

diff --git a/drivers/macintosh/windfarm_smu_sat.c b/drivers/macintosh/windfarm_smu_sat.c
index da7f4fc1a51d17b0824c661d4cb473cf5f4165c4..a0f61eb853c55155e6f4f2df37f7bb2c53a1381c 100644 (file)
--- 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;