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-lg3ff.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-lg3ff.c')
-rw-r--r-- | drivers/hid/hid-lg3ff.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/drivers/hid/hid-lg3ff.c b/drivers/hid/hid-lg3ff.c index 4002832ee4af..f98644c26c1d 100644 --- a/drivers/hid/hid-lg3ff.c +++ b/drivers/hid/hid-lg3ff.c | |||
@@ -141,20 +141,20 @@ int lg3ff_init(struct hid_device *hid) | |||
141 | 141 | ||
142 | /* Find the report to use */ | 142 | /* Find the report to use */ |
143 | if (list_empty(report_list)) { | 143 | if (list_empty(report_list)) { |
144 | err_hid("No output report found"); | 144 | hid_err(hid, "No output report found\n"); |
145 | return -1; | 145 | return -1; |
146 | } | 146 | } |
147 | 147 | ||
148 | /* Check that the report looks ok */ | 148 | /* Check that the report looks ok */ |
149 | report = list_entry(report_list->next, struct hid_report, list); | 149 | report = list_entry(report_list->next, struct hid_report, list); |
150 | if (!report) { | 150 | if (!report) { |
151 | err_hid("NULL output report"); | 151 | hid_err(hid, "NULL output report\n"); |
152 | return -1; | 152 | return -1; |
153 | } | 153 | } |
154 | 154 | ||
155 | field = report->field[0]; | 155 | field = report->field[0]; |
156 | if (!field) { | 156 | if (!field) { |
157 | err_hid("NULL field"); | 157 | hid_err(hid, "NULL field\n"); |
158 | return -1; | 158 | return -1; |
159 | } | 159 | } |
160 | 160 | ||
@@ -169,8 +169,7 @@ int lg3ff_init(struct hid_device *hid) | |||
169 | if (test_bit(FF_AUTOCENTER, dev->ffbit)) | 169 | if (test_bit(FF_AUTOCENTER, dev->ffbit)) |
170 | dev->ff->set_autocenter = hid_lg3ff_set_autocenter; | 170 | dev->ff->set_autocenter = hid_lg3ff_set_autocenter; |
171 | 171 | ||
172 | dev_info(&hid->dev, "Force feedback for Logitech Flight System G940 by " | 172 | hid_info(hid, "Force feedback for Logitech Flight System G940 by Gary Stein <LordCnidarian@gmail.com>\n"); |
173 | "Gary Stein <LordCnidarian@gmail.com>\n"); | ||
174 | return 0; | 173 | return 0; |
175 | } | 174 | } |
176 | 175 | ||