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, 7 insertions, 7 deletions

diff --git a/drivers/hid/hid-drff.c b/drivers/hid/hid-drff.c
index 968b04f9b796..afcf3d67eb02 100644
--- a/drivers/hid/hid-drff.c
+++ b/drivers/hid/hid-drff.c
@@ -96,18 +96,18 @@ static int drff_init(struct hid_device *hid)
         int error;
 
         if (list_empty(report_list)) {
-                dev_err(&hid->dev, "no output reports found\n");
+                hid_err(hid, "no output reports found\n");
                 return -ENODEV;
         }
 
         report = list_first_entry(report_list, struct hid_report, list);
         if (report->maxfield < 1) {
-                dev_err(&hid->dev, "no fields in the report\n");
+                hid_err(hid, "no fields in the report\n");
                 return -ENODEV;
         }
 
         if (report->field[0]->report_count < 7) {
-                dev_err(&hid->dev, "not enough values in the field\n");
+                hid_err(hid, "not enough values in the field\n");
                 return -ENODEV;
         }
 
@@ -133,8 +133,8 @@ static int drff_init(struct hid_device *hid)
         drff->report->field[0]->value[6] = 0x00;
         usbhid_submit_report(hid, drff->report, USB_DIR_OUT);
 
-        dev_info(&hid->dev, "Force Feedback for DragonRise Inc. game "
-               "controllers by Richard Walmsley <richwalm@gmail.com>\n");
+        hid_info(hid, "Force Feedback for DragonRise Inc. "
+                 "game controllers by Richard Walmsley <richwalm@gmail.com>\n");
 
         return 0;
 }
@@ -153,13 +153,13 @@ static int dr_probe(struct hid_device *hdev, const struct hid_device_id *id)
 
         ret = hid_parse(hdev);
         if (ret) {
-                dev_err(&hdev->dev, "parse failed\n");
+                hid_err(hdev, "parse failed\n");
                 goto err;
         }
 
         ret = hid_hw_start(hdev, HID_CONNECT_DEFAULT & ~HID_CONNECT_FF);
         if (ret) {
-                dev_err(&hdev->dev, "hw start failed\n");
+                hid_err(hdev, "hw start failed\n");
                 goto err;
         }