Commit 060e4b06 authored by Jiri Kosina's avatar Jiri Kosina
Browse files

Merge branch 'for-6.2/i2c' into for-linus 

- conversion of I2C HID drivers to use new simplified I2C probing (Stephen Kitt)
parents 91e9b021 baf34f3b

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

+2 −3
Original line number Diff line number Diff line
@@ -68,8 +68,7 @@ static void elan_i2c_hid_power_down(struct i2chid_ops *ops) 
	regulator_disable(ihid_elan->vcc33);

}



static int i2c_hid_of_elan_probe(struct i2c_client *client,

				 const struct i2c_device_id *id)

static int i2c_hid_of_elan_probe(struct i2c_client *client)

{

	struct i2c_hid_of_elan *ihid_elan;
@@ -119,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		= i2c_hid_of_elan_probe,

	.probe_new	= i2c_hid_of_elan_probe,

	.remove		= i2c_hid_core_remove,

	.shutdown	= i2c_hid_core_shutdown,

};

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

+2 −3
Original line number Diff line number Diff line
@@ -87,8 +87,7 @@ static int ihid_goodix_vdd_notify(struct notifier_block *nb, 
	return ret;

}



static int i2c_hid_of_goodix_probe(struct i2c_client *client,

				   const struct i2c_device_id *id)

static int i2c_hid_of_goodix_probe(struct i2c_client *client)

{

	struct i2c_hid_of_goodix *ihid_goodix;

	int ret;
@@ -167,7 +166,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		= i2c_hid_of_goodix_probe,

	.probe_new	= i2c_hid_of_goodix_probe,

	.remove		= i2c_hid_core_remove,

	.shutdown	= i2c_hid_core_shutdown,

};

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

+2 −3
Original line number Diff line number Diff line
@@ -66,8 +66,7 @@ static void i2c_hid_of_power_down(struct i2chid_ops *ops) 
			       ihid_of->supplies);

}



static int i2c_hid_of_probe(struct i2c_client *client,

			    const struct i2c_device_id *dev_id)

static int i2c_hid_of_probe(struct i2c_client *client)

{

	struct device *dev = &client->dev;

	struct i2c_hid_of *ihid_of;
@@ -138,7 +137,7 @@ static struct i2c_driver i2c_hid_of_driver = { 
		.of_match_table = of_match_ptr(i2c_hid_of_match),

	},



	.probe		= i2c_hid_of_probe,

	.probe_new	= i2c_hid_of_probe,

	.remove		= i2c_hid_core_remove,

	.shutdown	= i2c_hid_core_shutdown,

	.id_table	= i2c_hid_of_id_table,