lkml.org 
[lkml]   [2019]   [Jun]   [5]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v3 net-next 3/7] net: ethernet: ti: cpsw: use cpsw as drv data
    Date
    No need to set ndev for drvdata when mainly cpsw reference is needed,
    so correct this legacy decision.

    Reviewed-by: Grygorii Strashko <grygorii.strashko@ti.com>
    Signed-off-by: Ivan Khoronzhuk <ivan.khoronzhuk@linaro.org>
    ---
    drivers/net/ethernet/ti/cpsw.c | 16 +++++++---------
    1 file changed, 7 insertions(+), 9 deletions(-)

    diff --git a/drivers/net/ethernet/ti/cpsw.c b/drivers/net/ethernet/ti/cpsw.c
    index 6d3f1f3f90cb..3430503e1053 100644
    --- a/drivers/net/ethernet/ti/cpsw.c
    +++ b/drivers/net/ethernet/ti/cpsw.c
    @@ -2265,8 +2265,7 @@ static int cpsw_probe_dt(struct cpsw_platform_data *data,

    static void cpsw_remove_dt(struct platform_device *pdev)
    {
    - struct net_device *ndev = platform_get_drvdata(pdev);
    - struct cpsw_common *cpsw = ndev_to_cpsw(ndev);
    + struct cpsw_common *cpsw = platform_get_drvdata(pdev);
    struct cpsw_platform_data *data = &cpsw->data;
    struct device_node *node = pdev->dev.of_node;
    struct device_node *slave_node;
    @@ -2477,7 +2476,7 @@ static int cpsw_probe(struct platform_device *pdev)
    goto clean_cpts;
    }

    - platform_set_drvdata(pdev, ndev);
    + platform_set_drvdata(pdev, cpsw);
    priv = netdev_priv(ndev);
    priv->cpsw = cpsw;
    priv->ndev = ndev;
    @@ -2570,9 +2569,8 @@ static int cpsw_probe(struct platform_device *pdev)

    static int cpsw_remove(struct platform_device *pdev)
    {
    - struct net_device *ndev = platform_get_drvdata(pdev);
    - struct cpsw_common *cpsw = ndev_to_cpsw(ndev);
    - int ret;
    + struct cpsw_common *cpsw = platform_get_drvdata(pdev);
    + int i, ret;

    ret = pm_runtime_get_sync(&pdev->dev);
    if (ret < 0) {
    @@ -2580,9 +2578,9 @@ static int cpsw_remove(struct platform_device *pdev)
    return ret;
    }

    - if (cpsw->data.dual_emac)
    - unregister_netdev(cpsw->slaves[1].ndev);
    - unregister_netdev(ndev);
    + for (i = 0; i < cpsw->data.slaves; i++)
    + if (cpsw->slaves[i].ndev)
    + unregister_netdev(cpsw->slaves[i].ndev);

    cpts_release(cpsw->cpts);
    cpdma_ctlr_destroy(cpsw->dma);
    --
    2.17.1
    \
     
     \ /
      Last update: 2019-06-05 15:20    [W:4.610 / U:0.244 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site