diff options
author | Joe Perches <joe@perches.com> | 2011-08-21 18:56:47 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2011-09-03 19:58:05 -0400 |
commit | d8a10ac948545d8a4261728719af39b5dffaf7da (patch) | |
tree | 30b44a61172d8f6776d9fb84fc98c339cdc59e25 /drivers/media/rc | |
parent | 7de3461c93a6d65355113cca333723eb8a1a0225 (diff) |
[media] winbond-cir: Use current logging styles
Add pr_fmt, convert printks to pr_<level>.
Signed-off-by: Joe Perches <joe@perches.com>
Acked-by: David Härdeman <david@hardeman.nu>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/rc')
-rw-r--r-- | drivers/media/rc/winbond-cir.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/media/rc/winbond-cir.c b/drivers/media/rc/winbond-cir.c index bec8abc965f7..13f54b51194a 100644 --- a/drivers/media/rc/winbond-cir.c +++ b/drivers/media/rc/winbond-cir.c | |||
@@ -41,6 +41,8 @@ | |||
41 | * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. | 41 | * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. |
42 | */ | 42 | */ |
43 | 43 | ||
44 | #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt | ||
45 | |||
44 | #include <linux/module.h> | 46 | #include <linux/module.h> |
45 | #include <linux/pnp.h> | 47 | #include <linux/pnp.h> |
46 | #include <linux/interrupt.h> | 48 | #include <linux/interrupt.h> |
@@ -1155,12 +1157,12 @@ wbcir_init(void) | |||
1155 | case IR_PROTOCOL_RC6: | 1157 | case IR_PROTOCOL_RC6: |
1156 | break; | 1158 | break; |
1157 | default: | 1159 | default: |
1158 | printk(KERN_ERR DRVNAME ": Invalid power-on protocol\n"); | 1160 | pr_err("Invalid power-on protocol\n"); |
1159 | } | 1161 | } |
1160 | 1162 | ||
1161 | ret = pnp_register_driver(&wbcir_driver); | 1163 | ret = pnp_register_driver(&wbcir_driver); |
1162 | if (ret) | 1164 | if (ret) |
1163 | printk(KERN_ERR DRVNAME ": Unable to register driver\n"); | 1165 | pr_err("Unable to register driver\n"); |
1164 | 1166 | ||
1165 | return ret; | 1167 | return ret; |
1166 | } | 1168 | } |