diff mbox series

[V3,06/10] can: flexcan: disable wakeup in flexcan_remove()

Message ID 20201020155402.30318-7-qiangqing.zhang@nxp.com
State New
Headers show
Series can: flexcan: add stop mode support for i.MX8QM | expand

Commit Message

Joakim Zhang Oct. 20, 2020, 3:53 p.m. UTC
Disable wakeup in flexcan_remove().

Fixes: de3578c198c6 ("can: flexcan: add self wakeup support")
Fixes: 915f9666421c ("can: flexcan: add support for DT property 'wakeup-source'")
Signed-off-by: Joakim Zhang <qiangqing.zhang@nxp.com>
---
 drivers/net/can/flexcan.c | 2 ++
 1 file changed, 2 insertions(+)

Comments

Marc Kleine-Budde Oct. 20, 2020, 9:31 a.m. UTC | #1
On 10/20/20 5:53 PM, Joakim Zhang wrote:
> Disable wakeup in flexcan_remove().


The patch looks good, please explain why this is needed.

Marc

> 

> Fixes: de3578c198c6 ("can: flexcan: add self wakeup support")

> Fixes: 915f9666421c ("can: flexcan: add support for DT property 'wakeup-source'")

> Signed-off-by: Joakim Zhang <qiangqing.zhang@nxp.com>

> ---

>  drivers/net/can/flexcan.c | 2 ++

>  1 file changed, 2 insertions(+)

> 

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

> index 06f94b6f0ebe..881799bd9c5e 100644

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

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

> @@ -2062,6 +2062,8 @@ static int flexcan_remove(struct platform_device *pdev)

>  {

>  	struct net_device *dev = platform_get_drvdata(pdev);

>  

> +	device_set_wakeup_enable(&pdev->dev, false);

> +	device_set_wakeup_capable(&pdev->dev, false);

>  	unregister_flexcandev(dev);

>  	pm_runtime_disable(&pdev->dev);

>  	free_candev(dev);

> 



-- 
Pengutronix e.K.                 | Marc Kleine-Budde           |
Embedded Linux                   | https://www.pengutronix.de  |
Vertretung West/Dortmund         | Phone: +49-231-2826-924     |
Amtsgericht Hildesheim, HRA 2686 | Fax:   +49-5121-206917-5555 |
Joakim Zhang Oct. 20, 2020, 10:29 a.m. UTC | #2
Hi Marc,

> -----Original Message-----

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

> Sent: 2020年10月20日 17:31

> To: Joakim Zhang <qiangqing.zhang@nxp.com>; robh+dt@kernel.org;

> shawnguo@kernel.org; s.hauer@pengutronix.de

> Cc: kernel@pengutronix.de; dl-linux-imx <linux-imx@nxp.com>; Ying Liu

> <victor.liu@nxp.com>; linux-can@vger.kernel.org; Pankaj Bansal

> <pankaj.bansal@nxp.com>; netdev@vger.kernel.org;

> linux-kernel@vger.kernel.org

> Subject: Re: [PATCH V3 06/10] can: flexcan: disable wakeup in flexcan_remove()

> 

> On 10/20/20 5:53 PM, Joakim Zhang wrote:

> > Disable wakeup in flexcan_remove().

> 

> The patch looks good, please explain why this is needed.


Okay, Can I resend this patch individually?

Joakim
> Marc

> 

> >

> > Fixes: de3578c198c6 ("can: flexcan: add self wakeup support")

> > Fixes: 915f9666421c ("can: flexcan: add support for DT property

> > 'wakeup-source'")

> > Signed-off-by: Joakim Zhang <qiangqing.zhang@nxp.com>

> > ---

> >  drivers/net/can/flexcan.c | 2 ++

> >  1 file changed, 2 insertions(+)

> >

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

> > index 06f94b6f0ebe..881799bd9c5e 100644

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

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

> > @@ -2062,6 +2062,8 @@ static int flexcan_remove(struct platform_device

> > *pdev)  {

> >  	struct net_device *dev = platform_get_drvdata(pdev);

> >

> > +	device_set_wakeup_enable(&pdev->dev, false);

> > +	device_set_wakeup_capable(&pdev->dev, false);

> >  	unregister_flexcandev(dev);

> >  	pm_runtime_disable(&pdev->dev);

> >  	free_candev(dev);

> >

> 

> 

> --

> Pengutronix e.K.                 | Marc Kleine-Budde           |

> Embedded Linux                   | https://www.pengutronix.de  |

> Vertretung West/Dortmund         | Phone: +49-231-2826-924     |

> Amtsgericht Hildesheim, HRA 2686 | Fax:   +49-5121-206917-5555 |
diff mbox series

Patch

diff --git a/drivers/net/can/flexcan.c b/drivers/net/can/flexcan.c
index 06f94b6f0ebe..881799bd9c5e 100644
--- a/drivers/net/can/flexcan.c
+++ b/drivers/net/can/flexcan.c
@@ -2062,6 +2062,8 @@  static int flexcan_remove(struct platform_device *pdev)
 {
 	struct net_device *dev = platform_get_drvdata(pdev);
 
+	device_set_wakeup_enable(&pdev->dev, false);
+	device_set_wakeup_capable(&pdev->dev, false);
 	unregister_flexcandev(dev);
 	pm_runtime_disable(&pdev->dev);
 	free_candev(dev);