Commit e16e9f11 authored by Jiri Kosina's avatar Jiri Kosina
Browse files

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

- plethora of fixes for valid gcc warnings from Lee Jones
parents 6c905ab1 ff0e9ee3

drivers/hid/hid-alps.c

+1 −1
Original line number Diff line number Diff line
@@ -74,7 +74,7 @@ enum dev_num { 
	UNKNOWN,

};

/**

 * struct u1_data

 * struct alps_dev

 *

 * @input: pointer to the kernel input device

 * @input2: pointer to the kernel input2 device

drivers/hid/hid-core.c

+1 −1
Original line number Diff line number Diff line
@@ -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

 * @buf: buffer for scanning device ID data

 * @count: input size

drivers/hid/hid-kye.c

+1 −1
Original line number Diff line number Diff line
@@ -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

 *

drivers/hid/hid-logitech-hidpp.c

+4 −3
Original line number Diff line number Diff line
@@ -261,7 +261,7 @@ static int __hidpp_send_report(struct hid_device *hdev, 
	return ret == fields_count ? 0 : -1;

}



/**

/*

 * hidpp_send_message_sync() returns 0 in case of success, and something else

 * in case of a failure.

 * - 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, 
		(report->rap.sub_id == 0x41));

}



/**

/*

 * hidpp_prefix_name() prefixes the current given name with "Logitech ".

 */

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

 *                                        events given a high-resolution wheel

 *                                        movement.

 * @input_dev: Pointer to the input device

 * @counter: a hid_scroll_counter struct describing the wheel.

 * @hi_res_value: the movement of the wheel, in the mouse's high-resolution

 *                units.
@@ -1884,7 +1885,7 @@ struct hidpp_touchpad_fw_items { 
	uint8_t persistent;

};



/**

/*

 * send a set state command to the device by reading the current items->state

 * field. items is then filled with the current state.

 */

drivers/hid/hid-picolcd_core.c

+2 −3
Original line number Diff line number Diff line
@@ -329,7 +329,6 @@ static int picolcd_raw_event(struct hid_device *hdev, 
{

	struct picolcd_data *data = hid_get_drvdata(hdev);

	unsigned long flags;

	int ret = 0;



	if (!data)

		return 1;
@@ -342,9 +341,9 @@ static int picolcd_raw_event(struct hid_device *hdev, 


	if (report->id == REPORT_KEY_STATE) {

		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) {

		ret = picolcd_raw_cir(data, report, raw_data+1, size-1);

		picolcd_raw_cir(data, report, raw_data+1, size-1);

	} else {

		spin_lock_irqsave(&data->lock, flags);

		/*