# \[PATCH v2 6/9\] HID: haptic: Convert simple methods into static inline ones - From: Rong Zhang \ - Date: 2026-11-09 19:50:59 - List: linux-input - Page: https://ratatoskr.run/linux-input/2026/11/17899720 - Thread: https://ratatoskr.run/linux-input/2026/11/17899714/t.md ```text Some methods of hid-haptic are meant to check the prerequisites before really initializing the haptic device. Most of them are quite simple and straightforward. To prepare for the following changes that convert hid-haptic into a loadable plugin module, factor them out of the module and convert them into static inline functions. Some unused declarations and stubs in the header are also removed, i.e., hid_haptic_handle_press_release(), hid_haptic_reset(), hid_haptic_handle_input(). They seemed to be remnants from the patch revisioning process. No functional change intended. Signed-off-by: Rong Zhang --- drivers/hid/hid-haptic.c | 110 --------------------------------------- drivers/hid/hid-haptic.h | 131 +++++++++++++++++++++++++++++++++++++---------- 2 files changed, 104 insertions(+), 137 deletions(-) diff --git a/drivers/hid/hid-haptic.c b/drivers/hid/hid-haptic.c index 9f2af082d2ea..a6f3ec514504 100644 --- a/drivers/hid/hid-haptic.c +++ b/drivers/hid/hid-haptic.c @@ -10,103 +10,6 @@ #include "hid-haptic.h" -void hid_haptic_feature_mapping(struct hid_device *hdev, - struct hid_haptic_device *haptic, - struct hid_field *field, struct hid_usage *usage) -{ - u16 usage_hid; - - if (usage->hid == HID_HP_AUTOTRIGGER) { - if (usage->usage_index >= field->report_count) { - dev_err(&hdev->dev, - "HID_HP_AUTOTRIGGER out of range\n"); - return; - } - haptic->auto_trigger_report = field->report; - } else if ((usage->hid & HID_USAGE_PAGE) == HID_UP_ORDINAL) { - usage_hid = usage->hid & HID_USAGE; - switch (field->logical) { - case HID_HP_WAVEFORMLIST: - if (usage_hid > haptic->max_waveform_id) - haptic->max_waveform_id = usage_hid; - break; - case HID_HP_DURATIONLIST: - if (usage_hid > haptic->max_duration_id) - haptic->max_duration_id = usage_hid; - break; - default: - break; - } - } -} -EXPORT_SYMBOL_GPL(hid_haptic_feature_mapping); - -void hid_haptic_check_pressure_unit(struct hid_haptic_device *haptic, - struct hid_input *hi, struct hid_field *field) -{ - if (hi->application != HID_DG_TOUCHPAD) - return; - - if (IS_ERR(haptic->input_dev)) - return; - - if (field->unit != HID_UNIT_GRAM && field->unit != HID_UNIT_NEWTON) - goto reject; - - if (!haptic->input_dev) { - haptic->input_dev = hi->input; - haptic->pressure_field = field; - haptic->force_resolution = input_abs_get_res(hi->input, ABS_MT_PRESSURE); - return; - } - - if (hid_haptic_connected_to_input(haptic, hi->input) && - haptic->pressure_field->unit == field->unit && - haptic->pressure_field->logical_minimum == field->logical_minimum && - haptic->pressure_field->physical_minimum == field->physical_minimum && - haptic->force_resolution == input_abs_get_res(hi->input, ABS_MT_PRESSURE)) - return; - -reject: - /* - * Reject if: - * - there are multiple input devices with pressure sensors - * - there is any touchpad application with a non-force unit - * - pressure annotations mismatch among HID_DG_TIPPRESSURE usages - */ - haptic->input_dev = ERR_PTR(-EPROTO); -} -EXPORT_SYMBOL_GPL(hid_haptic_check_pressure_unit); - -int hid_haptic_input_mapping(struct hid_device *hdev, - struct hid_haptic_device *haptic, - struct hid_input *hi, - struct hid_field *field, struct hid_usage *usage, - unsigned long **bit, int *max) -{ - if (usage->hid == HID_HP_MANUALTRIGGER) { - haptic->manual_trigger_report = field->report; - /* we don't really want to map these fields */ - return -1; - } - - return 0; -} -EXPORT_SYMBOL_GPL(hid_haptic_input_mapping); - -bool hid_haptic_input_configured(struct hid_device *hdev, - struct hid_haptic_device *haptic, struct hid_input *hi) -{ - if (IS_ERR_OR_NULL(haptic->input_dev) || haptic->input_dev != hi->input || - !haptic->auto_trigger_report || !haptic->manual_trigger_report) - return false; - - __set_bit(INPUT_PROP_PRESSUREPAD, hi->input->propbit); - - return hid_haptic_init(hdev, haptic, hi->input) == 0; -} -EXPORT_SYMBOL_GPL(hid_haptic_input_configured); - static void parse_auto_trigger_field(struct hid_haptic_device *haptic, struct hid_field *field) { @@ -555,16 +458,3 @@ int hid_haptic_init(struct hid_device *hdev, return ret; } EXPORT_SYMBOL_GPL(hid_haptic_init); - -void hid_haptic_pressure_reset(struct hid_haptic_device *haptic) -{ - haptic->pressure_sum = 0; -} -EXPORT_SYMBOL_GPL(hid_haptic_pressure_reset); - -void hid_haptic_pressure_increase(struct hid_haptic_device *haptic, - __s32 pressure) -{ - haptic->pressure_sum += pressure; -} -EXPORT_SYMBOL_GPL(hid_haptic_pressure_increase); diff --git a/drivers/hid/hid-haptic.h b/drivers/hid/hid-haptic.h index 7878cd73ccdb..6196041eb4f8 100644 --- a/drivers/hid/hid-haptic.h +++ b/drivers/hid/hid-haptic.h @@ -72,25 +72,112 @@ static inline bool hid_haptic_connected_to_input(struct hid_haptic_device *hapti return haptic->input_dev == input; } -void hid_haptic_feature_mapping(struct hid_device *hdev, - struct hid_haptic_device *haptic, - struct hid_field *field, struct hid_usage - *usage); -void hid_haptic_check_pressure_unit(struct hid_haptic_device *haptic, - struct hid_input *hi, struct hid_field *field); -int hid_haptic_input_mapping(struct hid_device *hdev, - struct hid_haptic_device *haptic, - struct hid_input *hi, - struct hid_field *field, struct hid_usage *usage, - unsigned long **bit, int *max); -bool hid_haptic_input_configured(struct hid_device *hdev, - struct hid_haptic_device *haptic, struct hid_input *hi); +static inline void hid_haptic_feature_mapping(struct hid_device *hdev, + struct hid_haptic_device *haptic, + struct hid_field *field, struct hid_usage *usage) +{ + u16 usage_hid; + + if (usage->hid == HID_HP_AUTOTRIGGER) { + if (usage->usage_index >= field->report_count) { + dev_err(&hdev->dev, "HID_HP_AUTOTRIGGER out of range\n"); + return; + } + + haptic->auto_trigger_report = field->report; + } else if ((usage->hid & HID_USAGE_PAGE) == HID_UP_ORDINAL) { + usage_hid = usage->hid & HID_USAGE; + switch (field->logical) { + case HID_HP_WAVEFORMLIST: + if (usage_hid > haptic->max_waveform_id) + haptic->max_waveform_id = usage_hid; + break; + case HID_HP_DURATIONLIST: + if (usage_hid > haptic->max_duration_id) + haptic->max_duration_id = usage_hid; + break; + default: + break; + } + } +} + +static inline void hid_haptic_check_pressure_unit(struct hid_haptic_device *haptic, + struct hid_input *hi, struct hid_field *field) +{ + if (hi->application != HID_DG_TOUCHPAD) + return; + + if (IS_ERR(haptic->input_dev)) + return; + + if (field->unit != HID_UNIT_GRAM && field->unit != HID_UNIT_NEWTON) + goto reject; + + if (!haptic->input_dev) { + haptic->input_dev = hi->input; + haptic->pressure_field = field; + haptic->force_resolution = input_abs_get_res(hi->input, ABS_MT_PRESSURE); + return; + } + + if (hid_haptic_connected_to_input(haptic, hi->input) && + haptic->pressure_field->unit == field->unit && + haptic->pressure_field->logical_minimum == field->logical_minimum && + haptic->pressure_field->physical_minimum == field->physical_minimum && + haptic->force_resolution == input_abs_get_res(hi->input, ABS_MT_PRESSURE)) + return; + +reject: + /* + * Reject if: + * - there are multiple input devices with pressure sensors + * - there is any touchpad application with a non-force unit + * - pressure annotations mismatch among HID_DG_TIPPRESSURE usages + */ + haptic->input_dev = ERR_PTR(-EPROTO); +} + +static inline int hid_haptic_input_mapping(struct hid_device *hdev, + struct hid_haptic_device *haptic, + struct hid_input *hi, + struct hid_field *field, struct hid_usage *usage, + unsigned long **bit, int *max) +{ + if (usage->hid == HID_HP_MANUALTRIGGER) { + haptic->manual_trigger_report = field->report; + /* we don't really want to map these fields */ + return -1; + } + return 0; +} + int hid_haptic_init(struct hid_device *hdev, struct hid_haptic_device *haptic, struct input_dev *dev); -void hid_haptic_handle_press_release(struct hid_haptic_device *haptic); -void hid_haptic_pressure_reset(struct hid_haptic_device *haptic); -void hid_haptic_pressure_increase(struct hid_haptic_device *haptic, - __s32 pressure); + +static inline bool hid_haptic_input_configured(struct hid_device *hdev, + struct hid_haptic_device *haptic, + struct hid_input *hi) +{ + if (IS_ERR_OR_NULL(haptic->input_dev) || haptic->input_dev != hi->input || + !haptic->auto_trigger_report || !haptic->manual_trigger_report) + return false; + + __set_bit(INPUT_PROP_PRESSUREPAD, hi->input->propbit); + + return hid_haptic_init(hdev, haptic, hi->input) == 0; +} + +static inline void hid_haptic_pressure_reset(struct hid_haptic_device *haptic) +{ + haptic->pressure_sum = 0; +} + +static inline void hid_haptic_pressure_increase(struct hid_haptic_device *haptic, + __s32 pressure) +{ + haptic->pressure_sum += pressure; +} #else static inline struct hid_haptic_device *hid_haptic_alloc(struct hid_device *hdev) { @@ -129,22 +216,12 @@ bool hid_haptic_input_configured(struct hid_device *hdev, return false; } static inline -void hid_haptic_reset(struct hid_device *hdev, struct hid_haptic_device *haptic) -{} -static inline int hid_haptic_init(struct hid_device *hdev, struct hid_haptic_device *haptic, struct input_dev *dev) { return 0; } static inline -void hid_haptic_handle_press_release(struct hid_haptic_device *haptic) {} -static inline -bool hid_haptic_handle_input(struct hid_haptic_device *haptic) -{ - return false; -} -static inline void hid_haptic_pressure_reset(struct hid_haptic_device *haptic) {} static inline void hid_haptic_pressure_increase(struct hid_haptic_device *haptic, -- 2.55.0 ```