| Message ID | 1465596714-26697-1-git-send-email-ivan.khoronzhuk@linaro.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
From: Ivan Khoronzhuk <ivan.khoronzhuk@linaro.org> Date: Sat, 11 Jun 2016 01:11:54 +0300 > Based on master master... of what? -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On 11.06.16 04:17, David Miller wrote: > From: Ivan Khoronzhuk <ivan.khoronzhuk@linaro.org> > Date: Sat, 11 Jun 2016 01:11:54 +0300 > >> Based on master > > master... of what? > master of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git but it's applicable on linux-next master also.
On 11.06.16 12:24, Ivan Khoronzhuk wrote: > > > On 11.06.16 04:17, David Miller wrote: >> From: Ivan Khoronzhuk <ivan.khoronzhuk@linaro.org> >> Date: Sat, 11 Jun 2016 01:11:54 +0300 >> >>> Based on master >> >> master... of what? >> > > master of > git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git > but it's applicable on linux-next master also. > Also checked on master of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next.git
From: Ivan Khoronzhuk <ivan.khoronzhuk@linaro.org> Date: Sat, 11 Jun 2016 01:11:54 +0300 > There is no reason to destroy channels that are destroyed while > cpdma_ctlr destroy. In this case no need to remember how much > channels where created and destroy them by one, as cpdma_ctlr > destroys all of them. > > Signed-off-by: Ivan Khoronzhuk <ivan.khoronzhuk@linaro.org> Applied. -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/net/ethernet/ti/cpsw.c b/drivers/net/ethernet/ti/cpsw.c index e6bb0ec..5319089 100644 --- a/drivers/net/ethernet/ti/cpsw.c +++ b/drivers/net/ethernet/ti/cpsw.c @@ -2505,8 +2505,6 @@ static int cpsw_probe(struct platform_device *pdev) clean_ale_ret: cpsw_ale_destroy(priv->ale); clean_dma_ret: - cpdma_chan_destroy(priv->txch); - cpdma_chan_destroy(priv->rxch); cpdma_ctlr_destroy(priv->dma); clean_runtime_disable_ret: pm_runtime_disable(&pdev->dev); @@ -2534,8 +2532,6 @@ static int cpsw_remove(struct platform_device *pdev) unregister_netdev(ndev); cpsw_ale_destroy(priv->ale); - cpdma_chan_destroy(priv->txch); - cpdma_chan_destroy(priv->rxch); cpdma_ctlr_destroy(priv->dma); pm_runtime_disable(&pdev->dev); device_for_each_child(&pdev->dev, NULL, cpsw_remove_child_device);
There is no reason to destroy channels that are destroyed while cpdma_ctlr destroy. In this case no need to remember how much channels where created and destroy them by one, as cpdma_ctlr destroys all of them. Signed-off-by: Ivan Khoronzhuk <ivan.khoronzhuk@linaro.org> --- Based on master drivers/net/ethernet/ti/cpsw.c | 4 ---- 1 file changed, 4 deletions(-)