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

diff --git a/drivers/hid/hid-tmff.c b/drivers/hid/hid-tmff.c
index 15434c814793..356a98fcb365 100644
--- a/drivers/hid/hid-tmff.c
+++ b/drivers/hid/hid-tmff.c
@@ -151,28 +151,23 @@ static int tmff_init(struct hid_device *hid, const signed short *ff_bits)
                         switch (field->usage[0].hid) {
                         case THRUSTMASTER_USAGE_FF:
                                 if (field->report_count < 2) {
-                                        dev_warn(&hid->dev, "ignoring FF field "
-                                                "with report_count < 2\n");
+                                        hid_warn(hid, "ignoring FF field with report_count < 2\n");
                                         continue;
                                 }
 
                                 if (field->logical_maximum ==
                                                 field->logical_minimum) {
-                                        dev_warn(&hid->dev, "ignoring FF field "
-                                                        "with logical_maximum "
-                                                        "== logical_minimum\n");
+                                        hid_warn(hid, "ignoring FF field with logical_maximum == logical_minimum\n");
                                         continue;
                                 }
 
                                 if (tmff->report && tmff->report != report) {
-                                        dev_warn(&hid->dev, "ignoring FF field "
-                                                        "in other report\n");
+                                        hid_warn(hid, "ignoring FF field in other report\n");
                                         continue;
                                 }
 
                                 if (tmff->ff_field && tmff->ff_field != field) {
-                                        dev_warn(&hid->dev, "ignoring "
-                                                        "duplicate FF field\n");
+                                        hid_warn(hid, "ignoring duplicate FF field\n");
                                         continue;
                                 }
 
@@ -185,16 +180,15 @@ static int tmff_init(struct hid_device *hid, const signed short *ff_bits)
                                 break;
 
                         default:
-                                dev_warn(&hid->dev, "ignoring unknown output "
-                                                "usage %08x\n",
-                                                field->usage[0].hid);
+                                hid_warn(hid, "ignoring unknown output usage %08x\n",
+                                         field->usage[0].hid);
                                 continue;
                         }
                 }
         }
 
         if (!tmff->report) {
-                dev_err(&hid->dev, "can't find FF field in output reports\n");
+                hid_err(hid, "can't find FF field in output reports\n");
                 error = -ENODEV;
                 goto fail;
         }
@@ -203,8 +197,7 @@ static int tmff_init(struct hid_device *hid, const signed short *ff_bits)
         if (error)
                 goto fail;
 
-        dev_info(&hid->dev, "force feedback for ThrustMaster devices by Zinx "
-                        "Verituse <zinx@epicsol.org>");
+        hid_info(hid, "force feedback for ThrustMaster devices by Zinx Verituse <zinx@epicsol.org>\n");
         return 0;
 
 fail:
@@ -224,13 +217,13 @@ static int tm_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;
         }