[4.4,1/6] can: dev: can_dellink(): remove return at end of void function

Message ID 20191127072124.30445-1-lee.jones@linaro.org
State Superseded
Headers show
Series
  • [4.4,1/6] can: dev: can_dellink(): remove return at end of void function
Related show

Commit Message

Lee Jones Nov. 27, 2019, 7:21 a.m.
From: Marc Kleine-Budde <mkl@pengutronix.de>


[ Upstream commit d36673f5918c8fd3533f7c0d4bac041baf39c7bb ]

This patch remove the return at the end of the void function
can_dellink().

Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>

Signed-off-by: Lee Jones <lee.jones@linaro.org>

---
 drivers/net/can/dev.c | 1 -
 1 file changed, 1 deletion(-)

-- 
2.24.0

Comments

Greg KH Nov. 27, 2019, 7:50 a.m. | #1
On Wed, Nov 27, 2019 at 07:21:19AM +0000, Lee Jones wrote:
> From: Marc Kleine-Budde <mkl@pengutronix.de>

> 

> [ Upstream commit d36673f5918c8fd3533f7c0d4bac041baf39c7bb ]

> 

> This patch remove the return at the end of the void function

> can_dellink().

> 

> Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>

> Signed-off-by: Lee Jones <lee.jones@linaro.org>

> ---

>  drivers/net/can/dev.c | 1 -

>  1 file changed, 1 deletion(-)

> 

> diff --git a/drivers/net/can/dev.c b/drivers/net/can/dev.c

> index 9dd968ee792e..e0d067701edc 100644

> --- a/drivers/net/can/dev.c

> +++ b/drivers/net/can/dev.c

> @@ -1041,7 +1041,6 @@ static int can_newlink(struct net *src_net, struct net_device *dev,

>  

>  static void can_dellink(struct net_device *dev, struct list_head *head)

>  {

> -	return;

>  }

>  

>  static struct rtnl_link_ops can_link_ops __read_mostly = {

> -- 

> 2.24.0

> 


How does this patch meet the stable kernel rules?

greg k-h
Greg KH Nov. 27, 2019, 7:51 a.m. | #2
On Wed, Nov 27, 2019 at 07:21:19AM +0000, Lee Jones wrote:
> From: Marc Kleine-Budde <mkl@pengutronix.de>

> 

> [ Upstream commit d36673f5918c8fd3533f7c0d4bac041baf39c7bb ]

> 

> This patch remove the return at the end of the void function

> can_dellink().

> 

> Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>

> Signed-off-by: Lee Jones <lee.jones@linaro.org>

> ---

>  drivers/net/can/dev.c | 1 -

>  1 file changed, 1 deletion(-)

> 

> diff --git a/drivers/net/can/dev.c b/drivers/net/can/dev.c

> index 9dd968ee792e..e0d067701edc 100644

> --- a/drivers/net/can/dev.c

> +++ b/drivers/net/can/dev.c

> @@ -1041,7 +1041,6 @@ static int can_newlink(struct net *src_net, struct net_device *dev,

>  

>  static void can_dellink(struct net_device *dev, struct list_head *head)

>  {

> -	return;

>  }

>  

>  static struct rtnl_link_ops can_link_ops __read_mostly = {

> -- 

> 2.24.0

> 


Also, this showed up in 5.4, so why did you not include it in all of
your patch series that you sent?  I can't take patches for older kernels
and skip newer ones for no good reason.

thanks,

greg k-h
Lee Jones Nov. 27, 2019, 9:54 a.m. | #3
On Wed, 27 Nov 2019, Greg KH wrote:

> On Wed, Nov 27, 2019 at 07:21:19AM +0000, Lee Jones wrote:

> > From: Marc Kleine-Budde <mkl@pengutronix.de>

> > 

> > [ Upstream commit d36673f5918c8fd3533f7c0d4bac041baf39c7bb ]

> > 

> > This patch remove the return at the end of the void function

> > can_dellink().

> > 

> > Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>

> > Signed-off-by: Lee Jones <lee.jones@linaro.org>

> > ---

> >  drivers/net/can/dev.c | 1 -

> >  1 file changed, 1 deletion(-)

> > 

> > diff --git a/drivers/net/can/dev.c b/drivers/net/can/dev.c

> > index 9dd968ee792e..e0d067701edc 100644

> > --- a/drivers/net/can/dev.c

> > +++ b/drivers/net/can/dev.c

> > @@ -1041,7 +1041,6 @@ static int can_newlink(struct net *src_net, struct net_device *dev,

> >  

> >  static void can_dellink(struct net_device *dev, struct list_head *head)

> >  {

> > -	return;

> >  }

> >  

> >  static struct rtnl_link_ops can_link_ops __read_mostly = {

> 

> Also, this showed up in 5.4, so why did you not include it in all of

> your patch series that you sent?  I can't take patches for older kernels

> and skip newer ones for no good reason.


Right. I pulled it from the other branches as it wasn't suitable.

Looks like this was left behind.

-- 
Lee Jones [李琼斯]
Linaro Services Technical Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog

Patch

diff --git a/drivers/net/can/dev.c b/drivers/net/can/dev.c
index 9dd968ee792e..e0d067701edc 100644
--- a/drivers/net/can/dev.c
+++ b/drivers/net/can/dev.c
@@ -1041,7 +1041,6 @@  static int can_newlink(struct net *src_net, struct net_device *dev,
 
 static void can_dellink(struct net_device *dev, struct list_head *head)
 {
-	return;
 }
 
 static struct rtnl_link_ops can_link_ops __read_mostly = {