[PATCH] can: xilinx_can: remove redundent netif_napi_del from xcan_remove

Subsystems: can network drivers, the rest, xilinx can driver

STALE1762d LANDED

Landed in mainline as b9b8218bb3c0 on 2021-10-24.

5 messages, 2 authors, 2021-10-19 · open the first message on its own page

[PATCH] can: xilinx_can: remove redundent netif_napi_del from xcan_remove

From: Dongliang Mu <hidden>
Date: 2021-10-17 12:50:49 

Since netif_napi_del is already done in the free_candev, so we remove
this redundent netif_napi_del invocation. In addition, this patch can
match the operations in the xcan_probe and xcan_remove functions.

Signed-off-by: Dongliang Mu <redacted>
---
 drivers/net/can/xilinx_can.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/drivers/net/can/xilinx_can.c b/drivers/net/can/xilinx_can.c
index 3b883e607d8b..60a3fb369058 100644
--- a/drivers/net/can/xilinx_can.c
+++ b/drivers/net/can/xilinx_can.c
@@ -1848,7 +1848,6 @@ static int xcan_remove(struct platform_device *pdev)
 
 	unregister_candev(ndev);
 	pm_runtime_disable(&pdev->dev);
-	netif_napi_del(&priv->napi);
 	free_candev(ndev);
 
 	return 0;
-- 
2.25.1

Re: [PATCH] can: xilinx_can: remove redundent netif_napi_del from xcan_remove

From: Marc Kleine-Budde <mkl@pengutronix.de>
Date: 2021-10-18 09:12:52 

On 17.10.2021 20:50:21, Dongliang Mu wrote:
Since netif_napi_del is already done in the free_candev, so we remove
this redundent netif_napi_del invocation. In addition, this patch can
       ^^^^^^^^^
redundant, fixed (also in subject)      
match the operations in the xcan_probe and xcan_remove functions.

Signed-off-by: Dongliang Mu <redacted>
Applied to linux-can-next/testing

regards,
Marc

-- 
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 |

Re: [PATCH] can: xilinx_can: remove redundent netif_napi_del from xcan_remove

From: Dongliang Mu <hidden>
Date: 2021-10-18 09:14:07 

On Mon, Oct 18, 2021 at 5:12 PM Marc Kleine-Budde [off-list ref] wrote:
On 17.10.2021 20:50:21, Dongliang Mu wrote:
quoted
Since netif_napi_del is already done in the free_candev, so we remove
this redundent netif_napi_del invocation. In addition, this patch can
       ^^^^^^^^^
redundant, fixed (also in subject)
:\ Sorry about this typo.
quoted
match the operations in the xcan_probe and xcan_remove functions.

Signed-off-by: Dongliang Mu <redacted>
Applied to linux-can-next/testing

regards,
Marc

--
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 |

Re: [PATCH] can: xilinx_can: remove redundent netif_napi_del from xcan_remove

From: Marc Kleine-Budde <mkl@pengutronix.de>
Date: 2021-10-18 10:48:11 

On 17.10.2021 20:50:21, Dongliang Mu wrote:
quoted hunk
Since netif_napi_del is already done in the free_candev, so we remove
this redundent netif_napi_del invocation. In addition, this patch can
match the operations in the xcan_probe and xcan_remove functions.

Signed-off-by: Dongliang Mu <redacted>
---
 drivers/net/can/xilinx_can.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/drivers/net/can/xilinx_can.c b/drivers/net/can/xilinx_can.c
index 3b883e607d8b..60a3fb369058 100644
--- a/drivers/net/can/xilinx_can.c
+++ b/drivers/net/can/xilinx_can.c
@@ -1848,7 +1848,6 @@ static int xcan_remove(struct platform_device *pdev)
 
 	unregister_candev(ndev);
 	pm_runtime_disable(&pdev->dev);
-	netif_napi_del(&priv->napi);
 	free_candev(ndev);
 
 	return 0;
Fixed the following error:

| drivers/net/can/xilinx_can.c: In function ‘xcan_remove’:
| drivers/net/can/xilinx_can.c:1847:20: error: unused variable ‘priv’ [-Werror=unused-variable]
|  1847 |  struct xcan_priv *priv = netdev_priv(ndev);
|       |                    ^~~~

regards,
Marc

-- 
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 |

Re: [PATCH] can: xilinx_can: remove redundent netif_napi_del from xcan_remove

From: Dongliang Mu <hidden>
Date: 2021-10-19 01:44:42 

On Mon, Oct 18, 2021 at 6:48 PM Marc Kleine-Budde [off-list ref] wrote:
On 17.10.2021 20:50:21, Dongliang Mu wrote:
quoted
Since netif_napi_del is already done in the free_candev, so we remove
this redundent netif_napi_del invocation. In addition, this patch can
match the operations in the xcan_probe and xcan_remove functions.

Signed-off-by: Dongliang Mu <redacted>
---
 drivers/net/can/xilinx_can.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/drivers/net/can/xilinx_can.c b/drivers/net/can/xilinx_can.c
index 3b883e607d8b..60a3fb369058 100644
--- a/drivers/net/can/xilinx_can.c
+++ b/drivers/net/can/xilinx_can.c
@@ -1848,7 +1848,6 @@ static int xcan_remove(struct platform_device *pdev)

      unregister_candev(ndev);
      pm_runtime_disable(&pdev->dev);
-     netif_napi_del(&priv->napi);
      free_candev(ndev);

      return 0;
Fixed the following error:

| drivers/net/can/xilinx_can.c: In function ‘xcan_remove’:
| drivers/net/can/xilinx_can.c:1847:20: error: unused variable ‘priv’ [-Werror=unused-variable]
|  1847 |  struct xcan_priv *priv = netdev_priv(ndev);
|       |                    ^~~~
For now, xilinx_can already enables "-Werror" proposed by Linus?

That's my problem. Sorry for that.

regards,
Marc

--
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 |
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help