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

diff --git a/drivers/hid/hid-pl.c b/drivers/hid/hid-pl.c
index 9f41e2bd848..06e5300d43d 100644
--- a/drivers/hid/hid-pl.c
+++ b/drivers/hid/hid-pl.c
@@ -103,7 +103,7 @@ static int plff_init(struct hid_device *hid)
         */
 
         if (list_empty(report_list)) {
-                dev_err(&hid->dev, "no output reports found\n");
+                hid_err(hid, "no output reports found\n");
                 return -ENODEV;
         }
 
@@ -112,14 +112,13 @@ static int plff_init(struct hid_device *hid)
                 report_ptr = report_ptr->next;
 
                 if (report_ptr == report_list) {
-                        dev_err(&hid->dev, "required output report is "
-                                        "missing\n");
+                        hid_err(hid, "required output report is missing\n");
                         return -ENODEV;
                 }
 
                 report = list_entry(report_ptr, 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;
                 }
 
@@ -137,7 +136,7 @@ static int plff_init(struct hid_device *hid)
                         weak = &report->field[3]->value[0];
                         debug("detected 4-field device");
                 } else {
-                        dev_err(&hid->dev, "not enough fields or values\n");
+                        hid_err(hid, "not enough fields or values\n");
                         return -ENODEV;
                 }
 
@@ -164,8 +163,7 @@ static int plff_init(struct hid_device *hid)
                 usbhid_submit_report(hid, plff->report, USB_DIR_OUT);
         }
 
-        dev_info(&hid->dev, "Force feedback for PantherLord/GreenAsia "
-               "devices by Anssi Hannula <anssi.hannula@gmail.com>\n");
+        hid_info(hid, "Force feedback for PantherLord/GreenAsia devices by Anssi Hannula <anssi.hannula@gmail.com>\n");
 
         return 0;
 }
@@ -185,13 +183,13 @@ static int pl_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;
         }