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

Merge branch 'for-6.5/i2c-hid' into for-linus

parents 278cc2f1 e4b88075

drivers/hid/i2c-hid/i2c-hid-acpi.c

+1 −1
Original line number Diff line number Diff line
@@ -118,7 +118,7 @@ static struct i2c_driver i2c_hid_acpi_driver = { 
		.acpi_match_table = i2c_hid_acpi_match,

	},



	.probe_new	= i2c_hid_acpi_probe,

	.probe		= i2c_hid_acpi_probe,

	.remove		= i2c_hid_core_remove,

	.shutdown	= i2c_hid_core_shutdown,

};

drivers/hid/i2c-hid/i2c-hid-of-elan.c

+1 −1
Original line number Diff line number Diff line
@@ -118,7 +118,7 @@ static struct i2c_driver elan_i2c_hid_ts_driver = { 
		.probe_type = PROBE_PREFER_ASYNCHRONOUS,

		.of_match_table = of_match_ptr(elan_i2c_hid_of_match),

	},

	.probe_new	= i2c_hid_of_elan_probe,

	.probe		= i2c_hid_of_elan_probe,

	.remove		= i2c_hid_core_remove,

	.shutdown	= i2c_hid_core_shutdown,

};

drivers/hid/i2c-hid/i2c-hid-of-goodix.c

+1 −1
Original line number Diff line number Diff line
@@ -128,7 +128,7 @@ static struct i2c_driver goodix_i2c_hid_ts_driver = { 
		.probe_type = PROBE_PREFER_ASYNCHRONOUS,

		.of_match_table = of_match_ptr(goodix_i2c_hid_of_match),

	},

	.probe_new	= i2c_hid_of_goodix_probe,

	.probe		= i2c_hid_of_goodix_probe,

	.remove		= i2c_hid_core_remove,

	.shutdown	= i2c_hid_core_shutdown,

};

drivers/hid/i2c-hid/i2c-hid-of.c

+1 −1
Original line number Diff line number Diff line
@@ -157,7 +157,7 @@ static struct i2c_driver i2c_hid_of_driver = { 
		.of_match_table = of_match_ptr(i2c_hid_of_match),

	},



	.probe_new	= i2c_hid_of_probe,

	.probe		= i2c_hid_of_probe,

	.remove		= i2c_hid_core_remove,

	.shutdown	= i2c_hid_core_shutdown,

	.id_table	= i2c_hid_of_id_table,