aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/staging
diff options
context:
space:
mode:
authorYAMANE Toshiaki <yamanetoshi@gmail.com>2012-11-08 13:54:09 -0500
committerMauro Carvalho Chehab <mchehab@redhat.com>2012-12-21 16:13:18 -0500
commitf8a7df00210145d54f11855bac4023f59866efc4 (patch)
treefa54f003e11897d41ad0aee11500379f0eb96d12 /drivers/staging
parent014f00664267904585f58c3478e9a7bfc96d0f03 (diff)
[media] staging/media: Use pr_ printks in lirc/lirc_bt829.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: YAMANE Toshiaki <yamanetoshi@gmail.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/staging')
-rw-r--r--drivers/staging/media/lirc/lirc_bt829.c15
1 files changed, 8 insertions, 7 deletions
diff --git a/drivers/staging/media/lirc/lirc_bt829.c b/drivers/staging/media/lirc/lirc_bt829.c
index 951007a3fc96..fa31ee7dd6a9 100644
--- a/drivers/staging/media/lirc/lirc_bt829.c
+++ b/drivers/staging/media/lirc/lirc_bt829.c
@@ -18,6 +18,8 @@
18 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA 18 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
19*/ 19*/
20 20
21#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
22
21#include <linux/kernel.h> 23#include <linux/kernel.h>
22#include <linux/module.h> 24#include <linux/module.h>
23#include <linux/threads.h> 25#include <linux/threads.h>
@@ -72,20 +74,19 @@ static struct pci_dev *do_pci_probe(void)
72 my_dev = pci_get_device(PCI_VENDOR_ID_ATI, 74 my_dev = pci_get_device(PCI_VENDOR_ID_ATI,
73 PCI_DEVICE_ID_ATI_264VT, NULL); 75 PCI_DEVICE_ID_ATI_264VT, NULL);
74 if (my_dev) { 76 if (my_dev) {
75 printk(KERN_ERR DRIVER_NAME ": Using device: %s\n", 77 pr_err("Using device: %s\n", pci_name(my_dev));
76 pci_name(my_dev));
77 pci_addr_phys = 0; 78 pci_addr_phys = 0;
78 if (my_dev->resource[0].flags & IORESOURCE_MEM) { 79 if (my_dev->resource[0].flags & IORESOURCE_MEM) {
79 pci_addr_phys = my_dev->resource[0].start; 80 pci_addr_phys = my_dev->resource[0].start;
80 printk(KERN_INFO DRIVER_NAME ": memory at 0x%08X\n", 81 pr_info("memory at 0x%08X\n",
81 (unsigned int)pci_addr_phys); 82 (unsigned int)pci_addr_phys);
82 } 83 }
83 if (pci_addr_phys == 0) { 84 if (pci_addr_phys == 0) {
84 printk(KERN_ERR DRIVER_NAME ": no memory resource ?\n"); 85 pr_err("no memory resource ?\n");
85 return NULL; 86 return NULL;
86 } 87 }
87 } else { 88 } else {
88 printk(KERN_ERR DRIVER_NAME ": pci_probe failed\n"); 89 pr_err("pci_probe failed\n");
89 return NULL; 90 return NULL;
90 } 91 }
91 return my_dev; 92 return my_dev;
@@ -140,7 +141,7 @@ int init_module(void)
140 141
141 atir_minor = lirc_register_driver(&atir_driver); 142 atir_minor = lirc_register_driver(&atir_driver);
142 if (atir_minor < 0) { 143 if (atir_minor < 0) {
143 printk(KERN_ERR DRIVER_NAME ": failed to register driver!\n"); 144 pr_err("failed to register driver!\n");
144 return atir_minor; 145 return atir_minor;
145 } 146 }
146 dprintk("driver is registered on minor %d\n", atir_minor); 147 dprintk("driver is registered on minor %d\n", atir_minor);
@@ -159,7 +160,7 @@ static int atir_init_start(void)
159{ 160{
160 pci_addr_lin = ioremap(pci_addr_phys + DATA_PCI_OFF, 0x400); 161 pci_addr_lin = ioremap(pci_addr_phys + DATA_PCI_OFF, 0x400);
161 if (pci_addr_lin == 0) { 162 if (pci_addr_lin == 0) {
162 printk(KERN_INFO DRIVER_NAME ": pci mem must be mapped\n"); 163 pr_info("pci mem must be mapped\n");
163 return 0; 164 return 0;
164 } 165 }
165 return 1; 166 return 1;