Commit 014f0066 authored by YAMANE Toshiaki's avatar YAMANE Toshiaki Committed by Mauro Carvalho Chehab

[media] staging/media: Use pr_ printks in lirc/lirc_sir.c

fixed below checkpatch warnings.
- WARNING: Prefer netdev_err(netdev, ... then dev_err(dev, ... then pr_err(...  to printk(KERN_ERR ...
- WARNING: Prefer netdev_info(netdev, ... then dev_info(dev, ... then pr_info(...  to printk(KERN_INFO ...
and add pr_fmt.
Signed-off-by: default avatarYAMANE Toshiaki <yamanetoshi@gmail.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent e174e6ca
...@@ -33,6 +33,8 @@ ...@@ -33,6 +33,8 @@
* parts cut'n'pasted from sa1100_ir.c (C) 2000 Russell King * parts cut'n'pasted from sa1100_ir.c (C) 2000 Russell King
*/ */
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
#include <linux/module.h> #include <linux/module.h>
#include <linux/sched.h> #include <linux/sched.h>
#include <linux/errno.h> #include <linux/errno.h>
...@@ -495,7 +497,7 @@ static int init_chrdev(void) ...@@ -495,7 +497,7 @@ static int init_chrdev(void)
driver.dev = &lirc_sir_dev->dev; driver.dev = &lirc_sir_dev->dev;
driver.minor = lirc_register_driver(&driver); driver.minor = lirc_register_driver(&driver);
if (driver.minor < 0) { if (driver.minor < 0) {
printk(KERN_ERR LIRC_DRIVER_NAME ": init_chrdev() failed.\n"); pr_err("init_chrdev() failed.\n");
return -EIO; return -EIO;
} }
return 0; return 0;
...@@ -604,7 +606,7 @@ static irqreturn_t sir_interrupt(int irq, void *dev_id) ...@@ -604,7 +606,7 @@ static irqreturn_t sir_interrupt(int irq, void *dev_id)
} }
if (status & UTSR0_TFS) if (status & UTSR0_TFS)
printk(KERN_ERR "transmit fifo not full, shouldn't happen\n"); pr_err("transmit fifo not full, shouldn't happen\n");
/* We must clear certain bits. */ /* We must clear certain bits. */
status &= (UTSR0_RID | UTSR0_RBB | UTSR0_REB); status &= (UTSR0_RID | UTSR0_RBB | UTSR0_REB);
...@@ -787,7 +789,7 @@ static int init_hardware(void) ...@@ -787,7 +789,7 @@ static int init_hardware(void)
#ifdef LIRC_ON_SA1100 #ifdef LIRC_ON_SA1100
#ifdef CONFIG_SA1100_BITSY #ifdef CONFIG_SA1100_BITSY
if (machine_is_bitsy()) { if (machine_is_bitsy()) {
printk(KERN_INFO "Power on IR module\n"); pr_info("Power on IR module\n");
set_bitsy_egpio(EGPIO_BITSY_IR_ON); set_bitsy_egpio(EGPIO_BITSY_IR_ON);
} }
#endif #endif
...@@ -885,8 +887,7 @@ static int init_hardware(void) ...@@ -885,8 +887,7 @@ static int init_hardware(void)
udelay(1500); udelay(1500);
/* read previous control byte */ /* read previous control byte */
printk(KERN_INFO LIRC_DRIVER_NAME pr_info("0x%02x\n", sinp(UART_RX));
": 0x%02x\n", sinp(UART_RX));
/* Set DLAB 1. */ /* Set DLAB 1. */
soutp(UART_LCR, sinp(UART_LCR) | UART_LCR_DLAB); soutp(UART_LCR, sinp(UART_LCR) | UART_LCR_DLAB);
...@@ -964,8 +965,7 @@ static int init_port(void) ...@@ -964,8 +965,7 @@ static int init_port(void)
/* get I/O port access and IRQ line */ /* get I/O port access and IRQ line */
#ifndef LIRC_ON_SA1100 #ifndef LIRC_ON_SA1100
if (request_region(io, 8, LIRC_DRIVER_NAME) == NULL) { if (request_region(io, 8, LIRC_DRIVER_NAME) == NULL) {
printk(KERN_ERR LIRC_DRIVER_NAME pr_err("i/o port 0x%.4x already in use.\n", io);
": i/o port 0x%.4x already in use.\n", io);
return -EBUSY; return -EBUSY;
} }
#endif #endif
...@@ -975,15 +975,11 @@ static int init_port(void) ...@@ -975,15 +975,11 @@ static int init_port(void)
# ifndef LIRC_ON_SA1100 # ifndef LIRC_ON_SA1100
release_region(io, 8); release_region(io, 8);
# endif # endif
printk(KERN_ERR LIRC_DRIVER_NAME pr_err("IRQ %d already in use.\n", irq);
": IRQ %d already in use.\n",
irq);
return retval; return retval;
} }
#ifndef LIRC_ON_SA1100 #ifndef LIRC_ON_SA1100
printk(KERN_INFO LIRC_DRIVER_NAME pr_info("I/O port 0x%.4x, IRQ %d.\n", io, irq);
": I/O port 0x%.4x, IRQ %d.\n",
io, irq);
#endif #endif
init_timer(&timerlist); init_timer(&timerlist);
...@@ -1213,8 +1209,7 @@ static int init_lirc_sir(void) ...@@ -1213,8 +1209,7 @@ static int init_lirc_sir(void)
if (retval < 0) if (retval < 0)
return retval; return retval;
init_hardware(); init_hardware();
printk(KERN_INFO LIRC_DRIVER_NAME pr_info("Installed.\n");
": Installed.\n");
return 0; return 0;
} }
...@@ -1243,23 +1238,20 @@ static int __init lirc_sir_init(void) ...@@ -1243,23 +1238,20 @@ static int __init lirc_sir_init(void)
retval = platform_driver_register(&lirc_sir_driver); retval = platform_driver_register(&lirc_sir_driver);
if (retval) { if (retval) {
printk(KERN_ERR LIRC_DRIVER_NAME ": Platform driver register " pr_err("Platform driver register failed!\n");
"failed!\n");
return -ENODEV; return -ENODEV;
} }
lirc_sir_dev = platform_device_alloc("lirc_dev", 0); lirc_sir_dev = platform_device_alloc("lirc_dev", 0);
if (!lirc_sir_dev) { if (!lirc_sir_dev) {
printk(KERN_ERR LIRC_DRIVER_NAME ": Platform device alloc " pr_err("Platform device alloc failed!\n");
"failed!\n");
retval = -ENOMEM; retval = -ENOMEM;
goto pdev_alloc_fail; goto pdev_alloc_fail;
} }
retval = platform_device_add(lirc_sir_dev); retval = platform_device_add(lirc_sir_dev);
if (retval) { if (retval) {
printk(KERN_ERR LIRC_DRIVER_NAME ": Platform device add " pr_err("Platform device add failed!\n");
"failed!\n");
retval = -ENODEV; retval = -ENODEV;
goto pdev_add_fail; goto pdev_add_fail;
} }
...@@ -1292,7 +1284,7 @@ static void __exit lirc_sir_exit(void) ...@@ -1292,7 +1284,7 @@ static void __exit lirc_sir_exit(void)
drop_port(); drop_port();
platform_device_unregister(lirc_sir_dev); platform_device_unregister(lirc_sir_dev);
platform_driver_unregister(&lirc_sir_driver); platform_driver_unregister(&lirc_sir_driver);
printk(KERN_INFO LIRC_DRIVER_NAME ": Uninstalled.\n"); pr_info("Uninstalled.\n");
} }
module_init(lirc_sir_init); module_init(lirc_sir_init);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment