Commit 3bb446a3 authored by Heikki Krogerus's avatar Heikki Krogerus Committed by Greg Kroah-Hartman

platform: x86: intel_cht_int33fe: Register all connections at once

commit 140a4ec4 upstream.

We can register all device connection descriptors with a
single call to device_connections_add().
Acked-by: default avatarAndy Shevchenko <andy.shevchenko@gmail.com>
Acked-by: default avatarHans de Goede <hdegoede@redhat.com>
Tested-by: default avatarHans de Goede <hdegoede@redhat.com>
Signed-off-by: default avatarHeikki Krogerus <heikki.krogerus@linux.intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent e99d90ce
...@@ -34,7 +34,7 @@ struct cht_int33fe_data { ...@@ -34,7 +34,7 @@ struct cht_int33fe_data {
struct i2c_client *fusb302; struct i2c_client *fusb302;
struct i2c_client *pi3usb30532; struct i2c_client *pi3usb30532;
/* Contain a list-head must be per device */ /* Contain a list-head must be per device */
struct device_connection connections[3]; struct device_connection connections[4];
}; };
/* /*
...@@ -184,9 +184,7 @@ static int cht_int33fe_probe(struct i2c_client *client) ...@@ -184,9 +184,7 @@ static int cht_int33fe_probe(struct i2c_client *client)
data->connections[2].endpoint[1] = "intel_xhci_usb_sw-role-switch"; data->connections[2].endpoint[1] = "intel_xhci_usb_sw-role-switch";
data->connections[2].id = "usb-role-switch"; data->connections[2].id = "usb-role-switch";
device_connection_add(&data->connections[0]); device_connections_add(data->connections);
device_connection_add(&data->connections[1]);
device_connection_add(&data->connections[2]);
memset(&board_info, 0, sizeof(board_info)); memset(&board_info, 0, sizeof(board_info));
strlcpy(board_info.type, "typec_fusb302", I2C_NAME_SIZE); strlcpy(board_info.type, "typec_fusb302", I2C_NAME_SIZE);
...@@ -217,9 +215,7 @@ out_unregister_max17047: ...@@ -217,9 +215,7 @@ out_unregister_max17047:
if (data->max17047) if (data->max17047)
i2c_unregister_device(data->max17047); i2c_unregister_device(data->max17047);
device_connection_remove(&data->connections[2]); device_connections_remove(data->connections);
device_connection_remove(&data->connections[1]);
device_connection_remove(&data->connections[0]);
return -EPROBE_DEFER; /* Wait for the i2c-adapter to load */ return -EPROBE_DEFER; /* Wait for the i2c-adapter to load */
} }
...@@ -233,9 +229,7 @@ static int cht_int33fe_remove(struct i2c_client *i2c) ...@@ -233,9 +229,7 @@ static int cht_int33fe_remove(struct i2c_client *i2c)
if (data->max17047) if (data->max17047)
i2c_unregister_device(data->max17047); i2c_unregister_device(data->max17047);
device_connection_remove(&data->connections[2]); device_connections_remove(data->connections);
device_connection_remove(&data->connections[1]);
device_connection_remove(&data->connections[0]);
return 0; return 0;
} }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment