Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-24 21:21:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'for-6.13/logitech' into for-linus

Browse Source 
- unused variable removal in hidpp_root_get_feature() (Bastien Nocera)
This commit is contained in:
Jiri Kosina 2024-11-18 21:52:49 +01:00
commit a737d9d62d
1 changed files with 19 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
drivers/hid/hid-logitech-hidpp.c
View File

@ -928,7 +928,7 @@ static int hidpp_unifying_init(struct hidpp_device *hidpp)
#define CMD_ROOT_GET_PROTOCOL_VERSION 0x10 #define CMD_ROOT_GET_PROTOCOL_VERSION 0x10
static int hidpp_root_get_feature(struct hidpp_device *hidpp, u16 feature, static int hidpp_root_get_feature(struct hidpp_device *hidpp, u16 feature,
u8 *feature_index, u8 *feature_type) u8 *feature_index)
{ {
struct hidpp_report response; struct hidpp_report response;
int ret; int ret;
@ -945,7 +945,6 @@ static int hidpp_root_get_feature(struct hidpp_device *hidpp, u16 feature,
return -ENOENT; return -ENOENT;
*feature_index = response.fap.params[0]; *feature_index = response.fap.params[0];
*feature_type = response.fap.params[1];
return ret; return ret;
} }
@ -1012,13 +1011,11 @@ print_version:
static int hidpp_get_serial(struct hidpp_device *hidpp, u32 *serial) static int hidpp_get_serial(struct hidpp_device *hidpp, u32 *serial)
{ {
struct hidpp_report response; struct hidpp_report response;
u8 feature_type;
u8 feature_index; u8 feature_index;
int ret; int ret;
ret = hidpp_root_get_feature(hidpp, HIDPP_PAGE_DEVICE_INFORMATION, ret = hidpp_root_get_feature(hidpp, HIDPP_PAGE_DEVICE_INFORMATION,
&feature_index, &feature_index);
&feature_type);
if (ret) if (ret)
return ret; return ret;
@ -1125,7 +1122,6 @@ static int hidpp_devicenametype_get_device_name(struct hidpp_device *hidpp,
static char *hidpp_get_device_name(struct hidpp_device *hidpp) static char *hidpp_get_device_name(struct hidpp_device *hidpp)
{ {
u8 feature_type;
u8 feature_index; u8 feature_index;
u8 __name_length; u8 __name_length;
char *name; char *name;
@ -1133,7 +1129,7 @@ static char *hidpp_get_device_name(struct hidpp_device *hidpp)
int ret; int ret;
ret = hidpp_root_get_feature(hidpp, HIDPP_PAGE_GET_DEVICE_NAME_TYPE, ret = hidpp_root_get_feature(hidpp, HIDPP_PAGE_GET_DEVICE_NAME_TYPE,
&feature_index, &feature_type); &feature_index);
if (ret) if (ret)
return NULL; return NULL;
@ -1300,15 +1296,13 @@ static int hidpp20_batterylevel_get_battery_info(struct hidpp_device *hidpp,
static int hidpp20_query_battery_info_1000(struct hidpp_device *hidpp) static int hidpp20_query_battery_info_1000(struct hidpp_device *hidpp)
{ {
u8 feature_type;
int ret; int ret;
int status, capacity, next_capacity, level; int status, capacity, next_capacity, level;
if (hidpp->battery.feature_index == 0xff) { if (hidpp->battery.feature_index == 0xff) {
ret = hidpp_root_get_feature(hidpp, ret = hidpp_root_get_feature(hidpp,
HIDPP_PAGE_BATTERY_LEVEL_STATUS, HIDPP_PAGE_BATTERY_LEVEL_STATUS,
&hidpp->battery.feature_index, &hidpp->battery.feature_index);
&feature_type);
if (ret) if (ret)
return ret; return ret;
} }
@ -1489,14 +1483,12 @@ static int hidpp20_map_battery_capacity(struct hid_device *hid_dev, int voltage)
static int hidpp20_query_battery_voltage_info(struct hidpp_device *hidpp) static int hidpp20_query_battery_voltage_info(struct hidpp_device *hidpp)
{ {
u8 feature_type;
int ret; int ret;
int status, voltage, level, charge_type; int status, voltage, level, charge_type;
if (hidpp->battery.voltage_feature_index == 0xff) { if (hidpp->battery.voltage_feature_index == 0xff) {
ret = hidpp_root_get_feature(hidpp, HIDPP_PAGE_BATTERY_VOLTAGE, ret = hidpp_root_get_feature(hidpp, HIDPP_PAGE_BATTERY_VOLTAGE,
&hidpp->battery.voltage_feature_index, &hidpp->battery.voltage_feature_index);
&feature_type);
if (ret) if (ret)
return ret; return ret;
} }
@ -1692,7 +1684,6 @@ static int hidpp20_unifiedbattery_get_status(struct hidpp_device *hidpp,
static int hidpp20_query_battery_info_1004(struct hidpp_device *hidpp) static int hidpp20_query_battery_info_1004(struct hidpp_device *hidpp)
{ {
u8 feature_type;
int ret; int ret;
u8 state_of_charge; u8 state_of_charge;
int status, level; int status, level;
@ -1700,8 +1691,7 @@ static int hidpp20_query_battery_info_1004(struct hidpp_device *hidpp)
if (hidpp->battery.feature_index == 0xff) { if (hidpp->battery.feature_index == 0xff) {
ret = hidpp_root_get_feature(hidpp, ret = hidpp_root_get_feature(hidpp,
HIDPP_PAGE_UNIFIED_BATTERY, HIDPP_PAGE_UNIFIED_BATTERY,
&hidpp->battery.feature_index, &hidpp->battery.feature_index);
&feature_type);
if (ret) if (ret)
return ret; return ret;
} }
@ -1834,14 +1824,9 @@ static int hidpp_battery_get_property(struct power_supply *psy,
static int hidpp_get_wireless_feature_index(struct hidpp_device *hidpp, u8 *feature_index) static int hidpp_get_wireless_feature_index(struct hidpp_device *hidpp, u8 *feature_index)
{ {
u8 feature_type; return hidpp_root_get_feature(hidpp,
int ret; HIDPP_PAGE_WIRELESS_DEVICE_STATUS,
feature_index);
ret = hidpp_root_get_feature(hidpp,
HIDPP_PAGE_WIRELESS_DEVICE_STATUS,
feature_index, &feature_type);
return ret;
} }
/* -------------------------------------------------------------------------- */ /* -------------------------------------------------------------------------- */
@ -1952,14 +1937,11 @@ static bool hidpp20_get_adc_measurement_1f20(struct hidpp_device *hidpp,
static int hidpp20_query_adc_measurement_info_1f20(struct hidpp_device *hidpp) static int hidpp20_query_adc_measurement_info_1f20(struct hidpp_device *hidpp)
{ {
u8 feature_type;
if (hidpp->battery.adc_measurement_feature_index == 0xff) { if (hidpp->battery.adc_measurement_feature_index == 0xff) {
int ret; int ret;
ret = hidpp_root_get_feature(hidpp, HIDPP_PAGE_ADC_MEASUREMENT, ret = hidpp_root_get_feature(hidpp, HIDPP_PAGE_ADC_MEASUREMENT,
&hidpp->battery.adc_measurement_feature_index, &hidpp->battery.adc_measurement_feature_index);
&feature_type);
if (ret) if (ret)
return ret; return ret;
@ -2014,15 +1996,13 @@ static int hidpp_hrs_set_highres_scrolling_mode(struct hidpp_device *hidpp,
bool enabled, u8 *multiplier) bool enabled, u8 *multiplier)
{ {
u8 feature_index; u8 feature_index;
u8 feature_type;
int ret; int ret;
u8 params[1]; u8 params[1];
struct hidpp_report response; struct hidpp_report response;
ret = hidpp_root_get_feature(hidpp, ret = hidpp_root_get_feature(hidpp,
HIDPP_PAGE_HI_RESOLUTION_SCROLLING, HIDPP_PAGE_HI_RESOLUTION_SCROLLING,
&feature_index, &feature_index);
&feature_type);
if (ret) if (ret)
return ret; return ret;
@ -2049,12 +2029,11 @@ static int hidpp_hrw_get_wheel_capability(struct hidpp_device *hidpp,
u8 *multiplier) u8 *multiplier)
{ {
u8 feature_index; u8 feature_index;
u8 feature_type;
int ret; int ret;
struct hidpp_report response; struct hidpp_report response;
ret = hidpp_root_get_feature(hidpp, HIDPP_PAGE_HIRES_WHEEL, ret = hidpp_root_get_feature(hidpp, HIDPP_PAGE_HIRES_WHEEL,
&feature_index, &feature_type); &feature_index);
if (ret) if (ret)
goto return_default; goto return_default;
@ -2076,13 +2055,12 @@ static int hidpp_hrw_set_wheel_mode(struct hidpp_device *hidpp, bool invert,
bool high_resolution, bool use_hidpp) bool high_resolution, bool use_hidpp)
{ {
u8 feature_index; u8 feature_index;
u8 feature_type;
int ret; int ret;
u8 params[1]; u8 params[1];
struct hidpp_report response; struct hidpp_report response;
ret = hidpp_root_get_feature(hidpp, HIDPP_PAGE_HIRES_WHEEL, ret = hidpp_root_get_feature(hidpp, HIDPP_PAGE_HIRES_WHEEL,
&feature_index, &feature_type); &feature_index);
if (ret) if (ret)
return ret; return ret;
@ -2111,14 +2089,12 @@ static int hidpp_solar_request_battery_event(struct hidpp_device *hidpp)
{ {
struct hidpp_report response; struct hidpp_report response;
u8 params[2] = { 1, 1 }; u8 params[2] = { 1, 1 };
u8 feature_type;
int ret; int ret;
if (hidpp->battery.feature_index == 0xff) { if (hidpp->battery.feature_index == 0xff) {
ret = hidpp_root_get_feature(hidpp, ret = hidpp_root_get_feature(hidpp,
HIDPP_PAGE_SOLAR_KEYBOARD, HIDPP_PAGE_SOLAR_KEYBOARD,
&hidpp->battery.solar_feature_index, &hidpp->battery.solar_feature_index);
&feature_type);
if (ret) if (ret)
return ret; return ret;
} }
@ -3098,11 +3074,10 @@ static int wtp_get_config(struct hidpp_device *hidpp)
{ {
struct wtp_data *wd = hidpp->private_data; struct wtp_data *wd = hidpp->private_data;
struct hidpp_touchpad_raw_info raw_info = {0}; struct hidpp_touchpad_raw_info raw_info = {0};
u8 feature_type;
int ret; int ret;
ret = hidpp_root_get_feature(hidpp, HIDPP_PAGE_TOUCHPAD_RAW_XY, ret = hidpp_root_get_feature(hidpp, HIDPP_PAGE_TOUCHPAD_RAW_XY,
&wd->mt_feature_index, &feature_type); &wd->mt_feature_index);
if (ret) if (ret)
/* means that the device is not powered up */ /* means that the device is not powered up */
return ret; return ret;
@ -3362,12 +3337,11 @@ static int k400_disable_tap_to_click(struct hidpp_device *hidpp)
struct k400_private_data *k400 = hidpp->private_data; struct k400_private_data *k400 = hidpp->private_data;
struct hidpp_touchpad_fw_items items = {}; struct hidpp_touchpad_fw_items items = {};
int ret; int ret;
u8 feature_type;
if (!k400->feature_index) { if (!k400->feature_index) {
ret = hidpp_root_get_feature(hidpp, ret = hidpp_root_get_feature(hidpp,
HIDPP_PAGE_TOUCHPAD_FW_ITEMS, HIDPP_PAGE_TOUCHPAD_FW_ITEMS,
&k400->feature_index, &feature_type); &k400->feature_index);
if (ret) if (ret)
/* means that the device is not powered up */ /* means that the device is not powered up */
return ret; return ret;
@ -3439,14 +3413,13 @@ static int g920_get_config(struct hidpp_device *hidpp,
struct hidpp_ff_private_data *data) struct hidpp_ff_private_data *data)
{ {
struct hidpp_report response; struct hidpp_report response;
u8 feature_type;
int ret; int ret;
memset(data, 0, sizeof(*data)); memset(data, 0, sizeof(*data));
/* Find feature and store for later use */ /* Find feature and store for later use */
ret = hidpp_root_get_feature(hidpp, HIDPP_PAGE_G920_FORCE_FEEDBACK, ret = hidpp_root_get_feature(hidpp, HIDPP_PAGE_G920_FORCE_FEEDBACK,
&data->feature_index, &feature_type); &data->feature_index);
if (ret) if (ret)
return ret; return ret;
@ -3735,17 +3708,16 @@ static int hidpp_initialize_hires_scroll(struct hidpp_device *hidpp)
if (hidpp->protocol_major >= 2) { if (hidpp->protocol_major >= 2) {
u8 feature_index; u8 feature_index;
u8 feature_type;
ret = hidpp_root_get_feature(hidpp, HIDPP_PAGE_HIRES_WHEEL, ret = hidpp_root_get_feature(hidpp, HIDPP_PAGE_HIRES_WHEEL,
&feature_index, &feature_type); &feature_index);
if (!ret) { if (!ret) {
hidpp->capabilities |= HIDPP_CAPABILITY_HIDPP20_HI_RES_WHEEL; hidpp->capabilities |= HIDPP_CAPABILITY_HIDPP20_HI_RES_WHEEL;
hid_dbg(hidpp->hid_dev, "Detected HID++ 2.0 hi-res scroll wheel\n"); hid_dbg(hidpp->hid_dev, "Detected HID++ 2.0 hi-res scroll wheel\n");
return 0; return 0;
} }
ret = hidpp_root_get_feature(hidpp, HIDPP_PAGE_HI_RESOLUTION_SCROLLING, ret = hidpp_root_get_feature(hidpp, HIDPP_PAGE_HI_RESOLUTION_SCROLLING,
&feature_index, &feature_type); &feature_index);
if (!ret) { if (!ret) {
hidpp->capabilities |= HIDPP_CAPABILITY_HIDPP20_HI_RES_SCROLL; hidpp->capabilities |= HIDPP_CAPABILITY_HIDPP20_HI_RES_SCROLL;
hid_dbg(hidpp->hid_dev, "Detected HID++ 2.0 hi-res scrolling\n"); hid_dbg(hidpp->hid_dev, "Detected HID++ 2.0 hi-res scrolling\n");