[PATCH] usb: typec: mux: Fix copy-paste of the container_of

[PATCH] usb: typec: mux: Fix copy-paste of the container_of

[Bjorn Andersson]

Some of the boilerplate code was copy pasted from the typec_switch and
retained the use of the switch's container_of macros. The two structs
are identical in this regard, so this change doesn't cause a functional
change today, but could possibly cause future issues.

Fixes: 3370db35193b ("usb: typec: Registering real device entries for the muxes")
Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
---
 drivers/usb/typec/mux.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/usb/typec/mux.c b/drivers/usb/typec/mux.c
index 8514bec7e1b8..e4467c4c3742 100644
--- a/drivers/usb/typec/mux.c
+++ b/drivers/usb/typec/mux.c
@@ -45,7 +45,7 @@ static void *typec_switch_match(struct fwnode_handle *fwnode, const char *id,
 	dev = class_find_device(&typec_mux_class, NULL, fwnode,
 				switch_fwnode_match);
 
-	return dev ? to_typec_switch(dev) : ERR_PTR(-EPROBE_DEFER);
+	return dev ? to_typec_mux(dev) : ERR_PTR(-EPROBE_DEFER);
 }
 
 /**
@@ -87,7 +87,7 @@ EXPORT_SYMBOL_GPL(typec_switch_put);
 
 static void typec_switch_release(struct device *dev)
 {
-	kfree(to_typec_switch(dev));
+	kfree(to_typec_mux(dev));
 }
 
 static const struct device_type typec_switch_dev_type = {
@@ -239,7 +239,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

Re: [PATCH] usb: typec: mux: Fix copy-paste of the container_of

[Heikki Krogerus]

Hi,

On Sat, May 15, 2021 at 08:48:33PM -0700, Bjorn Andersson wrote:
> Some of the boilerplate code was copy pasted from the typec_switch and
> retained the use of the switch's container_of macros. The two structs
> are identical in this regard, so this change doesn't cause a functional
> change today, but could possibly cause future issues.
> 
> Fixes: 3370db35193b ("usb: typec: Registering real device entries for the muxes")
> Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
> ---
>  drivers/usb/typec/mux.c | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/usb/typec/mux.c b/drivers/usb/typec/mux.c
> index 8514bec7e1b8..e4467c4c3742 100644
> --- a/drivers/usb/typec/mux.c
> +++ b/drivers/usb/typec/mux.c
> @@ -45,7 +45,7 @@ static void *typec_switch_match(struct fwnode_handle *fwnode, const char *id,
>  	dev = class_find_device(&typec_mux_class, NULL, fwnode,
>  				switch_fwnode_match);
>  
> -	return dev ? to_typec_switch(dev) : ERR_PTR(-EPROBE_DEFER);
> +	return dev ? to_typec_mux(dev) : ERR_PTR(-EPROBE_DEFER);

That does not look correct to me?

>  }
>  
>  /**
> @@ -87,7 +87,7 @@ EXPORT_SYMBOL_GPL(typec_switch_put);
>  
>  static void typec_switch_release(struct device *dev)
>  {
> -	kfree(to_typec_switch(dev));
> +	kfree(to_typec_mux(dev));

Ditto.

>  }
>  
>  static const struct device_type typec_switch_dev_type = {
> @@ -239,7 +239,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);

That looks correct.

Either I'm missing something, or only the last change is needed.

thanks,

-- 
heikki

Re: [PATCH] usb: typec: mux: Fix copy-paste of the container_of

[Bjorn Andersson]

On Mon 17 May 04:09 CDT 2021, Heikki Krogerus wrote:

> Hi,
> 
> On Sat, May 15, 2021 at 08:48:33PM -0700, Bjorn Andersson wrote:
> > Some of the boilerplate code was copy pasted from the typec_switch and
> > retained the use of the switch's container_of macros. The two structs
> > are identical in this regard, so this change doesn't cause a functional
> > change today, but could possibly cause future issues.
> > 
> > Fixes: 3370db35193b ("usb: typec: Registering real device entries for the muxes")
> > Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
> > ---
> >  drivers/usb/typec/mux.c | 6 +++---
> >  1 file changed, 3 insertions(+), 3 deletions(-)
> > 
> > diff --git a/drivers/usb/typec/mux.c b/drivers/usb/typec/mux.c
> > index 8514bec7e1b8..e4467c4c3742 100644
> > --- a/drivers/usb/typec/mux.c
> > +++ b/drivers/usb/typec/mux.c
> > @@ -45,7 +45,7 @@ static void *typec_switch_match(struct fwnode_handle *fwnode, const char *id,
> >  	dev = class_find_device(&typec_mux_class, NULL, fwnode,
> >  				switch_fwnode_match);
> >  
> > -	return dev ? to_typec_switch(dev) : ERR_PTR(-EPROBE_DEFER);
> > +	return dev ? to_typec_mux(dev) : ERR_PTR(-EPROBE_DEFER);
> 
> That does not look correct to me?
> 

No it doesn't, you're right. I spotted the last one and it being trivial
I obviously didn't pay enough attention when just "fixing" the other two
instances of "the same".

> >  }
> >  
> >  /**
> > @@ -87,7 +87,7 @@ EXPORT_SYMBOL_GPL(typec_switch_put);
> >  
> >  static void typec_switch_release(struct device *dev)
> >  {
> > -	kfree(to_typec_switch(dev));
> > +	kfree(to_typec_mux(dev));
> 
> Ditto.
> 
> >  }
> >  
> >  static const struct device_type typec_switch_dev_type = {
> > @@ -239,7 +239,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);
> 
> That looks correct.
> 
> Either I'm missing something, or only the last change is needed.
> 

Sorry about that, I'll fix it up and repost the patch.

Regards,
Bjorn