diff --git a/arch/arm/configs/htcleo_defconfig b/arch/arm/configs/htcleo_defconfig
index 6ee0a4b6..c6697304 100644
--- a/arch/arm/configs/htcleo_defconfig
+++ b/arch/arm/configs/htcleo_defconfig
@@ -1246,7 +1246,7 @@ CONFIG_VIDEO_HELPER_CHIPS_AUTO=y
 CONFIG_MSM_CAMERA=y
 CONFIG_MSM_CAMERA_LEGACY=y
 # CONFIG_MSM_CAMERA_7X30 is not set
-CONFIG_720P_CAMERA=y
+# CONFIG_720P_CAMERA is not set
 # CONFIG_MSM_CAMERA_DEBUG is not set
 
 #
diff --git a/arch/arm/mach-msm/board-htcleo-bl-led.c b/arch/arm/mach-msm/board-htcleo-bl-led.c
index 95d65721..d2ccd0ee 100644
--- a/arch/arm/mach-msm/board-htcleo-bl-led.c
+++ b/arch/arm/mach-msm/board-htcleo-bl-led.c
@@ -56,7 +56,7 @@ int htcleo_brightness_set_bkl(uint8_t value)
 	int ret;
 	uint8_t cmd[2], data[2];
 
-	printk("microp_set_bkl(%d)\n", value);
+	LCMDBG("microp_set_bkl(%d)\n", value);
 
 	if (value > 9)
 	{
diff --git a/arch/arm/mach-msm/board-htcleo-bl.c b/arch/arm/mach-msm/board-htcleo-bl.c
index 0f3500fb..7d7525f3 100644
--- a/arch/arm/mach-msm/board-htcleo-bl.c
+++ b/arch/arm/mach-msm/board-htcleo-bl.c
@@ -58,7 +58,7 @@ int htcleo_brightness_set_bkl(uint8_t value)
 	int ret;
 	uint8_t cmd[2], data[2];
 
-	pr_debug("microp_set_bkl(%d)\n", value);
+	LCMDBG("microp_set_bkl(%d)\n", value);
 
 	if (value > 9)
 	{
diff --git a/arch/arm/mach-msm/board-htcleo-ls.c b/arch/arm/mach-msm/board-htcleo-ls.c
index 0b9d1095..959f3061 100644
--- a/arch/arm/mach-msm/board-htcleo-ls.c
+++ b/arch/arm/mach-msm/board-htcleo-ls.c
@@ -226,7 +226,7 @@ static long lightsensor_ioctl(struct file *file, unsigned int cmd, unsigned long
 
 	mutex_lock(&api_lock);
 
-	pr_debug("%s cmd %d\n", __func__, _IOC_NR(cmd));
+	D("%s cmd %d\n", __func__, _IOC_NR(cmd));
 	if (!the_data.opened)
 	{
 		return -EIO;
@@ -240,12 +240,12 @@ static long lightsensor_ioctl(struct file *file, unsigned int cmd, unsigned long
 			rc = -EFAULT;
 			break;
 		}
-		pr_info("%s ls set to: %d\n", __func__, val);
+		D("%s ls set to: %d\n", __func__, val);
 		rc = val ? lightsensor_enable() : lightsensor_disable();
 		break;
 	case LIGHTSENSOR_IOCTL_GET_ENABLED:
 		val = p->enabled;
-		pr_debug("%s enabled %d\n", __func__, val);
+		D("%s enabled %d\n", __func__, val);
 		rc = put_user(val, (unsigned long __user *)arg);
 		break;
 	default:
diff --git a/arch/arm/mach-msm/board-htcleo-microp.c b/arch/arm/mach-msm/board-htcleo-microp.c
index 403fdb63..30f49678 100644
--- a/arch/arm/mach-msm/board-htcleo-microp.c
+++ b/arch/arm/mach-msm/board-htcleo-microp.c
@@ -373,7 +373,7 @@ EXPORT_SYMBOL(microp_gpo_disable);
 int __capella_cm3602_power(int on)
 {
 	int rc;
-	printk(KERN_DEBUG "%s: Turn the capella_cm3602 power %s\n",
+	pr_debug("%s: Turn the capella_cm3602 power %s\n",
 		__func__, (on) ? "on" : "off");
 	if (on) {
 		rc = microp_gpo_enable(GPO_CM3602);
diff --git a/arch/arm/mach-msm/board-htcleo-proximity.c b/arch/arm/mach-msm/board-htcleo-proximity.c
index 0242e9ff..1bf1b56c 100644
--- a/arch/arm/mach-msm/board-htcleo-proximity.c
+++ b/arch/arm/mach-msm/board-htcleo-proximity.c
@@ -32,6 +32,8 @@
 #define INT_PSENSOR	(1<<4)
 #define GPO_PROXIMITY   0x3
 
+#define D(x...) pr_debug(x)
+
 static int misc_opened;
 
 static void p_sensor_do_work(struct work_struct *w);
@@ -50,14 +52,14 @@ static int report_psensor_data(void)
 {
 	int ret, ps_data = 0;
 	uint8_t data[3] = {0, 0, 0};
-	pr_info("%s\n", __func__);
+	D("%s\n", __func__);
 
 	ret = microp_i2c_read(MICROP_I2C_RCMD_GPIO_STATUS, data, 3);
 	if (ret < 0)
 		pr_err("%s: read data failed\n", __func__);
 	else {
 		ps_data = (data[1] & 0x1) ? 1 : 0;
-		pr_info("proximity %s\n", ps_data ? "FAR" : "NEAR");
+		D("proximity %s\n", ps_data ? "FAR" : "NEAR");
 
 		/* 0 is close, 1 is far */
 		input_report_abs(the_data.input_dev, ABS_DISTANCE, ps_data);
@@ -73,7 +75,7 @@ static int capella_cm3602_enable(struct capella_cm3602_data *data)
 {
 	int rc;
 	if (data->enabled) {
-		pr_info("%s: already enabled\n", __func__);
+		D("%s: already enabled\n", __func__);
 		return 0;
 	}
 
@@ -95,7 +97,7 @@ static int capella_cm3602_disable(struct capella_cm3602_data *data)
 {
 	int rc = -EIO;
 	if (!data->enabled) {
-		pr_info("%s: already disabled\n", __func__);
+		D("%s: already disabled\n", __func__);
 		return 0;
 	}
 
@@ -161,7 +163,7 @@ static long capella_cm3602_ioctl(struct file *file,
 			unsigned int cmd, unsigned long arg)
 {
 	int val;
-	pr_info("%s cmd %d\n", __func__, _IOC_NR(cmd));
+	D("%s cmd %d\n", __func__, _IOC_NR(cmd));
 	switch (cmd) {
 	case CAPELLA_CM3602_IOCTL_ENABLE:
 		if (get_user(val, (unsigned long __user *)arg))