#include <asm/mach-types.h>
 #include <asm/mach/irq.h>
 
-#ifdef VERBOSE
-#define debug dev_dbg
-#else
-#define debug(...)
-#endif
-
 /* Commands to send to the chip. */
 #define LM8323_CMD_READ_ID             0x80 /* Read chip ID. */
 #define LM8323_CMD_WRITE_CFG           0x81 /* Set configuration item. */
                s16 keycode = lm->keymap[key];
 
                if (likely(keycode > 0)) {
-                       debug(&lm->client->dev, "key 0x%02x %s\n", key,
+                       dev_vdbg(&lm->client->dev, "key 0x%02x %s\n", key,
                              isdown ? "down" : "up");
                        if (likely(lm->kp_enabled)) {
                                input_report_key(lm->idev, keycode, isdown);
 
        if (lm8323_read(lm, LM8323_CMD_READ_ERR, &error, 1) == 1) {
                if (error & ERR_FIFOOVER)
-                       debug(&lm->client->dev, "fifo overflow!\n");
+                       dev_vdbg(&lm->client->dev, "fifo overflow!\n");
                if (error & ERR_KEYOVR)
-                       debug(&lm->client->dev, "more than two keys pressed\n");
+                       dev_vdbg(&lm->client->dev, "more than two keys pressed\n");
                if (error & ERR_CMDUNK)
-                       debug(&lm->client->dev, "unknown command submitted\n");
+                       dev_vdbg(&lm->client->dev, "unknown command submitted\n");
                if (error & ERR_BADPAR)
-                       debug(&lm->client->dev, "bad command parameter\n");
+                       dev_vdbg(&lm->client->dev, "bad command parameter\n");
        }
 }
 
                        process_keys(lm);
                if (ints & INT_ROTATOR) {
                        /* We don't currently support the rotator. */
-                       debug(&lm->client->dev, "rotator fired\n");
+                       dev_vdbg(&lm->client->dev, "rotator fired\n");
                }
                if (ints & INT_ERROR) {
-                       debug(&lm->client->dev, "error!\n");
+                       dev_vdbg(&lm->client->dev, "error!\n");
                        lm8323_process_error(lm);
                }
                if (ints & INT_NOINIT) {
                        lm8323_configure(lm);
                }
                if (ints & INT_PWM1) {
-                       debug(&lm->client->dev, "pwm1 engine completed\n");
+                       dev_vdbg(&lm->client->dev, "pwm1 engine completed\n");
                        pwm_done(&lm->pwm1);
                }
                if (ints & INT_PWM2) {
-                       debug(&lm->client->dev, "pwm2 engine completed\n");
+                       dev_vdbg(&lm->client->dev, "pwm2 engine completed\n");
                        pwm_done(&lm->pwm2);
                }
                if (ints & INT_PWM3) {
-                       debug(&lm->client->dev, "pwm3 engine completed\n");
+                       dev_vdbg(&lm->client->dev, "pwm3 engine completed\n");
                        pwm_done(&lm->pwm3);
                }
        }
                lm->size_x = 12;
        }
 
-       debug(&c->dev, "Keypad size: %d x %d\n", lm->size_x, lm->size_y);
+       dev_vdbg(&client->dev, "Keypad size: %d x %d\n", lm->size_x, lm->size_y);
 
        lm->debounce_time = pdata->debounce_time;
        if (lm->debounce_time == 0) /* Default. */