leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
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: YAMANE Toshiaki <yamanetoshi@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
YAMANE Toshiaki 2012-11-08 15:54:09 -03:00 committed by Mauro Carvalho Chehab
parent 014f006642
commit f8a7df0021
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
drivers/staging/media/lirc/lirc_bt829.c
View File

@ -18,6 +18,8 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/ */
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/module.h> #include <linux/module.h>
#include <linux/threads.h> #include <linux/threads.h>
@ -72,20 +74,19 @@ static struct pci_dev *do_pci_probe(void)
my_dev = pci_get_device(PCI_VENDOR_ID_ATI, my_dev = pci_get_device(PCI_VENDOR_ID_ATI,
PCI_DEVICE_ID_ATI_264VT, NULL); PCI_DEVICE_ID_ATI_264VT, NULL);
if (my_dev) { if (my_dev) {
printk(KERN_ERR DRIVER_NAME ": Using device: %s\n", pr_err("Using device: %s\n", pci_name(my_dev));
pci_name(my_dev));
pci_addr_phys = 0; pci_addr_phys = 0;
if (my_dev->resource[0].flags & IORESOURCE_MEM) { if (my_dev->resource[0].flags & IORESOURCE_MEM) {
pci_addr_phys = my_dev->resource[0].start; pci_addr_phys = my_dev->resource[0].start;
printk(KERN_INFO DRIVER_NAME ": memory at 0x%08X\n", pr_info("memory at 0x%08X\n",
(unsigned int)pci_addr_phys); (unsigned int)pci_addr_phys);
} }
if (pci_addr_phys == 0) { if (pci_addr_phys == 0) {
printk(KERN_ERR DRIVER_NAME ": no memory resource ?\n"); pr_err("no memory resource ?\n");
return NULL; return NULL;
} }
} else { } else {
printk(KERN_ERR DRIVER_NAME ": pci_probe failed\n"); pr_err("pci_probe failed\n");
return NULL; return NULL;
} }
return my_dev; return my_dev;
@ -140,7 +141,7 @@ int init_module(void)
atir_minor = lirc_register_driver(&atir_driver); atir_minor = lirc_register_driver(&atir_driver);
if (atir_minor < 0) { if (atir_minor < 0) {
printk(KERN_ERR DRIVER_NAME ": failed to register driver!\n"); pr_err("failed to register driver!\n");
return atir_minor; return atir_minor;
} }
dprintk("driver is registered on minor %d\n", atir_minor); dprintk("driver is registered on minor %d\n", atir_minor);
@ -159,7 +160,7 @@ static int atir_init_start(void)
{ {
pci_addr_lin = ioremap(pci_addr_phys + DATA_PCI_OFF, 0x400); pci_addr_lin = ioremap(pci_addr_phys + DATA_PCI_OFF, 0x400);
if (pci_addr_lin == 0) { if (pci_addr_lin == 0) {
printk(KERN_INFO DRIVER_NAME ": pci mem must be mapped\n"); pr_info("pci mem must be mapped\n");
return 0; return 0;
} }
return 1; return 1;