From b752c3e46b05d33fbb10fbea7bdddbb0a27d4b3a Mon Sep 17 00:00:00 2001 From: nirenjan Date: Fri, 17 Oct 2014 14:19:17 +0000 Subject: [PATCH] Replace err/dbg macros with pr_err/pr_debug err macro has been removed entirely from the Linux kernel starting from around v3.5, while the dbg macro has been deprecated. Since the lines that were using err/dbg did not have access to the device, simply log as a generic kernel log. --- kernel_module/x52joy.c | 2 +- kernel_module/x52joy_input.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/kernel_module/x52joy.c b/kernel_module/x52joy.c index 5729394..4ae64a2 100644 --- a/kernel_module/x52joy.c +++ b/kernel_module/x52joy.c @@ -578,7 +578,7 @@ static int __init x52_init(void) retval = usb_register(&x52_driver); if (retval) { - err("usb_register failed (errno=%d)\n", retval); + pr_err("usb_register failed (errno=%d)\n", retval); } return retval; diff --git a/kernel_module/x52joy_input.c b/kernel_module/x52joy_input.c index 069410c..a9b844a 100644 --- a/kernel_module/x52joy_input.c +++ b/kernel_module/x52joy_input.c @@ -150,11 +150,11 @@ void x52_irq_handler(struct urb *urb) case -ENOENT: case -ESHUTDOWN: /* This URB is terminated, clean up */ - dbg("%s - URB shutting down with status: %d", + pr_debug("%s - URB shutting down with status: %d", __func__, status); return; default: - dbg("%s - nonzero URB status received: %d", + pr_debug("%s - nonzero URB status received: %d", __func__, status); goto error; } @@ -172,8 +172,8 @@ void x52_irq_handler(struct urb *urb) error: retval = usb_submit_urb(urb, GFP_ATOMIC); if (retval) - err ("%s - usb_submit_urb failed with result %d", - __func__, retval); + pr_err("%s - usb_submit_urb failed with result %d", + __func__, retval); }