diff options
| author | Sanjay Singh Rawat <srawat@nvidia.com> | 2012-04-23 13:19:44 +0530 |
|---|---|---|
| committer | Varun Wadekar <vwadekar@nvidia.com> | 2012-04-23 13:19:44 +0530 |
| commit | 001d11797f8a6eadc211bcb4d3aded5cd5693a1b (patch) | |
| tree | 83620a6ca8b17e612a6705c1293ee986ce1326c4 /drivers/input/touchscreen/rmi4 | |
| parent | e98844949f8104ad398def8f8157f8f154d3e37d (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>
Conflicts:
drivers/usb/host/ehci.h
Signed-off-by: Varun Wadekar <vwadekar@nvidia.com>
Diffstat (limited to 'drivers/input/touchscreen/rmi4')
| -rw-r--r-- | drivers/input/touchscreen/rmi4/rmi_bus.c | 16 | ||||
| -rw-r--r-- | drivers/input/touchscreen/rmi4/rmi_spi.c | 13 |
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 d761bf9106b8..007c7faf34e1 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; } |