Browse Source

Merge branch 'i2c-mux/for-next' of https://github.com/peda-r/i2c-mux into i2c/for-4.20-fixed

Wolfram Sang 6 years ago
parent
commit
a560ae55dc

+ 1 - 1
drivers/i2c/muxes/i2c-mux-ltc4306.c

@@ -208,7 +208,7 @@ MODULE_DEVICE_TABLE(of, ltc4306_of_match);
 
 
 static int ltc4306_probe(struct i2c_client *client)
 static int ltc4306_probe(struct i2c_client *client)
 {
 {
-	struct i2c_adapter *adap = to_i2c_adapter(client->dev.parent);
+	struct i2c_adapter *adap = client->adapter;
 	const struct chip_desc *chip;
 	const struct chip_desc *chip;
 	struct i2c_mux_core *muxc;
 	struct i2c_mux_core *muxc;
 	struct ltc4306 *data;
 	struct ltc4306 *data;

+ 1 - 1
drivers/i2c/muxes/i2c-mux-mlxcpld.c

@@ -132,7 +132,7 @@ static int mlxcpld_mux_deselect(struct i2c_mux_core *muxc, u32 chan)
 static int mlxcpld_mux_probe(struct i2c_client *client,
 static int mlxcpld_mux_probe(struct i2c_client *client,
 			     const struct i2c_device_id *id)
 			     const struct i2c_device_id *id)
 {
 {
-	struct i2c_adapter *adap = to_i2c_adapter(client->dev.parent);
+	struct i2c_adapter *adap = client->adapter;
 	struct mlxcpld_mux_plat_data *pdata = dev_get_platdata(&client->dev);
 	struct mlxcpld_mux_plat_data *pdata = dev_get_platdata(&client->dev);
 	struct i2c_mux_core *muxc;
 	struct i2c_mux_core *muxc;
 	int num, force;
 	int num, force;

+ 1 - 1
drivers/i2c/muxes/i2c-mux-pca954x.c

@@ -347,7 +347,7 @@ static void pca954x_cleanup(struct i2c_mux_core *muxc)
 static int pca954x_probe(struct i2c_client *client,
 static int pca954x_probe(struct i2c_client *client,
 			 const struct i2c_device_id *id)
 			 const struct i2c_device_id *id)
 {
 {
-	struct i2c_adapter *adap = to_i2c_adapter(client->dev.parent);
+	struct i2c_adapter *adap = client->adapter;
 	struct pca954x_platform_data *pdata = dev_get_platdata(&client->dev);
 	struct pca954x_platform_data *pdata = dev_get_platdata(&client->dev);
 	struct device *dev = &client->dev;
 	struct device *dev = &client->dev;
 	struct device_node *np = dev->of_node;
 	struct device_node *np = dev->of_node;