Merge commit 'main-ics-2012.05.22-B3' into HEAD

Conflicts:
	arch/arm/mach-tegra/pm.c
	drivers/media/video/tegra/nvavp/nvavp_dev.c
	drivers/power/smb349-charger.c
	include/linux/smb349-charger.h
	include/trace/events/power.h

Change-Id: Ia8c82e2acfe3463ae6778bdd03aac8da104f7ad3

3 files changed, 23 insertions, 26 deletions

diff --git a/drivers/input/touchscreen/rmi4/rmi_bus.c b/drivers/input/touchscreen/rmi4/rmi_bus.c
index 6a269df4ff35..def8a2083d98 100644
--- a/drivers/input/touchscreen/rmi4/rmi_bus.c
+++ b/drivers/input/touchscreen/rmi4/rmi_bus.c
@@ -39,17 +39,15 @@ static int rmi_bus_match(struct device *dev, struct device_driver *driver)
 	rmi_dev = to_rmi_device(dev);
 	pdata = to_rmi_platform_data(rmi_dev);
 
-	pr_info("        rmi_driver->driver.name =  %s\n", rmi_driver->driver.name);
-        pr_info("        device:rmi_device = 0x%x \n", rmi_dev);
-	pr_info("             device:rmi_device:rmi_device_platform_data:driver_name = %s \n", pdata->driver_name);
-        pr_info("                    rmi_device:driver = 0x%x \n", rmi_dev->driver);
+	pr_info("rmi_driver->driver.name =  %s\n", rmi_driver->driver.name);
+	pr_info("device:rmi_device:rmi_device_platform_data:driver_name = %s\n",
+		pdata->driver_name);
 
 	if (!strcmp(pdata->driver_name, rmi_driver->driver.name)) {
 		rmi_dev->driver = rmi_driver;
-		pr_info("             names match, so now rmi_device:driver = 0x%x \n",rmi_dev->driver);
 		return 1;
 	}
-	pr_info("             names DO NOT match, so return nothing \n");
+	pr_info("names DO NOT match, so return nothing\n");
 
 	return 0;
 }
@@ -151,9 +149,9 @@ int rmi_register_phys_device(struct rmi_phys_device *phys)
 	dev_set_name(&rmi_dev->dev, "sensor%02d", phys_device_num++);
 
 	phys->rmi_dev = rmi_dev;
-	pr_info("                 registering physical device:\n");
-	pr_info("                 dev.init_name = \n", rmi_dev->dev.init_name);
-	pr_info("                 dev.bus->name = \n", rmi_dev->dev.bus->name);
+	pr_info("registering physical device:\n");
+	pr_info("dev.init_name = %s\n", rmi_dev->dev.init_name);
+	pr_info("dev.bus->name = %s\n", rmi_dev->dev.bus->name);
 	return device_register(&rmi_dev->dev);
 }
 EXPORT_SYMBOL(rmi_register_phys_device);
diff --git a/drivers/input/touchscreen/rmi4/rmi_f09.c b/drivers/input/touchscreen/rmi4/rmi_f09.c
index 0ec980d7db07..4328d49ddcbf 100644
--- a/drivers/input/touchscreen/rmi4/rmi_f09.c
+++ b/drivers/input/touchscreen/rmi4/rmi_f09.c
@@ -86,13 +86,13 @@ static ssize_t rmi_f09_HostTestEn_show(struct device *dev,
 
 static ssize_t rmi_f09_HostTestEn_store(struct device *dev,
 				      struct device_attribute *attr,
-					char *buf, size_t count);
-
-static ssize_t rmi_f09_InternalLimits_show(struct device *dev,
-				      struct device_attribute *attr, char *buf);
+					const char *buf, size_t count);
 
 static ssize_t rmi_f09_Result_Register_Count_show(struct device *dev,
 				      struct device_attribute *attr, char *buf);
+#if defined(RMI_SYS_ATTR)
+static ssize_t rmi_f09_InternalLimits_show(struct device *dev,
+				      struct device_attribute *attr, char *buf);
 
 static ssize_t rmi_f09_Overall_BIST_Result_show(struct device *dev,
 				      struct device_attribute *attr, char *buf);
@@ -100,6 +100,7 @@ static ssize_t rmi_f09_Overall_BIST_Result_show(struct device *dev,
 static ssize_t rmi_f09_Overall_BIST_Result_store(struct device *dev,
 				       struct device_attribute *attr,
 				       const char *buf, size_t count);
+#endif
 
 static struct device_attribute attrs[] = {
 	__ATTR(Limit_Register_Count, RMI_RO_ATTR,
@@ -119,7 +120,6 @@ static int rmi_f09_init(struct rmi_function_container *fc)
 	struct rmi_fn_09_data  *f09;
 	u8 query_base_addr;
 	int rc;
-	int i;
 	int attr_count = 0;
 	int retval = 0;
 
@@ -171,8 +171,8 @@ static void rmi_f09_remove(struct rmi_function_container *fc)
 {
 	struct rmi_fn_09_data *data = fc->data;
 	if (data) {
-		kfree(data->query.Limit_Register_Count);
-		kfree(data->query.f09_bist_query1);
+		kfree(&data->query.Limit_Register_Count);
+		kfree(&data->query.f09_bist_query1);
 	}
 	kfree(fc->data);
 }
@@ -230,7 +230,7 @@ static ssize_t rmi_f09_HostTestEn_show(struct device *dev,
 
 static ssize_t rmi_f09_HostTestEn_store(struct device *dev,
 				      struct device_attribute *attr,
-					char *buf, size_t count)
+					const char *buf, size_t count)
 {
 	struct rmi_function_container *fc;
 	struct rmi_fn_09_data *data;
@@ -264,7 +264,8 @@ static ssize_t rmi_f09_HostTestEn_store(struct device *dev,
 
 }
 
-static ssize_t rmi_f09_InternalLimits_show(struct device *dev,
+#if defined(RMI_SYS_ATTR)
+ ssize_t rmi_f09_InternalLimits_show(struct device *dev,
 					struct device_attribute *attr,
 					char *buf)
 {
@@ -276,6 +277,7 @@ static ssize_t rmi_f09_InternalLimits_show(struct device *dev,
 	return snprintf(buf, PAGE_SIZE, "%u\n",
 			data->query.InternalLimits);
 }
+#endif
 
 static ssize_t rmi_f09_Result_Register_Count_show(struct device *dev,
 					struct device_attribute *attr,
diff --git a/drivers/input/touchscreen/rmi4/rmi_spi.c b/drivers/input/touchscreen/rmi4/rmi_spi.c
index 41f72657f829..71c98bc48453 100644
--- a/drivers/input/touchscreen/rmi4/rmi_spi.c
+++ b/drivers/input/touchscreen/rmi4/rmi_spi.c
@@ -523,19 +523,16 @@ static int rmi_spi_v2_set_page(struct rmi_phys_device *phys, u8 page)
 static int acquire_attn_irq(struct rmi_spi_data *data)
 {
         int retval = 0;
-        pr_info("in function ____%s____  \n", __func__);
-        pr_info("          irq = %d\n", data->irq);
-        pr_info("          rmi_spi_hard_irq          = 0x%8x\n", rmi_spi_hard_irq);
-        pr_info("          rmi_spi_irq_thread        = 0x%8x\n", rmi_spi_irq_thread);
-        pr_info("          data->irq_flags           = 0x%8x\n", data->irq_flags);
-        pr_info("          dev_name(data->phys->dev) = %s\n", dev_name(data->phys->dev));
-        pr_info("          data->phys                = 0x%8x\n", data->phys);
+	pr_info("in function ____%s____\n", __func__);
+	pr_info("irq = %d\n", data->irq);
+	pr_info("data->irq_flags = 0x%8x\n", data->irq_flags);
+	pr_info("dev_name(data->phys->dev) = %s\n", dev_name(data->phys->dev));
 
 	retval =  request_threaded_irq(data->irq, rmi_spi_hard_irq,
 			rmi_spi_irq_thread, data->irq_flags,
 			dev_name(data->phys->dev), data->phys);
 
-        pr_info("          retval =                  = %d\n", retval);
+	pr_info("retval = %d\n", retval);
 	return retval;
 }