Skip to content

Commit

Permalink
usb: typec: retimer: Use device type for matching
Browse files Browse the repository at this point in the history
Device name is not reliable so using the type instead in
retimer_fwnode_match().

This will also introduce is_typec_retimer() helper, and
remove the static keyword from the retimer device type. That
will make it accessible also in the main typec class.

Signed-off-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>
Link: https://lore.kernel.org/r/20221019145552.32493-1-heikki.krogerus@linux.intel.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
Heikki Krogerus authored and Greg Kroah-Hartman committed Oct 22, 2022
1 parent d182bf1 commit a84436a
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 14 deletions.
16 changes: 2 additions & 14 deletions drivers/usb/typec/retimer.c
Original file line number Diff line number Diff line change
Expand Up @@ -17,21 +17,9 @@
#include "class.h"
#include "retimer.h"

static bool dev_name_ends_with(struct device *dev, const char *suffix)
{
const char *name = dev_name(dev);
const int name_len = strlen(name);
const int suffix_len = strlen(suffix);

if (suffix_len > name_len)
return false;

return strcmp(name + (name_len - suffix_len), suffix) == 0;
}

static int retimer_fwnode_match(struct device *dev, const void *fwnode)
{
return device_match_fwnode(dev, fwnode) && dev_name_ends_with(dev, "-retimer");
return is_typec_retimer(dev) && device_match_fwnode(dev, fwnode);
}

static void *typec_retimer_match(struct fwnode_handle *fwnode, const char *id, void *data)
Expand Down Expand Up @@ -97,7 +85,7 @@ static void typec_retimer_release(struct device *dev)
kfree(to_typec_retimer(dev));
}

static const struct device_type typec_retimer_dev_type = {
const struct device_type typec_retimer_dev_type = {
.name = "typec_retimer",
.release = typec_retimer_release,
};
Expand Down
4 changes: 4 additions & 0 deletions drivers/usb/typec/retimer.h
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,8 @@ struct typec_retimer {

#define to_typec_retimer(_dev_) container_of(_dev_, struct typec_retimer, dev)

const struct device_type typec_retimer_dev_type;

#define is_typec_retimer(dev) ((dev)->type == &typec_retimer_dev_type)

#endif /* __USB_TYPEC_RETIMER__ */

0 comments on commit a84436a

Please sign in to comment.