Commit 06db2af3 authored by Benjamin Tissoires's avatar Benjamin Tissoires
Browse files

Merge branch 'for-6.3/hid-core' into for-linus 

- constify hid_ll_driver (Thomas Weißschuh)
- map standard Battery System Charging to upower (José Expósito)
- couple of assorted fixes and new handling of HID usages (Jingyuan
  Liang & Ronald Tschalär)
parents 0b028189 3f16ba1c

drivers/hid/.kunitconfig

+1 −0
Original line number Diff line number Diff line 
CONFIG_KUNIT=y

CONFIG_USB=y

CONFIG_USB_HID=y

CONFIG_HID_BATTERY_STRENGTH=y

CONFIG_HID_UCLOGIC=y

CONFIG_HID_KUNIT_TEST=y

drivers/hid/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -1264,6 +1264,7 @@ config HID_MCP2221 
config HID_KUNIT_TEST

	tristate "KUnit tests for HID" if !KUNIT_ALL_TESTS

	depends on KUNIT=y

	depends on HID_BATTERY_STRENGTH

	depends on HID_UCLOGIC

	default KUNIT_ALL_TESTS

	help

drivers/hid/amd-sfh-hid/amd_sfh_hid.c

+1 −1
Original line number Diff line number Diff line
@@ -112,7 +112,7 @@ void amdtp_hid_wakeup(struct hid_device *hid) 
	}

}



static struct hid_ll_driver amdtp_hid_ll_driver = {

static const struct hid_ll_driver amdtp_hid_ll_driver = {

	.parse	=	amdtp_hid_parse,

	.start	=	amdtp_hid_start,

	.stop	=	amdtp_hid_stop,

drivers/hid/hid-core.c

+2 −10
Original line number Diff line number Diff line
@@ -41,11 +41,6 @@ 


#define DRIVER_DESC "HID core driver"



int hid_debug = 0;

module_param_named(debug, hid_debug, int, 0600);

MODULE_PARM_DESC(debug, "toggle HID debugging messages");

EXPORT_SYMBOL_GPL(hid_debug);



static int hid_ignore_special_drivers = 0;

module_param_named(ignore_special_drivers, hid_ignore_special_drivers, int, 0600);

MODULE_PARM_DESC(ignore_special_drivers, "Ignore any special drivers and handle all devices by generic driver");
@@ -804,7 +799,8 @@ static void hid_scan_collection(struct hid_parser *parser, unsigned type) 
	int i;



	if (((parser->global.usage_page << 16) == HID_UP_SENSOR) &&

	    type == HID_COLLECTION_PHYSICAL)

	    (type == HID_COLLECTION_PHYSICAL ||

	     type == HID_COLLECTION_APPLICATION))

		hid->group = HID_GROUP_SENSOR_HUB;



	if (hid->vendor == USB_VENDOR_ID_MICROSOFT &&
@@ -2912,10 +2908,6 @@ static int __init hid_init(void) 
{

	int ret;



	if (hid_debug)

		pr_warn("hid_debug is now used solely for parser and driver debugging.\n"

			"debugfs is now used for inspecting the device (report descriptor, reports)\n");



	ret = bus_register(&hid_bus_type);

	if (ret) {

		pr_err("can't register hid bus\n");

drivers/hid/hid-debug.c

+1 −0
Original line number Diff line number Diff line
@@ -975,6 +975,7 @@ static const char *keys[KEY_MAX + 1] = { 
	[KEY_CAMERA_ACCESS_DISABLE] = "CameraAccessDisable",

	[KEY_CAMERA_ACCESS_TOGGLE] = "CameraAccessToggle",

	[KEY_DICTATE] = "Dictate",

	[KEY_MICMUTE] = "MicrophoneMute",

	[KEY_BRIGHTNESS_MIN] = "BrightnessMin",

	[KEY_BRIGHTNESS_MAX] = "BrightnessMax",

	[KEY_BRIGHTNESS_AUTO] = "BrightnessAuto",