DrathOrg/libratbag-plus
1
0
Fork 0
forked from drath/libratbag
Code Pull Requests Activity

hidpp20-drv: cleanup hidpp20drv_update_button*

Browse Source 
There is no point anymore to have an extra 'action' argument, and make
both type of function look the same.

Signed-off-by: Benjamin Tissoires <benjamin.tissoires@gmail.com>
This commit is contained in:
Benjamin Tissoires
2017-10-17 16:01:20 +02:00
committed by Peter Hutterer
parent 2e836a40d3
commit 18a8fb9651
1 changed files with 8 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/driver-hidpp20.c
View File

@@ -360,12 +360,12 @@ hidpp20drv_read_led(struct ratbag_led *led)
}
static int
hidpp20drv_write_button_1b04(struct ratbag_button *button,
const struct ratbag_button_action *action)
hidpp20drv_update_button_1b04(struct ratbag_button *button)
{
struct ratbag_device *device = button->profile->device;
struct hidpp20drv_data *drv_data = ratbag_get_drv_data(device);
struct hidpp20_control_id *control;
struct ratbag_button_action *action = &button->action;
uint16_t mapping;
int rc;
@@ -395,12 +395,12 @@ hidpp20drv_write_button_1b04(struct ratbag_button *button,
}
static int
hidpp20drv_update_button_8100(struct ratbag_button *button,
const struct ratbag_button_action *action)
hidpp20drv_update_button_8100(struct ratbag_button *button)
{
struct ratbag_device *device = button->profile->device;
struct hidpp20drv_data *drv_data = ratbag_get_drv_data(device);
struct hidpp20_profile *profile;
struct ratbag_button_action *action = &button->action;
uint8_t code, type, subtype;
if (!(drv_data->capabilities & HIDPP_CAP_ONBOARD_PROFILES_8100))
@@ -447,17 +447,16 @@ hidpp20drv_update_button_8100(struct ratbag_button *button,
}
static int
hidpp20drv_update_button(struct ratbag_button *button,
const struct ratbag_button_action *action)
hidpp20drv_update_button(struct ratbag_button *button)
{
struct ratbag_device *device = button->profile->device;
struct hidpp20drv_data *drv_data = ratbag_get_drv_data(device);
if (drv_data->capabilities & HIDPP_CAP_ONBOARD_PROFILES_8100)
return hidpp20drv_update_button_8100(button, action);
return hidpp20drv_update_button_8100(button);
if (drv_data->capabilities & HIDPP_CAP_BUTTON_KEY_1b04)
return hidpp20drv_write_button_1b04(button, action);
return hidpp20drv_update_button_1b04(button);
return -ENOTSUP;
}
@@ -1139,12 +1138,10 @@ hidpp20drv_commit(struct ratbag_device *device)
}
list_for_each(button, &profile->buttons, link) {
struct ratbag_button_action action = button->action;
if (!button->dirty)
continue;
rc = hidpp20drv_update_button(button, &action);
rc = hidpp20drv_update_button(button);
if (rc)
return RATBAG_ERROR_DEVICE;
}