From: Heikki Krogerus <heikki.krogerus@linux.intel.com>
To: Guenter Roeck <linux@roeck-us.net>
Cc: linux-usb@vger.kernel.org
Subject: [PATCH v4 7/9] usb: typec: hd3ss3220: Start using struct typec_operations
Date: Fri, 11 Oct 2019 18:32:17 +0300 [thread overview]
Message-ID: <20191011153219.35701-8-heikki.krogerus@linux.intel.com> (raw)
In-Reply-To: <20191011153219.35701-1-heikki.krogerus@linux.intel.com>
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>
---
drivers/usb/typec/hd3ss3220.c | 24 +++++++++++++-----------
1 file changed, 13 insertions(+), 11 deletions(-)
diff --git a/drivers/usb/typec/hd3ss3220.c b/drivers/usb/typec/hd3ss3220.c
index 9715600aeb04..e8b4aa8f5922 100644
--- a/drivers/usb/typec/hd3ss3220.c
+++ b/drivers/usb/typec/hd3ss3220.c
@@ -37,7 +37,6 @@ struct hd3ss3220 {
struct regmap *regmap;
struct usb_role_switch *role_sw;
struct typec_port *port;
- struct typec_capability typec_cap;
};
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;
}
-static int hd3ss3220_dr_set(const struct typec_capability *cap,
- enum typec_data_role role)
+static int hd3ss3220_dr_set(struct typec_port *port, enum typec_data_role role)
{
- struct hd3ss3220 *hd3ss3220 = container_of(cap, struct hd3ss3220,
- typec_cap);
+ struct hd3ss3220 *hd3ss3220 = typec_get_drvdata(port);
enum usb_role role_val;
int pref, ret = 0;
@@ -98,6 +95,10 @@ static int hd3ss3220_dr_set(const struct typec_capability *cap,
return ret;
}
+static const struct typec_operations hd3ss3220_ops = {
+ .dr_set = hd3ss3220_dr_set
+};
+
static void hd3ss3220_set_role(struct hd3ss3220 *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,
const struct i2c_device_id *id)
{
+ struct typec_capability typec_cap = { };
struct hd3ss3220 *hd3ss3220;
struct fwnode_handle *connector;
int ret;
@@ -180,13 +182,13 @@ static int hd3ss3220_probe(struct i2c_client *client,
if (IS_ERR(hd3ss3220->role_sw))
return PTR_ERR(hd3ss3220->role_sw);
- hd3ss3220->typec_cap.prefer_role = TYPEC_NO_PREFERRED_ROLE;
- hd3ss3220->typec_cap.dr_set = hd3ss3220_dr_set;
- hd3ss3220->typec_cap.type = TYPEC_PORT_DRP;
- hd3ss3220->typec_cap.data = TYPEC_PORT_DRD;
+ typec_cap.prefer_role = TYPEC_NO_PREFERRED_ROLE;
+ typec_cap.driver_data = hd3ss3220;
+ typec_cap.type = TYPEC_PORT_DRP;
+ typec_cap.data = TYPEC_PORT_DRD;
+ typec_cap.ops = &hd3ss3220_ops;
- hd3ss3220->port = typec_register_port(&client->dev,
- &hd3ss3220->typec_cap);
+ hd3ss3220->port = typec_register_port(&client->dev, &typec_cap);
if (IS_ERR(hd3ss3220->port)) {
ret = PTR_ERR(hd3ss3220->port);
goto err_put_role;
--
2.23.0
next prev parent reply other threads:[~2019-10-11 15:32 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-11 15:32 [PATCH v4 0/9] usb: typec: Small API improvement Heikki Krogerus
2019-10-11 15:32 ` [PATCH v4 1/9] usb: typec: Copy everything from struct typec_capability during registration Heikki Krogerus
2019-10-11 17:01 ` Guenter Roeck
2019-10-11 15:32 ` [PATCH v4 2/9] usb: typec: Introduce typec_get_drvdata() Heikki Krogerus
2019-10-11 15:32 ` [PATCH v4 3/9] usb: typec: Separate the operations vector Heikki Krogerus
2019-10-11 15:32 ` [PATCH v4 4/9] usb: typec: tcpm: Start using struct typec_operations Heikki Krogerus
2019-10-11 15:32 ` [PATCH v4 5/9] usb: typec: tps6598x: " Heikki Krogerus
2019-10-11 15:32 ` [PATCH v4 6/9] usb: typec: ucsi: " Heikki Krogerus
2019-10-11 15:32 ` Heikki Krogerus [this message]
2019-10-11 15:32 ` [PATCH v4 8/9] usb: typec: Remove the callback members from struct typec_capability Heikki Krogerus
2019-10-11 15:32 ` [PATCH v4 9/9] usb: typec: Remove unused " Heikki Krogerus
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20191011153219.35701-8-heikki.krogerus@linux.intel.com \
--to=heikki.krogerus@linux.intel.com \
--cc=linux-usb@vger.kernel.org \
--cc=linux@roeck-us.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).