iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

usb: typec: mux: Drop support for device name matching

Browse Source 
There are no more users for the old device connection
descriptions that used device names.

Signed-off-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>
Link: https://lore.kernel.org/r/20200211112531.86510-7-heikki.krogerus@linux.intel.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Heikki Krogerus 2020-02-11 14:25:31 +03:00 committed by Greg Kroah-Hartman
parent bbe80c9a89
commit d80bdabea9
1 changed files with 4 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
drivers/usb/typec/mux.c
View File

@ -17,11 +17,6 @@
#include "bus.h" #include "bus.h"
static int name_match(struct device *dev, const void *name)
{
return !strcmp((const char *)name, dev_name(dev));
}
static bool dev_name_ends_with(struct device *dev, const char *suffix) static bool dev_name_ends_with(struct device *dev, const char *suffix)
{ {
const char *name = dev_name(dev); const char *name = dev_name(dev);
@ -44,16 +39,11 @@ static void *typec_switch_match(struct device_connection *con, int ep,
{ {
struct device *dev; struct device *dev;
if (con->fwnode) { if (con->id && !fwnode_property_present(con->fwnode, con->id))
if (con->id && !fwnode_property_present(con->fwnode, con->id)) return NULL;
return NULL;
dev = class_find_device(&typec_mux_class, NULL, con->fwnode, dev = class_find_device(&typec_mux_class, NULL, con->fwnode,
switch_fwnode_match); switch_fwnode_match);
} else {
dev = class_find_device(&typec_mux_class, NULL,
con->endpoint[ep], name_match);
}
return dev ? to_typec_switch(dev) : ERR_PTR(-EPROBE_DEFER); return dev ? to_typec_switch(dev) : ERR_PTR(-EPROBE_DEFER);
} }
@ -191,13 +181,6 @@ static void *typec_mux_match(struct device_connection *con, int ep, void *data)
u16 *val; u16 *val;
int i; int i;
if (!con->fwnode) {
dev = class_find_device(&typec_mux_class, NULL,
con->endpoint[ep], name_match);
return dev ? to_typec_switch(dev) : ERR_PTR(-EPROBE_DEFER);
}
/* /*
* Check has the identifier already been "consumed". If it * Check has the identifier already been "consumed". If it
* has, no need to do any extra connection identification. * has, no need to do any extra connection identification.