2021-06-10 00:25:10

by Bjorn Andersson

Subject: [PATCH v2] usb: typec: mux: Fix copy-paste mistake in typec_mux_match

Fix the copy-paste mistake in the return path of typec_mux_match(),
where dev is considered a member of struct typec_switch rather than
struct typec_mux.

The two structs are identical in regards to having the struct device as
the first entry, so this provides no functional change.

Fixes: 3370db35193b ("usb: typec: Registering real device entries for the muxes")
Signed-off-by: Bjorn Andersson <[email protected]>
---

Changes since v1:
- Don't touch the typec_switch part of mux.c...

drivers/usb/typec/mux.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/usb/typec/mux.c b/drivers/usb/typec/mux.c
index 664fb3513f48..c8340de0ed49 100644
--- a/drivers/usb/typec/mux.c
+++ b/drivers/usb/typec/mux.c
@@ -246,7 +246,7 @@ static void *typec_mux_match(struct fwnode_handle *fwnode, const char *id,
dev = class_find_device(&typec_mux_class, NULL, fwnode,
mux_fwnode_match);

- return dev ? to_typec_switch(dev) : ERR_PTR(-EPROBE_DEFER);
+ return dev ? to_typec_mux(dev) : ERR_PTR(-EPROBE_DEFER);
}

/**
--
2.29.2

2021-06-10 12:35:01

by Heikki Krogerus

Subject: Re: [PATCH v2] usb: typec: mux: Fix copy-paste mistake in typec_mux_match

On Wed, Jun 09, 2021 at 05:21:32PM -0700, Bjorn Andersson wrote:
> Fix the copy-paste mistake in the return path of typec_mux_match(),
> where dev is considered a member of struct typec_switch rather than
> struct typec_mux.
>
> The two structs are identical in regards to having the struct device as
> the first entry, so this provides no functional change.
>
> Fixes: 3370db35193b ("usb: typec: Registering real device entries for the muxes")
> Signed-off-by: Bjorn Andersson <[email protected]>

Reviewed-by: Heikki Krogerus <[email protected]>

> ---
>
> Changes since v1:
> - Don't touch the typec_switch part of mux.c...
>
> drivers/usb/typec/mux.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/usb/typec/mux.c b/drivers/usb/typec/mux.c
> index 664fb3513f48..c8340de0ed49 100644
> --- a/drivers/usb/typec/mux.c
> +++ b/drivers/usb/typec/mux.c
> @@ -246,7 +246,7 @@ static void *typec_mux_match(struct fwnode_handle *fwnode, const char *id,
> dev = class_find_device(&typec_mux_class, NULL, fwnode,
> mux_fwnode_match);
>
> - return dev ? to_typec_switch(dev) : ERR_PTR(-EPROBE_DEFER);
> + return dev ? to_typec_mux(dev) : ERR_PTR(-EPROBE_DEFER);
> }
>
> /**

--
heikki