Commit e16e9f11 authored by Jiri Kosina's avatar Jiri Kosina

Merge branch 'for-5.13/warnings' into for-linus

- plethora of fixes for valid gcc warnings from Lee Jones
parents 6c905ab1 ff0e9ee3
...@@ -74,7 +74,7 @@ enum dev_num { ...@@ -74,7 +74,7 @@ enum dev_num {
UNKNOWN, UNKNOWN,
}; };
/** /**
* struct u1_data * struct alps_dev
* *
* @input: pointer to the kernel input device * @input: pointer to the kernel input device
* @input2: pointer to the kernel input2 device * @input2: pointer to the kernel input2 device
......
...@@ -2129,7 +2129,7 @@ struct hid_dynid { ...@@ -2129,7 +2129,7 @@ struct hid_dynid {
}; };
/** /**
* store_new_id - add a new HID device ID to this driver and re-probe devices * new_id_store - add a new HID device ID to this driver and re-probe devices
* @drv: target device driver * @drv: target device driver
* @buf: buffer for scanning device ID data * @buf: buffer for scanning device ID data
* @count: input size * @count: input size
......
...@@ -655,7 +655,7 @@ static __u8 *kye_report_fixup(struct hid_device *hdev, __u8 *rdesc, ...@@ -655,7 +655,7 @@ static __u8 *kye_report_fixup(struct hid_device *hdev, __u8 *rdesc,
} }
/** /**
* Enable fully-functional tablet mode by setting a special feature report. * kye_tablet_enable() - Enable fully-functional tablet mode by setting a special feature report.
* *
* @hdev: HID device * @hdev: HID device
* *
......
...@@ -261,7 +261,7 @@ static int __hidpp_send_report(struct hid_device *hdev, ...@@ -261,7 +261,7 @@ static int __hidpp_send_report(struct hid_device *hdev,
return ret == fields_count ? 0 : -1; return ret == fields_count ? 0 : -1;
} }
/** /*
* hidpp_send_message_sync() returns 0 in case of success, and something else * hidpp_send_message_sync() returns 0 in case of success, and something else
* in case of a failure. * in case of a failure.
* - If ' something else' is positive, that means that an error has been raised * - If ' something else' is positive, that means that an error has been raised
...@@ -423,7 +423,7 @@ static inline bool hidpp_report_is_connect_event(struct hidpp_device *hidpp, ...@@ -423,7 +423,7 @@ static inline bool hidpp_report_is_connect_event(struct hidpp_device *hidpp,
(report->rap.sub_id == 0x41)); (report->rap.sub_id == 0x41));
} }
/** /*
* hidpp_prefix_name() prefixes the current given name with "Logitech ". * hidpp_prefix_name() prefixes the current given name with "Logitech ".
*/ */
static void hidpp_prefix_name(char **name, int name_length) static void hidpp_prefix_name(char **name, int name_length)
...@@ -454,6 +454,7 @@ static void hidpp_prefix_name(char **name, int name_length) ...@@ -454,6 +454,7 @@ static void hidpp_prefix_name(char **name, int name_length)
* hidpp_scroll_counter_handle_scroll() - Send high- and low-resolution scroll * hidpp_scroll_counter_handle_scroll() - Send high- and low-resolution scroll
* events given a high-resolution wheel * events given a high-resolution wheel
* movement. * movement.
* @input_dev: Pointer to the input device
* @counter: a hid_scroll_counter struct describing the wheel. * @counter: a hid_scroll_counter struct describing the wheel.
* @hi_res_value: the movement of the wheel, in the mouse's high-resolution * @hi_res_value: the movement of the wheel, in the mouse's high-resolution
* units. * units.
...@@ -1884,7 +1885,7 @@ struct hidpp_touchpad_fw_items { ...@@ -1884,7 +1885,7 @@ struct hidpp_touchpad_fw_items {
uint8_t persistent; uint8_t persistent;
}; };
/** /*
* send a set state command to the device by reading the current items->state * send a set state command to the device by reading the current items->state
* field. items is then filled with the current state. * field. items is then filled with the current state.
*/ */
......
...@@ -329,7 +329,6 @@ static int picolcd_raw_event(struct hid_device *hdev, ...@@ -329,7 +329,6 @@ static int picolcd_raw_event(struct hid_device *hdev,
{ {
struct picolcd_data *data = hid_get_drvdata(hdev); struct picolcd_data *data = hid_get_drvdata(hdev);
unsigned long flags; unsigned long flags;
int ret = 0;
if (!data) if (!data)
return 1; return 1;
...@@ -342,9 +341,9 @@ static int picolcd_raw_event(struct hid_device *hdev, ...@@ -342,9 +341,9 @@ static int picolcd_raw_event(struct hid_device *hdev,
if (report->id == REPORT_KEY_STATE) { if (report->id == REPORT_KEY_STATE) {
if (data->input_keys) if (data->input_keys)
ret = picolcd_raw_keypad(data, report, raw_data+1, size-1); picolcd_raw_keypad(data, report, raw_data+1, size-1);
} else if (report->id == REPORT_IR_DATA) { } else if (report->id == REPORT_IR_DATA) {
ret = picolcd_raw_cir(data, report, raw_data+1, size-1); picolcd_raw_cir(data, report, raw_data+1, size-1);
} else { } else {
spin_lock_irqsave(&data->lock, flags); spin_lock_irqsave(&data->lock, flags);
/* /*
......
...@@ -397,14 +397,13 @@ static ssize_t store_value(struct device *dev, struct device_attribute *attr, ...@@ -397,14 +397,13 @@ static ssize_t store_value(struct device *dev, struct device_attribute *attr,
if (!strncmp(name, "value", strlen("value"))) { if (!strncmp(name, "value", strlen("value"))) {
u32 report_id; u32 report_id;
int ret;
if (kstrtoint(buf, 0, &value) != 0) if (kstrtoint(buf, 0, &value) != 0)
return -EINVAL; return -EINVAL;
report_id = sensor_inst->fields[field_index].attribute. report_id = sensor_inst->fields[field_index].attribute.
report_id; report_id;
ret = sensor_hub_set_feature(sensor_inst->hsdev, report_id, sensor_hub_set_feature(sensor_inst->hsdev, report_id,
index, sizeof(value), &value); index, sizeof(value), &value);
} else } else
return -EINVAL; return -EINVAL;
......
...@@ -18,7 +18,6 @@ ...@@ -18,7 +18,6 @@
/** /**
* struct sensor_hub_data - Hold a instance data for a HID hub device * struct sensor_hub_data - Hold a instance data for a HID hub device
* @hsdev: Stored hid instance for current hub device.
* @mutex: Mutex to serialize synchronous request. * @mutex: Mutex to serialize synchronous request.
* @lock: Spin lock to protect pending request structure. * @lock: Spin lock to protect pending request structure.
* @dyn_callback_list: Holds callback function * @dyn_callback_list: Holds callback function
...@@ -34,7 +33,6 @@ struct sensor_hub_data { ...@@ -34,7 +33,6 @@ struct sensor_hub_data {
spinlock_t dyn_callback_lock; spinlock_t dyn_callback_lock;
struct mfd_cell *hid_sensor_hub_client_devs; struct mfd_cell *hid_sensor_hub_client_devs;
int hid_sensor_client_cnt; int hid_sensor_client_cnt;
unsigned long quirks;
int ref_cnt; int ref_cnt;
}; };
...@@ -42,6 +40,7 @@ struct sensor_hub_data { ...@@ -42,6 +40,7 @@ struct sensor_hub_data {
* struct hid_sensor_hub_callbacks_list - Stores callback list * struct hid_sensor_hub_callbacks_list - Stores callback list
* @list: list head. * @list: list head.
* @usage_id: usage id for a physical device. * @usage_id: usage id for a physical device.
* @hsdev: Stored hid instance for current hub device.
* @usage_callback: Stores registered callback functions. * @usage_callback: Stores registered callback functions.
* @priv: Private data for a physical device. * @priv: Private data for a physical device.
*/ */
...@@ -615,7 +614,6 @@ static int sensor_hub_probe(struct hid_device *hdev, ...@@ -615,7 +614,6 @@ static int sensor_hub_probe(struct hid_device *hdev,
} }
hid_set_drvdata(hdev, sd); hid_set_drvdata(hdev, sd);
sd->quirks = id->driver_data;
spin_lock_init(&sd->lock); spin_lock_init(&sd->lock);
spin_lock_init(&sd->dyn_callback_lock); spin_lock_init(&sd->dyn_callback_lock);
......
...@@ -21,7 +21,8 @@ ...@@ -21,7 +21,8 @@
#include <asm/unaligned.h> #include <asm/unaligned.h>
/** /**
* Convert a pen in-range reporting type to a string. * uclogic_params_pen_inrange_to_str() - Convert a pen in-range reporting type
* to a string.
* *
* @inrange: The in-range reporting type to convert. * @inrange: The in-range reporting type to convert.
* *
...@@ -516,7 +517,8 @@ void uclogic_params_cleanup(struct uclogic_params *params) ...@@ -516,7 +517,8 @@ void uclogic_params_cleanup(struct uclogic_params *params)
} }
/** /**
* Get a replacement report descriptor for a tablet's interface. * uclogic_params_get_desc() - Get a replacement report descriptor for a
* tablet's interface.
* *
* @params: The parameters of a tablet interface to get report * @params: The parameters of a tablet interface to get report
* descriptor for. Cannot be NULL. * descriptor for. Cannot be NULL.
...@@ -689,7 +691,7 @@ static void uclogic_params_init_with_pen_unused(struct uclogic_params *params) ...@@ -689,7 +691,7 @@ static void uclogic_params_init_with_pen_unused(struct uclogic_params *params)
} }
/** /**
* uclogic_params_init() - initialize a Huion tablet interface and discover * uclogic_params_huion_init() - initialize a Huion tablet interface and discover
* its parameters. * its parameters.
* *
* @params: Parameters to fill in (to be cleaned with * @params: Parameters to fill in (to be cleaned with
......
...@@ -641,7 +641,7 @@ const __u8 uclogic_rdesc_pen_v2_template_arr[] = { ...@@ -641,7 +641,7 @@ const __u8 uclogic_rdesc_pen_v2_template_arr[] = {
const size_t uclogic_rdesc_pen_v2_template_size = const size_t uclogic_rdesc_pen_v2_template_size =
sizeof(uclogic_rdesc_pen_v2_template_arr); sizeof(uclogic_rdesc_pen_v2_template_arr);
/** /*
* Expand to the contents of a generic buttonpad report descriptor. * Expand to the contents of a generic buttonpad report descriptor.
* *
* @_padding: Padding from the end of button bits at bit 44, until * @_padding: Padding from the end of button bits at bit 44, until
......
...@@ -505,7 +505,7 @@ static void pidff_playback_pid(struct pidff_device *pidff, int pid_id, int n) ...@@ -505,7 +505,7 @@ static void pidff_playback_pid(struct pidff_device *pidff, int pid_id, int n)
HID_REQ_SET_REPORT); HID_REQ_SET_REPORT);
} }
/** /*
* Play the effect with effect id @effect_id for @value times * Play the effect with effect id @effect_id for @value times
*/ */
static int pidff_playback(struct input_dev *dev, int effect_id, int value) static int pidff_playback(struct input_dev *dev, int effect_id, int value)
...@@ -997,7 +997,7 @@ static int pidff_find_special_fields(struct pidff_device *pidff) ...@@ -997,7 +997,7 @@ static int pidff_find_special_fields(struct pidff_device *pidff)
return 0; return 0;
} }
/** /*
* Find the implemented effect types * Find the implemented effect types
*/ */
static int pidff_find_effects(struct pidff_device *pidff, static int pidff_find_effects(struct pidff_device *pidff,
......
...@@ -63,7 +63,7 @@ static const unsigned char usb_kbd_keycode[256] = { ...@@ -63,7 +63,7 @@ static const unsigned char usb_kbd_keycode[256] = {
* new key is pressed or a key that was pressed is released. * new key is pressed or a key that was pressed is released.
* @led: URB for sending LEDs (e.g. numlock, ...) * @led: URB for sending LEDs (e.g. numlock, ...)
* @newleds: data that will be sent with the @led URB representing which LEDs * @newleds: data that will be sent with the @led URB representing which LEDs
should be on * should be on
* @name: Name of the keyboard. @dev's name field points to this buffer * @name: Name of the keyboard. @dev's name field points to this buffer
* @phys: Physical path of the keyboard. @dev's phys field points to this * @phys: Physical path of the keyboard. @dev's phys field points to this
* buffer * buffer
......
...@@ -1495,7 +1495,7 @@ struct wacom_led *wacom_led_find(struct wacom *wacom, unsigned int group_id, ...@@ -1495,7 +1495,7 @@ struct wacom_led *wacom_led_find(struct wacom *wacom, unsigned int group_id,
return &group->leds[id]; return &group->leds[id];
} }
/** /*
* wacom_led_next: gives the next available led with a wacom trigger. * wacom_led_next: gives the next available led with a wacom trigger.
* *
* returns the next available struct wacom_led which has its default trigger * returns the next available struct wacom_led which has its default trigger
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment