HID: Add and use hid_<level>: dev_<level> equivalents

Neaten current uses of dev_<level> by adding and using
hid specific hid_<level> macros.

Convert existing uses of dev_<level> uses to hid_<level>.
Convert hid-pidff printk uses to hid_<level>.

Remove err_hid and use hid_err instead.

Add missing newlines to logging messages where necessary.
Coalesce format strings.

Add and use pr_fmt(fmt) KBUILD_MODNAME ": " fmt

Other miscellaneous changes:

Add const struct hid_device * argument to hid-core functions
extract() and implement() so hid_<level> can be used by them.
Fix bad indentation in hid-core hid_input_field function
that calls extract() function above.

Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>

1 files changed, 8 insertions, 7 deletions

diff --git a/drivers/hid/hid-magicmouse.c b/drivers/hid/hid-magicmouse.c
index e6dc15171664..11306b3d9c56 100644
--- a/drivers/hid/hid-magicmouse.c
+++ b/drivers/hid/hid-magicmouse.c
@@ -12,6 +12,8 @@
  * any later version.
  */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/device.h>
 #include <linux/hid.h>
 #include <linux/module.h>
@@ -446,7 +448,7 @@ static int magicmouse_probe(struct hid_device *hdev,
 
         msc = kzalloc(sizeof(*msc), GFP_KERNEL);
         if (msc == NULL) {
-                dev_err(&hdev->dev, "can't alloc magicmouse descriptor\n");
+                hid_err(hdev, "can't alloc magicmouse descriptor\n");
                 return -ENOMEM;
         }
 
@@ -459,13 +461,13 @@ static int magicmouse_probe(struct hid_device *hdev,
 
         ret = hid_parse(hdev);
         if (ret) {
-                dev_err(&hdev->dev, "magicmouse hid parse failed\n");
+                hid_err(hdev, "magicmouse hid parse failed\n");
                 goto err_free;
         }
 
         ret = hid_hw_start(hdev, HID_CONNECT_DEFAULT);
         if (ret) {
-                dev_err(&hdev->dev, "magicmouse hw start failed\n");
+                hid_err(hdev, "magicmouse hw start failed\n");
                 goto err_free;
         }
 
@@ -486,7 +488,7 @@ static int magicmouse_probe(struct hid_device *hdev,
         }
 
         if (!report) {
-                dev_err(&hdev->dev, "unable to register touch report\n");
+                hid_err(hdev, "unable to register touch report\n");
                 ret = -ENOMEM;
                 goto err_stop_hw;
         }
@@ -495,8 +497,7 @@ static int magicmouse_probe(struct hid_device *hdev,
         ret = hdev->hid_output_raw_report(hdev, feature, sizeof(feature),
                         HID_FEATURE_REPORT);
         if (ret != sizeof(feature)) {
-                dev_err(&hdev->dev, "unable to request touch data (%d)\n",
-                                ret);
+                hid_err(hdev, "unable to request touch data (%d)\n", ret);
                 goto err_stop_hw;
         }
 
@@ -540,7 +541,7 @@ static int __init magicmouse_init(void)
 
         ret = hid_register_driver(&magicmouse_driver);
         if (ret)
-                printk(KERN_ERR "can't register magicmouse driver\n");
+                pr_err("can't register magicmouse driver\n");
 
         return ret;
 }