Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

Input: ucb1400-ts - switch to using dev_xxx() for diagnostic messages

Acked-by: Marek Vasut <marek.vasut@gmail.com>
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>

+9 -8
+9 -8
drivers/input/touchscreen/ucb1400_ts.c
··· 274 274 * Try to probe our interrupt, rather than relying on lots of 275 275 * hard-coded machine dependencies. 276 276 */ 277 - static int __devinit ucb1400_ts_detect_irq(struct ucb1400_ts *ucb) 277 + static int __devinit ucb1400_ts_detect_irq(struct ucb1400_ts *ucb, 278 + struct platform_device *pdev) 278 279 { 279 280 unsigned long mask, timeout; 280 281 ··· 297 296 UCB_ADC_DAT_VALID)) { 298 297 cpu_relax(); 299 298 if (time_after(jiffies, timeout)) { 300 - printk(KERN_ERR "ucb1400: timed out in IRQ probe\n"); 299 + dev_err(&pdev->dev, "timed out in IRQ probe\n"); 301 300 probe_irq_off(mask); 302 301 return -ENODEV; 303 302 } ··· 332 331 333 332 /* Only in case the IRQ line wasn't supplied, try detecting it */ 334 333 if (ucb->irq < 0) { 335 - error = ucb1400_ts_detect_irq(ucb); 334 + error = ucb1400_ts_detect_irq(ucb, pdev); 336 335 if (error) { 337 - printk(KERN_ERR "UCB1400: IRQ probe failed\n"); 336 + dev_err(&pdev->dev, "IRQ probe failed\n"); 338 337 goto err_free_devs; 339 338 } 340 339 } 341 - printk(KERN_DEBUG "UCB1400: found IRQ %d\n", ucb->irq); 340 + dev_dbg(&pdev->dev, "found IRQ %d\n", ucb->irq); 342 341 343 342 init_waitqueue_head(&ucb->ts_wait); 344 343 ··· 366 365 x_res = ucb1400_ts_read_xres(ucb); 367 366 y_res = ucb1400_ts_read_yres(ucb); 368 367 ucb1400_adc_disable(ucb->ac97); 369 - printk(KERN_DEBUG "UCB1400: x/y = %d/%d\n", x_res, y_res); 368 + dev_dbg(&pdev->dev, "x/y = %d/%d\n", x_res, y_res); 370 369 371 370 input_set_abs_params(ucb->ts_idev, ABS_X, 0, x_res, 0, 0); 372 371 input_set_abs_params(ucb->ts_idev, ABS_Y, 0, y_res, 0, 0); ··· 378 377 IRQF_TRIGGER_RISING | IRQF_ONESHOT, 379 378 "UCB1400", ucb); 380 379 if (error) { 381 - printk(KERN_ERR "ucb1400: unable to grab irq%d: %d\n", 382 - ucb->irq, error); 380 + dev_err(&pdev->dev, 381 + "unable to grab irq%d: %d\n", ucb->irq, error); 383 382 goto err_free_devs; 384 383 } 385 384