diff options
Diffstat (limited to 'drivers/input/touchscreen/ads7846.c')
-rw-r--r-- | drivers/input/touchscreen/ads7846.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/input/touchscreen/ads7846.c b/drivers/input/touchscreen/ads7846.c index b9b7fc6ff1eb..6017ea6e994e 100644 --- a/drivers/input/touchscreen/ads7846.c +++ b/drivers/input/touchscreen/ads7846.c | |||
@@ -559,7 +559,7 @@ static void ads7846_rx(void *ads) | |||
559 | if (packet->tc.ignore || Rt > ts->pressure_max) { | 559 | if (packet->tc.ignore || Rt > ts->pressure_max) { |
560 | #ifdef VERBOSE | 560 | #ifdef VERBOSE |
561 | pr_debug("%s: ignored %d pressure %d\n", | 561 | pr_debug("%s: ignored %d pressure %d\n", |
562 | ts->spi->dev.bus_id, packet->tc.ignore, Rt); | 562 | dev_name(&ts->spi->dev), packet->tc.ignore, Rt); |
563 | #endif | 563 | #endif |
564 | hrtimer_start(&ts->timer, ktime_set(0, TS_POLL_PERIOD), | 564 | hrtimer_start(&ts->timer, ktime_set(0, TS_POLL_PERIOD), |
565 | HRTIMER_MODE_REL); | 565 | HRTIMER_MODE_REL); |
@@ -947,7 +947,7 @@ static int __devinit ads7846_probe(struct spi_device *spi) | |||
947 | ts->penirq_recheck_delay_usecs = | 947 | ts->penirq_recheck_delay_usecs = |
948 | pdata->penirq_recheck_delay_usecs; | 948 | pdata->penirq_recheck_delay_usecs; |
949 | 949 | ||
950 | snprintf(ts->phys, sizeof(ts->phys), "%s/input0", spi->dev.bus_id); | 950 | snprintf(ts->phys, sizeof(ts->phys), "%s/input0", dev_name(&spi->dev)); |
951 | 951 | ||
952 | input_dev->name = "ADS784x Touchscreen"; | 952 | input_dev->name = "ADS784x Touchscreen"; |
953 | input_dev->phys = ts->phys; | 953 | input_dev->phys = ts->phys; |