aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/hid
diff options
context:
space:
mode:
authorRafi Rubin <rafi@seas.upenn.edu>2010-08-26 00:54:55 -0400
committerJiri Kosina <jkosina@suse.cz>2010-08-30 09:26:12 -0400
commita52dc34c0eea991115a9d789e9461f06768fa360 (patch)
treebc191dd2149597d63a50a3eafb9c9294bca8f3ef /drivers/hid
parent29cf28ae8dc244f89e213dc198f2286659d521b5 (diff)
HID: ntrig: a bit of whitespace cleanup
Signed-off-by: Rafi Rubin <rafi@seas.upenn.edu> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Diffstat (limited to 'drivers/hid')
-rw-r--r--drivers/hid/hid-ntrig.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/drivers/hid/hid-ntrig.c b/drivers/hid/hid-ntrig.c
index fb69b8c4953f..43e95dee9290 100644
--- a/drivers/hid/hid-ntrig.c
+++ b/drivers/hid/hid-ntrig.c
@@ -377,8 +377,8 @@ static struct attribute_group ntrig_attribute_group = {
377 */ 377 */
378 378
379static int ntrig_input_mapping(struct hid_device *hdev, struct hid_input *hi, 379static int ntrig_input_mapping(struct hid_device *hdev, struct hid_input *hi,
380 struct hid_field *field, struct hid_usage *usage, 380 struct hid_field *field, struct hid_usage *usage,
381 unsigned long **bit, int *max) 381 unsigned long **bit, int *max)
382{ 382{
383 struct ntrig_data *nd = hid_get_drvdata(hdev); 383 struct ntrig_data *nd = hid_get_drvdata(hdev);
384 384
@@ -448,13 +448,13 @@ static int ntrig_input_mapping(struct hid_device *hdev, struct hid_input *hi,
448 /* width/height mapped on TouchMajor/TouchMinor/Orientation */ 448 /* width/height mapped on TouchMajor/TouchMinor/Orientation */
449 case HID_DG_WIDTH: 449 case HID_DG_WIDTH:
450 hid_map_usage(hi, usage, bit, max, 450 hid_map_usage(hi, usage, bit, max,
451 EV_ABS, ABS_MT_TOUCH_MAJOR); 451 EV_ABS, ABS_MT_TOUCH_MAJOR);
452 return 1; 452 return 1;
453 case HID_DG_HEIGHT: 453 case HID_DG_HEIGHT:
454 hid_map_usage(hi, usage, bit, max, 454 hid_map_usage(hi, usage, bit, max,
455 EV_ABS, ABS_MT_TOUCH_MINOR); 455 EV_ABS, ABS_MT_TOUCH_MINOR);
456 input_set_abs_params(hi->input, ABS_MT_ORIENTATION, 456 input_set_abs_params(hi->input, ABS_MT_ORIENTATION,
457 0, 1, 0, 0); 457 0, 1, 0, 0);
458 return 1; 458 return 1;
459 } 459 }
460 return 0; 460 return 0;
@@ -468,8 +468,8 @@ static int ntrig_input_mapping(struct hid_device *hdev, struct hid_input *hi,
468} 468}
469 469
470static int ntrig_input_mapped(struct hid_device *hdev, struct hid_input *hi, 470static int ntrig_input_mapped(struct hid_device *hdev, struct hid_input *hi,
471 struct hid_field *field, struct hid_usage *usage, 471 struct hid_field *field, struct hid_usage *usage,
472 unsigned long **bit, int *max) 472 unsigned long **bit, int *max)
473{ 473{
474 /* No special mappings needed for the pen and single touch */ 474 /* No special mappings needed for the pen and single touch */
475 if (field->physical) 475 if (field->physical)
@@ -489,7 +489,7 @@ static int ntrig_input_mapped(struct hid_device *hdev, struct hid_input *hi,
489 * and call input_mt_sync after each point if necessary 489 * and call input_mt_sync after each point if necessary
490 */ 490 */
491static int ntrig_event (struct hid_device *hid, struct hid_field *field, 491static int ntrig_event (struct hid_device *hid, struct hid_field *field,
492 struct hid_usage *usage, __s32 value) 492 struct hid_usage *usage, __s32 value)
493{ 493{
494 struct input_dev *input = field->hidinput->input; 494 struct input_dev *input = field->hidinput->input;
495 struct ntrig_data *nd = hid_get_drvdata(hid); 495 struct ntrig_data *nd = hid_get_drvdata(hid);
@@ -860,7 +860,7 @@ err_free:
860static void ntrig_remove(struct hid_device *hdev) 860static void ntrig_remove(struct hid_device *hdev)
861{ 861{
862 sysfs_remove_group(&hdev->dev.kobj, 862 sysfs_remove_group(&hdev->dev.kobj,
863 &ntrig_attribute_group); 863 &ntrig_attribute_group);
864 hid_hw_stop(hdev); 864 hid_hw_stop(hdev);
865 kfree(hid_get_drvdata(hdev)); 865 kfree(hid_get_drvdata(hdev));
866} 866}