diff options
author | Joe Perches <joe@perches.com> | 2010-12-09 22:29:03 -0500 |
---|---|---|
committer | Jiri Kosina <jkosina@suse.cz> | 2010-12-10 09:10:38 -0500 |
commit | 4291ee305e9bb0699504a66f0e2b7aefcf0512a5 (patch) | |
tree | 3996b77eb64d4f3b76a0799f30a5b2ba6cbc9ddb /drivers/hid/hid-lgff.c | |
parent | 5bea7660bba973dc5e8e9d92b11fb1dd5b524ebf (diff) |
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>
Diffstat (limited to 'drivers/hid/hid-lgff.c')
-rw-r--r-- | drivers/hid/hid-lgff.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/hid/hid-lgff.c b/drivers/hid/hid-lgff.c index 61142b76a9b1..90d0ef2c92be 100644 --- a/drivers/hid/hid-lgff.c +++ b/drivers/hid/hid-lgff.c | |||
@@ -27,6 +27,8 @@ | |||
27 | * e-mail - mail your message to <johann.deneux@it.uu.se> | 27 | * e-mail - mail your message to <johann.deneux@it.uu.se> |
28 | */ | 28 | */ |
29 | 29 | ||
30 | #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt | ||
31 | |||
30 | #include <linux/input.h> | 32 | #include <linux/input.h> |
31 | #include <linux/usb.h> | 33 | #include <linux/usb.h> |
32 | #include <linux/hid.h> | 34 | #include <linux/hid.h> |
@@ -146,7 +148,7 @@ int lgff_init(struct hid_device* hid) | |||
146 | 148 | ||
147 | /* Find the report to use */ | 149 | /* Find the report to use */ |
148 | if (list_empty(report_list)) { | 150 | if (list_empty(report_list)) { |
149 | err_hid("No output report found"); | 151 | hid_err(hid, "No output report found\n"); |
150 | return -1; | 152 | return -1; |
151 | } | 153 | } |
152 | 154 | ||
@@ -154,7 +156,7 @@ int lgff_init(struct hid_device* hid) | |||
154 | report = list_entry(report_list->next, struct hid_report, list); | 156 | report = list_entry(report_list->next, struct hid_report, list); |
155 | field = report->field[0]; | 157 | field = report->field[0]; |
156 | if (!field) { | 158 | if (!field) { |
157 | err_hid("NULL field"); | 159 | hid_err(hid, "NULL field\n"); |
158 | return -1; | 160 | return -1; |
159 | } | 161 | } |
160 | 162 | ||
@@ -176,7 +178,7 @@ int lgff_init(struct hid_device* hid) | |||
176 | if ( test_bit(FF_AUTOCENTER, dev->ffbit) ) | 178 | if ( test_bit(FF_AUTOCENTER, dev->ffbit) ) |
177 | dev->ff->set_autocenter = hid_lgff_set_autocenter; | 179 | dev->ff->set_autocenter = hid_lgff_set_autocenter; |
178 | 180 | ||
179 | printk(KERN_INFO "Force feedback for Logitech force feedback devices by Johann Deneux <johann.deneux@it.uu.se>\n"); | 181 | pr_info("Force feedback for Logitech force feedback devices by Johann Deneux <johann.deneux@it.uu.se>\n"); |
180 | 182 | ||
181 | return 0; | 183 | return 0; |
182 | } | 184 | } |