From: Ping Cheng <pingli...@gmail.com>
It is unnecessary to return a value since nothing is expecting a
value from it.
Signed-off-by: Ping Cheng <ping.ch...@wacom.com>
Reviewed-By: Jason Gerecke <jason.gere...@wacom.com>
Signed-off-by: Jiri Kosina <jkos...@suse.cz>
[jason.gere...@wacom.com: Imported into input-wacom repository (354a329)]
Signed-off-by: Jason Gerecke <jason.gere...@wacom.com>
[jason.gere...@wacom.com: Backported from input-wacom repository (e94e9ad)]
Signed-off-by: Jason Gerecke <jason.gere...@wacom.com>
---
3.17/wacom.h | 2 +-
3.17/wacom_wac.c | 62 ++++++++++++++++++++++++--------------------------------
2 files changed, 28 insertions(+), 36 deletions(-)
diff --git a/3.17/wacom.h b/3.17/wacom.h
index 1e2c898..e9e0c16 100644
--- a/3.17/wacom.h
+++ b/3.17/wacom.h
@@ -212,7 +212,7 @@ int wacom_setup_pad_input_capabilities(struct input_dev
*input_dev,
struct wacom_wac *wacom_wac);
void wacom_wac_usage_mapping(struct hid_device *hdev,
struct hid_field *field, struct hid_usage *usage);
-int wacom_wac_event(struct hid_device *hdev, struct hid_field *field,
+void wacom_wac_event(struct hid_device *hdev, struct hid_field *field,
struct hid_usage *usage, __s32 value);
void wacom_wac_report(struct hid_device *hdev, struct hid_report *report);
void wacom_battery_work(struct work_struct *work);
diff --git a/3.17/wacom_wac.c b/3.17/wacom_wac.c
index 7e20236..7560dfa 100644
--- a/3.17/wacom_wac.c
+++ b/3.17/wacom_wac.c
@@ -1590,7 +1590,7 @@ static void wacom_wac_pad_usage_mapping(struct hid_device
*hdev,
}
}
-static int wacom_wac_pad_event(struct hid_device *hdev, struct hid_field
*field,
+static void wacom_wac_pad_event(struct hid_device *hdev, struct hid_field
*field,
struct hid_usage *usage, __s32 value)
{
struct wacom *wacom = hid_get_drvdata(hdev);
@@ -1606,23 +1606,21 @@ static int wacom_wac_pad_event(struct hid_device *hdev,
struct hid_field *field,
case WACOM_HID_WD_BATTERY_LEVEL:
wacom_wac->hid_data.battery_capacity = value;
wacom_wac->hid_data.bat_connected = 1;
- return 0;
+ break;
case WACOM_HID_WD_BATTERY_CHARGING:
wacom_wac->hid_data.bat_charging = value;
wacom_wac->hid_data.ps_connected = value;
wacom_wac->hid_data.bat_connected = 1;
- return 0;
+ break;
case WACOM_HID_WD_TOUCHRINGSTATUS:
- return 0;
+ break;
default:
input_event(input, usage->type, usage->code, value);
break;
}
-
- return 0;
}
static void wacom_wac_pad_pre_report(struct hid_device *hdev,
@@ -1739,7 +1737,7 @@ static void wacom_wac_pen_usage_mapping(struct hid_device
*hdev,
}
}
-static int wacom_wac_pen_event(struct hid_device *hdev, struct hid_field
*field,
+static void wacom_wac_pen_event(struct hid_device *hdev, struct hid_field
*field,
struct hid_usage *usage, __s32 value)
{
struct wacom *wacom = hid_get_drvdata(hdev);
@@ -1761,25 +1759,25 @@ static int wacom_wac_pen_event(struct hid_device *hdev,
struct hid_field *field,
wacom_wac->hid_data.inrange_state = value;
if (!(features->quirks & WACOM_QUIRK_SENSE))
wacom_wac->hid_data.sense_state = value;
- return 0;
+ return;
case HID_DG_BATTERYSTRENGTH:
wacom_wac->hid_data.battery_capacity = value;
wacom_wac->hid_data.bat_connected = 1;
break;
case HID_DG_INVERT:
wacom_wac->hid_data.invert_state = value;
- return 0;
+ return;
case HID_DG_ERASER:
case HID_DG_TIPSWITCH:
wacom_wac->hid_data.tipswitch |= value;
- return 0;
+ return;
case HID_DG_TOOLSERIALNUMBER:
wacom_wac->serial[0] = (wacom_wac->serial[0] & ~0xFFFFFFFFULL);
wacom_wac->serial[0] |= value;
- return 0;
+ return;
case WACOM_HID_WD_SENSE:
wacom_wac->hid_data.sense_state = value;
- return 0;
+ return;
case WACOM_HID_WD_SERIALHI:
wacom_wac->serial[0] = (wacom_wac->serial[0] & 0xFFFFFFFF);
wacom_wac->serial[0] |= ((__u64)value) << 32;
@@ -1791,7 +1789,7 @@ static int wacom_wac_pen_event(struct hid_device *hdev,
struct hid_field *field,
if (value >> 20 == 1) {
wacom_wac->id[0] |= value & 0xFFFFF;
}
- return 0;
+ return;
case WACOM_HID_WD_TOOLTYPE:
/*
* Some devices (MobileStudio Pro, and possibly later
@@ -1801,50 +1799,48 @@ static int wacom_wac_pen_event(struct hid_device *hdev,
struct hid_field *field,
* up over time :(
*/
wacom_wac->id[0] |= value;
- return 0;
+ return;
case WACOM_HID_WD_OFFSETLEFT:
if (features->offset_left && value != features->offset_left)
hid_warn(hdev, "%s: overriding exising left offset "
"%d -> %d\n", __func__, value,
features->offset_left);
features->offset_left = value;
- return 0;
+ return;
case WACOM_HID_WD_OFFSETRIGHT:
if (features->offset_right && value != features->offset_right)
hid_warn(hdev, "%s: overriding exising right offset "
"%d -> %d\n", __func__, value,
features->offset_right);
features->offset_right = value;
- return 0;
+ return;
case WACOM_HID_WD_OFFSETTOP:
if (features->offset_top && value != features->offset_top)
hid_warn(hdev, "%s: overriding exising top offset "
"%d -> %d\n", __func__, value,
features->offset_top);
features->offset_top = value;
- return 0;
+ return;
case WACOM_HID_WD_OFFSETBOTTOM:
if (features->offset_bottom && value != features->offset_bottom)
hid_warn(hdev, "%s: overriding exising bottom offset "
"%d -> %d\n", __func__, value,
features->offset_bottom);
features->offset_bottom = value;
- return 0;
+ return;
}
/* send pen events only when touch is up or forced out
* or touch arbitration is off
*/
if (!usage->type || delay_pen_events(wacom_wac))
- return 0;
+ return;
/* send pen events only when the pen is in/entering/leaving proximity */
if (!wacom_wac->hid_data.inrange_state && !wacom_wac->tool[0])
- return 0;
+ return;
input_event(input, usage->type, usage->code, value);
-
- return 0;
}
static void wacom_wac_pen_pre_report(struct hid_device *hdev,
@@ -1988,7 +1984,7 @@ static void wacom_wac_finger_slot(struct wacom_wac
*wacom_wac,
}
}
-static int wacom_wac_finger_event(struct hid_device *hdev,
+static void wacom_wac_finger_event(struct hid_device *hdev,
struct hid_field *field, struct hid_usage *usage, __s32 value)
{
struct wacom *wacom = hid_get_drvdata(hdev);
@@ -2021,8 +2017,6 @@ static int wacom_wac_finger_event(struct hid_device *hdev,
if (equivalent_usage == wacom_wac->hid_data.last_slot_field)
wacom_wac_finger_slot(wacom_wac,
wacom_wac->touch_input);
}
-
- return 0;
}
static void wacom_wac_finger_pre_report(struct hid_device *hdev,
@@ -2108,29 +2102,27 @@ void wacom_wac_usage_mapping(struct hid_device *hdev,
features->device_type |= WACOM_DEVICETYPE_DIRECT;
if (WACOM_PAD_FIELD(field))
- return wacom_wac_pad_usage_mapping(hdev, field, usage);
+ wacom_wac_pad_usage_mapping(hdev, field, usage);
else if (WACOM_PEN_FIELD(field))
- return wacom_wac_pen_usage_mapping(hdev, field, usage);
+ wacom_wac_pen_usage_mapping(hdev, field, usage);
else if (WACOM_FINGER_FIELD(field))
- return wacom_wac_finger_usage_mapping(hdev, field, usage);
+ wacom_wac_finger_usage_mapping(hdev, field, usage);
}
-int wacom_wac_event(struct hid_device *hdev, struct hid_field *field,
+void wacom_wac_event(struct hid_device *hdev, struct hid_field *field,
struct hid_usage *usage, __s32 value)
{
struct wacom *wacom = hid_get_drvdata(hdev);
if (wacom->wacom_wac.features.type != HID_GENERIC)
- return 0;
+ return;
if (WACOM_PAD_FIELD(field))
- return wacom_wac_pad_event(hdev, field, usage, value);
+ wacom_wac_pad_event(hdev, field, usage, value);
else if (WACOM_PEN_FIELD(field))
- return wacom_wac_pen_event(hdev, field, usage, value);
+ wacom_wac_pen_event(hdev, field, usage, value);
else if (WACOM_FINGER_FIELD(field))
- return wacom_wac_finger_event(hdev, field, usage, value);
-
- return 0;
+ wacom_wac_finger_event(hdev, field, usage, value);
}
static void wacom_report_events(struct hid_device *hdev, struct hid_report
*report)
--
2.11.0
------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, SlashDot.org! http://sdm.link/slashdot
_______________________________________________
Linuxwacom-devel mailing list
Linuxwacom-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/linuxwacom-devel
