Commit d80bdabe authored by Heikki Krogerus's avatar Heikki Krogerus Committed by Greg Kroah-Hartman
Browse files

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



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

Signed-off-by: default avatarHeikki Krogerus <heikki.krogerus@linux.intel.com>
Link: https://lore.kernel.org/r/20200211112531.86510-7-heikki.krogerus@linux.intel.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent bbe80c9a

drivers/usb/typec/mux.c

+4 −21
Original line number Diff line number Diff line
@@ -17,11 +17,6 @@ 


#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)

{

	const char *name = dev_name(dev);
@@ -44,16 +39,11 @@ static void *typec_switch_match(struct device_connection *con, int ep, 
{

	struct device *dev;



	if (con->fwnode) {

	if (con->id && !fwnode_property_present(con->fwnode, con->id))

		return NULL;



	dev = class_find_device(&typec_mux_class, NULL, con->fwnode,

				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);

}
@@ -191,13 +181,6 @@ static void *typec_mux_match(struct device_connection *con, int ep, void *data) 
	u16 *val;

	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

	 * has, no need to do any extra connection identification.

CRA Git | Maintained and supported by SUSTech CRA and CCSE