diff options
| author | Tom Cherry <tcherry@nvidia.com> | 2012-05-23 12:06:13 -0700 |
|---|---|---|
| committer | Tom Cherry <tcherry@nvidia.com> | 2012-05-23 12:06:13 -0700 |
| commit | a168c03bd97fd9761218779623db0cec09fa8f4a (patch) | |
| tree | 521d2b51904da963d771c24fd9b142cc416f8259 /drivers/input/touchscreen/rmi4/rmi_spi.c | |
| parent | 11fb7d0e35d56230919eb91bee1aa138a10b8416 (diff) | |
| parent | c7e3189c1802c2a6552eec960f521a1891529892 (diff) | |
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
Diffstat (limited to 'drivers/input/touchscreen/rmi4/rmi_spi.c')
| -rw-r--r-- | drivers/input/touchscreen/rmi4/rmi_spi.c | 13 |
1 files changed, 5 insertions, 8 deletions
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; } |