HID: convert to dev_* prints
Jiri Slaby [Thu, 18 Sep 2008 10:23:34 +0000 (12:23 +0200)]
Since we have a real device bound to a driver, we may use struct
device for printing. Use dev_* functions instead of printks in
4 drivers.

Signed-off-by: Jiri Slaby <jirislaby@gmail.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>

drivers/hid/hid-lg2ff.c
drivers/hid/hid-pl.c
drivers/hid/hid-tmff.c
drivers/hid/hid-zpff.c

index b2e9a67..4e6dc6e 100644 (file)
@@ -71,18 +71,18 @@ int lg2ff_init(struct hid_device *hid)
        int error;
 
        if (list_empty(report_list)) {
-               printk(KERN_ERR "hid-lg2ff: no output report found\n");
+               dev_err(&hid->dev, "no output report found\n");
                return -ENODEV;
        }
 
        report = list_entry(report_list->next, struct hid_report, list);
 
        if (report->maxfield < 1) {
-               printk(KERN_ERR "hid-lg2ff: output report is empty\n");
+               dev_err(&hid->dev, "output report is empty\n");
                return -ENODEV;
        }
        if (report->field[0]->report_count < 7) {
-               printk(KERN_ERR "hid-lg2ff: not enough values in the field\n");
+               dev_err(&hid->dev, "not enough values in the field\n");
                return -ENODEV;
        }
 
@@ -109,7 +109,7 @@ int lg2ff_init(struct hid_device *hid)
 
        usbhid_submit_report(hid, report, USB_DIR_OUT);
 
-       printk(KERN_INFO "Force feedback for Logitech Rumblepad 2 by "
+       dev_info(&hid->dev, "Force feedback for Logitech Rumblepad 2 by "
               "Anssi Hannula <anssi.hannula@gmail.com>\n");
 
        return 0;
index a1d1fb9..acd8155 100644 (file)
@@ -90,7 +90,7 @@ static int plff_init(struct hid_device *hid)
           currently unknown. */
 
        if (list_empty(report_list)) {
-               printk(KERN_ERR "hid-plff: no output reports found\n");
+               dev_err(&hid->dev, "no output reports found\n");
                return -ENODEV;
        }
 
@@ -99,18 +99,19 @@ static int plff_init(struct hid_device *hid)
                report_ptr = report_ptr->next;
 
                if (report_ptr == report_list) {
-                       printk(KERN_ERR "hid-plff: required output report is missing\n");
+                       dev_err(&hid->dev, "required output report is "
+                                       "missing\n");
                        return -ENODEV;
                }
 
                report = list_entry(report_ptr, struct hid_report, list);
                if (report->maxfield < 1) {
-                       printk(KERN_ERR "hid-plff: no fields in the report\n");
+                       dev_err(&hid->dev, "no fields in the report\n");
                        return -ENODEV;
                }
 
                if (report->field[0]->report_count < 4) {
-                       printk(KERN_ERR "hid-plff: not enough values in the field\n");
+                       dev_err(&hid->dev, "not enough values in the field\n");
                        return -ENODEV;
                }
 
@@ -136,7 +137,7 @@ static int plff_init(struct hid_device *hid)
                usbhid_submit_report(hid, plff->report, USB_DIR_OUT);
        }
 
-       printk(KERN_INFO "hid-plff: Force feedback for PantherLord/GreenAsia "
+       dev_info(&hid->dev, "Force feedback for PantherLord/GreenAsia "
               "devices by Anssi Hannula <anssi.hannula@gmail.com>\n");
 
        return 0;
index be7ebe2..1b7cba0 100644 (file)
@@ -149,27 +149,28 @@ 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) {
-                                       warn("ignoring FF field with "
-                                                       "report_count < 2");
+                                       dev_warn(&hid->dev, "ignoring FF field "
+                                               "with report_count < 2\n");
                                        continue;
                                }
 
                                if (field->logical_maximum ==
                                                field->logical_minimum) {
-                                       warn("ignoring FF field with "
-                                                       "logical_maximum == "
-                                                       "logical_minimum");
+                                       dev_warn(&hid->dev, "ignoring FF field "
+                                                       "with logical_maximum "
+                                                       "== logical_minimum\n");
                                        continue;
                                }
 
                                if (tmff->report && tmff->report != report) {
-                                       warn("ignoring FF field in other "
-                                                       "report");
+                                       dev_warn(&hid->dev, "ignoring FF field "
+                                                       "in other report\n");
                                        continue;
                                }
 
                                if (tmff->ff_field && tmff->ff_field != field) {
-                                       warn("ignoring duplicate FF field");
+                                       dev_warn(&hid->dev, "ignoring "
+                                                       "duplicate FF field\n");
                                        continue;
                                }
 
@@ -182,7 +183,8 @@ static int tmff_init(struct hid_device *hid, const signed short *ff_bits)
                                break;
 
                        default:
-                               warn("ignoring unknown output usage %08x",
+                               dev_warn(&hid->dev, "ignoring unknown output "
+                                               "usage %08x\n",
                                                field->usage[0].hid);
                                continue;
                        }
@@ -190,7 +192,7 @@ static int tmff_init(struct hid_device *hid, const signed short *ff_bits)
        }
 
        if (!tmff->report) {
-               err("cant find FF field in output reports\n");
+               dev_err(&hid->dev, "can't find FF field in output reports\n");
                error = -ENODEV;
                goto fail;
        }
@@ -199,8 +201,8 @@ static int tmff_init(struct hid_device *hid, const signed short *ff_bits)
        if (error)
                goto fail;
 
-       info("Force feedback for ThrustMaster devices by Zinx Verituse "
-                       "<zinx@epicsol.org>");
+       dev_info(&hid->dev, "force feedback for ThrustMaster devices by Zinx "
+                       "Verituse <zinx@epicsol.org>");
        return 0;
 
 fail:
index 9ed04ee..ea82f37 100644 (file)
@@ -73,14 +73,14 @@ static int zpff_init(struct hid_device *hid)
        int error;
 
        if (list_empty(report_list)) {
-               printk(KERN_ERR "hid-zpff: no output report found\n");
+               dev_err(&hid->dev, "no output report found\n");
                return -ENODEV;
        }
 
        report = list_entry(report_list->next, struct hid_report, list);
 
        if (report->maxfield < 4) {
-               printk(KERN_ERR "hid-zpff: not enough fields in report\n");
+               dev_err(&hid->dev, "not enough fields in report\n");
                return -ENODEV;
        }
 
@@ -103,7 +103,7 @@ static int zpff_init(struct hid_device *hid)
        zpff->report->field[3]->value[0] = 0x00;
        usbhid_submit_report(hid, zpff->report, USB_DIR_OUT);
 
-       printk(KERN_INFO "Force feedback for Zeroplus based devices by "
+       dev_info(&hid->dev, "force feedback for Zeroplus based devices by "
               "Anssi Hannula <anssi.hannula@gmail.com>\n");
 
        return 0;