mirror
/
libx52
mirror of https://github.com/nirenjan/libx52.git
1
0
Fork 0
Code Releases Wiki Activity

Merge pull request #3 from nirenjan/deprecated-macros 

Replace err/dbg macros with pr_err/pr_debug
pull/7/head v0.0.2
nirenjan 2014-10-19 05:23:05 +00:00
parent 46f9995959 e54dfd94d2
commit 0ad08ac623
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
kernel_module/x52joy.c
View File

@ -578,7 +578,7 @@ static int __init x52_init(void)
retval = usb_register(&x52_driver); retval = usb_register(&x52_driver);
if (retval) { if (retval) {
err("usb_register failed (errno=%d)\n", retval); pr_err("usb_register failed (errno=%d)\n", retval);
} }
return retval; return retval;

11
kernel_module/x52joy_input.c
View File

@ -150,11 +150,13 @@ void x52_irq_handler(struct urb *urb)
case -ENOENT: case -ENOENT:
case -ESHUTDOWN: case -ESHUTDOWN:
/* This URB is terminated, clean up */ /* This URB is terminated, clean up */
dbg("%s - URB shutting down with status: %d", dev_dbg(joy->idev->dev.parent,
"%s - URB shutting down with status: %d",
__func__, status); __func__, status);
return; return;
default: default:
dbg("%s - nonzero URB status received: %d", dev_dbg(joy->idev->dev.parent,
"%s - nonzero URB status received: %d",
__func__, status); __func__, status);
goto error; goto error;
} }
@ -172,8 +174,9 @@ void x52_irq_handler(struct urb *urb)
error: error:
retval = usb_submit_urb(urb, GFP_ATOMIC); retval = usb_submit_urb(urb, GFP_ATOMIC);
if (retval) if (retval)
err ("%s - usb_submit_urb failed with result %d", dev_err(joy->idev->dev.parent,
__func__, retval); "%s - usb_submit_urb failed with result %d",
__func__, retval);
} }