From: Heikki Krogerus <heikki.krogerus@linux.intel.com>
To: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Guenter Roeck <linux@roeck-us.net>, Ajay Gupta <ajayg@nvidia.com>,
linux-usb@vger.kernel.org
Subject: [PATCH v3 05/18] usb: typec: tps6598x: Start using struct typec_operations
Date: Fri, 25 Oct 2019 11:23:11 +0300 [thread overview]
Message-ID: <20191025082324.75731-6-heikki.krogerus@linux.intel.com> (raw)
In-Reply-To: <20191025082324.75731-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/tps6598x.c | 49 +++++++++++++++++++-----------------
1 file changed, 26 insertions(+), 23 deletions(-)
diff --git a/drivers/usb/typec/tps6598x.c b/drivers/usb/typec/tps6598x.c
index a38d1409f15b..0698addd1185 100644
--- a/drivers/usb/typec/tps6598x.c
+++ b/drivers/usb/typec/tps6598x.c
@@ -94,7 +94,6 @@ struct tps6598x {
struct typec_port *port;
struct typec_partner *partner;
struct usb_pd_identity partner_identity;
- struct typec_capability typec_cap;
};
/*
@@ -307,11 +306,10 @@ static int tps6598x_exec_cmd(struct tps6598x *tps, const char *cmd,
return 0;
}
-static int
-tps6598x_dr_set(const struct typec_capability *cap, enum typec_data_role role)
+static int tps6598x_dr_set(struct typec_port *port, enum typec_data_role role)
{
- struct tps6598x *tps = container_of(cap, struct tps6598x, typec_cap);
const char *cmd = (role == TYPEC_DEVICE) ? "SWUF" : "SWDF";
+ struct tps6598x *tps = typec_get_drvdata(port);
u32 status;
int ret;
@@ -338,11 +336,10 @@ tps6598x_dr_set(const struct typec_capability *cap, enum typec_data_role role)
return ret;
}
-static int
-tps6598x_pr_set(const struct typec_capability *cap, enum typec_role role)
+static int tps6598x_pr_set(struct typec_port *port, enum typec_role role)
{
- struct tps6598x *tps = container_of(cap, struct tps6598x, typec_cap);
const char *cmd = (role == TYPEC_SINK) ? "SWSk" : "SWSr";
+ struct tps6598x *tps = typec_get_drvdata(port);
u32 status;
int ret;
@@ -369,6 +366,11 @@ tps6598x_pr_set(const struct typec_capability *cap, enum typec_role role)
return ret;
}
+static const struct typec_operations tps6598x_ops = {
+ .dr_set = tps6598x_dr_set,
+ .pr_set = tps6598x_pr_set,
+};
+
static irqreturn_t tps6598x_interrupt(int irq, void *data)
{
struct tps6598x *tps = data;
@@ -448,6 +450,7 @@ static const struct regmap_config tps6598x_regmap_config = {
static int tps6598x_probe(struct i2c_client *client)
{
+ struct typec_capability typec_cap = { };
struct tps6598x *tps;
u32 status;
u32 conf;
@@ -492,40 +495,40 @@ static int tps6598x_probe(struct i2c_client *client)
if (ret < 0)
return ret;
- tps->typec_cap.revision = USB_TYPEC_REV_1_2;
- tps->typec_cap.pd_revision = 0x200;
- tps->typec_cap.prefer_role = TYPEC_NO_PREFERRED_ROLE;
- tps->typec_cap.pr_set = tps6598x_pr_set;
- tps->typec_cap.dr_set = tps6598x_dr_set;
+ typec_cap.revision = USB_TYPEC_REV_1_2;
+ typec_cap.pd_revision = 0x200;
+ typec_cap.prefer_role = TYPEC_NO_PREFERRED_ROLE;
+ typec_cap.driver_data = tps;
+ typec_cap.ops = &tps6598x_ops;
switch (TPS_SYSCONF_PORTINFO(conf)) {
case TPS_PORTINFO_SINK_ACCESSORY:
case TPS_PORTINFO_SINK:
- tps->typec_cap.type = TYPEC_PORT_SNK;
- tps->typec_cap.data = TYPEC_PORT_UFP;
+ typec_cap.type = TYPEC_PORT_SNK;
+ typec_cap.data = TYPEC_PORT_UFP;
break;
case TPS_PORTINFO_DRP_UFP_DRD:
case TPS_PORTINFO_DRP_DFP_DRD:
- tps->typec_cap.type = TYPEC_PORT_DRP;
- tps->typec_cap.data = TYPEC_PORT_DRD;
+ typec_cap.type = TYPEC_PORT_DRP;
+ typec_cap.data = TYPEC_PORT_DRD;
break;
case TPS_PORTINFO_DRP_UFP:
- tps->typec_cap.type = TYPEC_PORT_DRP;
- tps->typec_cap.data = TYPEC_PORT_UFP;
+ typec_cap.type = TYPEC_PORT_DRP;
+ typec_cap.data = TYPEC_PORT_UFP;
break;
case TPS_PORTINFO_DRP_DFP:
- tps->typec_cap.type = TYPEC_PORT_DRP;
- tps->typec_cap.data = TYPEC_PORT_DFP;
+ typec_cap.type = TYPEC_PORT_DRP;
+ typec_cap.data = TYPEC_PORT_DFP;
break;
case TPS_PORTINFO_SOURCE:
- tps->typec_cap.type = TYPEC_PORT_SRC;
- tps->typec_cap.data = TYPEC_PORT_DFP;
+ typec_cap.type = TYPEC_PORT_SRC;
+ typec_cap.data = TYPEC_PORT_DFP;
break;
default:
return -ENODEV;
}
- tps->port = typec_register_port(&client->dev, &tps->typec_cap);
+ tps->port = typec_register_port(&client->dev, &typec_cap);
if (IS_ERR(tps->port))
return PTR_ERR(tps->port);
--
2.23.0
next prev parent reply other threads:[~2019-10-25 8:23 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-25 8:23 [PATCH v3 00/18] usb: typec: API improvements Heikki Krogerus
2019-10-25 8:23 ` [PATCH v3 01/18] usb: typec: Copy everything from struct typec_capability during registration Heikki Krogerus
2019-10-25 8:23 ` [PATCH v3 02/18] usb: typec: Introduce typec_get_drvdata() Heikki Krogerus
2019-10-25 8:23 ` [PATCH v3 03/18] usb: typec: Separate the operations vector Heikki Krogerus
2019-10-25 8:23 ` [PATCH v3 04/18] usb: typec: tcpm: Start using struct typec_operations Heikki Krogerus
2019-10-25 8:23 ` Heikki Krogerus [this message]
2019-10-25 8:23 ` [PATCH v3 06/18] usb: typec: ucsi: " Heikki Krogerus
2019-10-25 8:23 ` [PATCH v3 07/18] usb: typec: hd3ss3220: " Heikki Krogerus
2019-10-25 8:23 ` [PATCH v3 08/18] usb: typec: Remove the callback members from struct typec_capability Heikki Krogerus
2019-10-25 8:23 ` [PATCH v3 09/18] usb: typec: Remove unused " Heikki Krogerus
2019-10-25 8:23 ` [PATCH v3 10/18] usb: typec: hd3ss3220: Give the connector fwnode to the port device Heikki Krogerus
2019-11-02 16:11 ` Guenter Roeck
2019-11-04 7:50 ` Biju Das
2019-10-25 8:23 ` [PATCH v3 11/18] usb: typec: ucsi: Simplified registration and I/O API Heikki Krogerus
2019-11-02 16:21 ` Guenter Roeck
2019-10-25 8:23 ` [PATCH v3 12/18] usb: typec: ucsi: acpi: Move to the new API Heikki Krogerus
2019-11-02 16:31 ` Guenter Roeck
2019-11-04 9:07 ` Heikki Krogerus
2019-10-25 8:23 ` [PATCH v3 13/18] usb: typec: ucsi: ccg: " Heikki Krogerus
2019-11-02 16:34 ` Guenter Roeck
2019-11-04 8:45 ` Heikki Krogerus
2019-10-25 8:23 ` [PATCH v3 14/18] usb: typec: ucsi: Remove the old API Heikki Krogerus
2019-10-25 8:23 ` [PATCH v3 15/18] usb: typec: ucsi: Remove struct ucsi_control Heikki Krogerus
2019-11-02 17:00 ` Guenter Roeck
2019-10-25 8:23 ` [PATCH v3 16/18] usb: typec: ucsi: Remove all bit-fields Heikki Krogerus
2019-10-25 8:23 ` [PATCH v3 17/18] usb: typec: ucsi: New error codes Heikki Krogerus
2019-10-25 8:23 ` [PATCH v3 18/18] usb: typec: ucsi: Optimise ucsi_unregister() 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=20191025082324.75731-6-heikki.krogerus@linux.intel.com \
--to=heikki.krogerus@linux.intel.com \
--cc=ajayg@nvidia.com \
--cc=gregkh@linuxfoundation.org \
--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).