openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

usb: typec: hd3ss3220: Start using struct typec_operations 

Supplying the operation callbacks as part of a struct
typec_operations instead of as part of struct
typec_capability during port registration. After this there
is not need to keep the capabilities stored anywhere in the
driver.

Signed-off-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>
Reviewed-by: Guenter Roeck <linux@roeck-us.net>
Link: https://lore.kernel.org/r/20191104142435.29960-8-heikki.krogerus@linux.intel.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Heikki Krogerus 2019-11-04 17:24:24 +03:00 committed by Greg Kroah-Hartman
parent 6df475f804
commit 642b1017dc
1 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
drivers/usb/typec/hd3ss3220.c
View File

@ -37,7 +37,6 @@ struct hd3ss3220 {
struct regmap *regmap; struct regmap *regmap;
struct usb_role_switch *role_sw; struct usb_role_switch *role_sw;
struct typec_port *port; struct typec_port *port;
struct typec_capability typec_cap;
}; };
static int hd3ss3220_set_source_pref(struct hd3ss3220 *hd3ss3220, int src_pref) static int hd3ss3220_set_source_pref(struct hd3ss3220 *hd3ss3220, int src_pref)
@ -73,11 +72,9 @@ static enum usb_role hd3ss3220_get_attached_state(struct hd3ss3220 *hd3ss3220)
return attached_state; return attached_state;
} }
static int hd3ss3220_dr_set(const struct typec_capability *cap, static int hd3ss3220_dr_set(struct typec_port *port, enum typec_data_role role)
enum typec_data_role role)
{ {
struct hd3ss3220 *hd3ss3220 = container_of(cap, struct hd3ss3220, struct hd3ss3220 *hd3ss3220 = typec_get_drvdata(port);
typec_cap);
enum usb_role role_val; enum usb_role role_val;
int pref, ret = 0; int pref, ret = 0;
@ -98,6 +95,10 @@ static int hd3ss3220_dr_set(const struct typec_capability *cap,
return ret; return ret;
} }
static const struct typec_operations hd3ss3220_ops = {
.dr_set = hd3ss3220_dr_set
};
static void hd3ss3220_set_role(struct hd3ss3220 *hd3ss3220) static void hd3ss3220_set_role(struct hd3ss3220 *hd3ss3220)
{ {
enum usb_role role_state = hd3ss3220_get_attached_state(hd3ss3220); enum usb_role role_state = hd3ss3220_get_attached_state(hd3ss3220);
@ -152,6 +153,7 @@ static const struct regmap_config config = {
static int hd3ss3220_probe(struct i2c_client *client, static int hd3ss3220_probe(struct i2c_client *client,
const struct i2c_device_id *id) const struct i2c_device_id *id)
{ {
struct typec_capability typec_cap = { };
struct hd3ss3220 *hd3ss3220; struct hd3ss3220 *hd3ss3220;
struct fwnode_handle *connector; struct fwnode_handle *connector;
int ret; int ret;
@ -180,13 +182,13 @@ static int hd3ss3220_probe(struct i2c_client *client,
if (IS_ERR(hd3ss3220->role_sw)) if (IS_ERR(hd3ss3220->role_sw))
return PTR_ERR(hd3ss3220->role_sw); return PTR_ERR(hd3ss3220->role_sw);
hd3ss3220->typec_cap.prefer_role = TYPEC_NO_PREFERRED_ROLE; typec_cap.prefer_role = TYPEC_NO_PREFERRED_ROLE;
hd3ss3220->typec_cap.dr_set = hd3ss3220_dr_set; typec_cap.driver_data = hd3ss3220;
hd3ss3220->typec_cap.type = TYPEC_PORT_DRP; typec_cap.type = TYPEC_PORT_DRP;
hd3ss3220->typec_cap.data = TYPEC_PORT_DRD; typec_cap.data = TYPEC_PORT_DRD;
typec_cap.ops = &hd3ss3220_ops;
hd3ss3220->port = typec_register_port(&client->dev, hd3ss3220->port = typec_register_port(&client->dev, &typec_cap);
&hd3ss3220->typec_cap);
if (IS_ERR(hd3ss3220->port)) { if (IS_ERR(hd3ss3220->port)) {
ret = PTR_ERR(hd3ss3220->port); ret = PTR_ERR(hd3ss3220->port);
goto err_put_role; goto err_put_role;