summaryrefslogtreecommitdiff
path: root/drivers/input/touchscreen
diff options
context:
space:
mode:
authorSanjay Singh Rawat <srawat@nvidia.com>2012-03-28 17:44:56 +0530
committerRohan Somvanshi <rsomvanshi@nvidia.com>2012-04-19 05:00:13 -0700
commitbdd8ce3b99c4ff20dc2f83698c1dc3ae5780fe30 (patch)
tree3cc970a567b781c7259d7aa85fa6c8405a43401f /drivers/input/touchscreen
parent20395e4c50ceea0d114c9beaaa5fa0e18b87915e (diff)
drivers: resolve compilation time warnings
bug 949219 Change-Id: I5942ba86bd1cbe1f1bd06a7c9f51a10d83e6cabb Signed-off-by: Sanjay Singh Rawat <srawat@nvidia.com> Reviewed-on: http://git-master/r/92819 Reviewed-by: Rohan Somvanshi <rsomvanshi@nvidia.com> Tested-by: Rohan Somvanshi <rsomvanshi@nvidia.com>
Diffstat (limited to 'drivers/input/touchscreen')
-rw-r--r--drivers/input/touchscreen/rmi4/rmi_bus.c16
-rw-r--r--drivers/input/touchscreen/rmi4/rmi_spi.c13
2 files changed, 12 insertions, 17 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_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;
}