Gh0st
/
linux
mirror of https://github.com/torvalds/linux.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

usb: typec: class: Remove both cable_match() and partner_match() 

cable_match(), as matching function of device_find_child(), matches
a device with device type @typec_cable_dev_type, and its task can be
simplified by the recently introduced API device_match_type().

partner_match() is similar with cable_match() but with a different
device type @typec_partner_dev_type.

Remove both functions and use the API plus respective device type instead.

Signed-off-by: Zijun Hu <quic_zijuhu@quicinc.com>
Link: https://lore.kernel.org/r/20241224-const_dfc_done-v5-12-6623037414d4@quicinc.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Zijun Hu 2024-12-24 21:05:11 +08:00 committed by Greg Kroah-Hartman
parent 6a6fef929d
commit cf7da549cf
1 changed files with 12 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
drivers/usb/typec/class.c
View File

@ -1282,11 +1282,6 @@ const struct device_type typec_cable_dev_type = {
.release = typec_cable_release,
};
static int cable_match(struct device *dev, const void *data)
{
return is_typec_cable(dev);
}
/**
* typec_cable_get - Get a reference to the USB Type-C cable
* @port: The USB Type-C Port the cable is connected to
@ -1298,7 +1293,8 @@ struct typec_cable *typec_cable_get(struct typec_port *port)
{
struct device *dev;
dev = device_find_child(&port->dev, NULL, cable_match);
dev = device_find_child(&port->dev, &typec_cable_dev_type,
device_match_type);
if (!dev)
return NULL;
@ -2028,16 +2024,12 @@ const struct device_type typec_port_dev_type = {
/* --------------------------------------- */
/* Driver callbacks to report role updates */
static int partner_match(struct device *dev, const void *data)
{
return is_typec_partner(dev);
}
static struct typec_partner *typec_get_partner(struct typec_port *port)
{
struct device *dev;
dev = device_find_child(&port->dev, NULL, partner_match);
dev = device_find_child(&port->dev, &typec_partner_dev_type,
device_match_type);
if (!dev)
return NULL;
@ -2170,7 +2162,9 @@ void typec_set_pwr_opmode(struct typec_port *port,
sysfs_notify(&port->dev.kobj, NULL, "power_operation_mode");
kobject_uevent(&port->dev.kobj, KOBJ_CHANGE);
partner_dev = device_find_child(&port->dev, NULL, partner_match);
partner_dev = device_find_child(&port->dev,
&typec_partner_dev_type,
device_match_type);
if (partner_dev) {
struct typec_partner *partner = to_typec_partner(partner_dev);
@ -2334,7 +2328,9 @@ int typec_get_negotiated_svdm_version(struct typec_port *port)
enum usb_pd_svdm_ver svdm_version;
struct device *partner_dev;
partner_dev = device_find_child(&port->dev, NULL, partner_match);
partner_dev = device_find_child(&port->dev,
&typec_partner_dev_type,
device_match_type);
if (!partner_dev)
return -ENODEV;
@ -2361,7 +2357,8 @@ int typec_get_cable_svdm_version(struct typec_port *port)
enum usb_pd_svdm_ver svdm_version;
struct device *cable_dev;
cable_dev = device_find_child(&port->dev, NULL, cable_match);
cable_dev = device_find_child(&port->dev, &typec_cable_dev_type,
device_match_type);
if (!cable_dev)
return -ENODEV;