Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c2d33bdc authored by Suman Tripathi's avatar Suman Tripathi Committed by David S. Miller
Browse files

drivers: net: xgene: Check for IS_ERR rather than NULL for clock. 



This patches fixes the code to check for IS_ERR rather
than NULL for clock interface.

Signed-off-by: default avatarIyappan Subramanian <isubramanian@apm.com>
Signed-off-by: default avatarSuman Tripathi <stripathi@apm.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 822e34a4

drivers/net/ethernet/apm/xgene/xgene_enet_hw.c

+3 −2
Original line number Diff line number Diff line
@@ -610,7 +610,7 @@ static int xgene_enet_reset(struct xgene_enet_pdata *pdata) 
	if (!xgene_ring_mgr_init(pdata))

		return -ENODEV;



	if (pdata->clk) {

	if (!IS_ERR(pdata->clk)) {

		clk_prepare_enable(pdata->clk);

		clk_disable_unprepare(pdata->clk);

		clk_prepare_enable(pdata->clk);
@@ -629,6 +629,7 @@ static int xgene_enet_reset(struct xgene_enet_pdata *pdata) 


static void xgene_gport_shutdown(struct xgene_enet_pdata *pdata)

{

	if (!IS_ERR(pdata->clk))

		clk_disable_unprepare(pdata->clk);

}

drivers/net/ethernet/apm/xgene/xgene_enet_main.c

+1 −1
Original line number Diff line number Diff line
@@ -1036,7 +1036,7 @@ static int xgene_enet_get_resources(struct xgene_enet_pdata *pdata) 
	pdata->clk = devm_clk_get(&pdev->dev, NULL);

	if (IS_ERR(pdata->clk)) {

		/* Firmware may have set up the clock already. */

		pdata->clk = NULL;

		dev_info(dev, "clocks have been setup already\n");

	}



	if (pdata->phy_mode != PHY_INTERFACE_MODE_XGMII)

drivers/net/ethernet/apm/xgene/xgene_enet_sgmac.c

+7 −4
Original line number Diff line number Diff line
@@ -334,9 +334,11 @@ static int xgene_enet_reset(struct xgene_enet_pdata *p) 
	if (!xgene_ring_mgr_init(p))

		return -ENODEV;



	if (!IS_ERR(p->clk)) {

		clk_prepare_enable(p->clk);

		clk_disable_unprepare(p->clk);

		clk_prepare_enable(p->clk);

	}



	xgene_enet_ecc_init(p);

	xgene_enet_config_ring_if_assoc(p);
@@ -369,6 +371,7 @@ static void xgene_enet_cle_bypass(struct xgene_enet_pdata *p, 


static void xgene_enet_shutdown(struct xgene_enet_pdata *p)

{

	if (!IS_ERR(p->clk))

		clk_disable_unprepare(p->clk);

}

drivers/net/ethernet/apm/xgene/xgene_enet_xgmac.c

+7 −4
Original line number Diff line number Diff line
@@ -256,9 +256,11 @@ static int xgene_enet_reset(struct xgene_enet_pdata *pdata) 
	if (!xgene_ring_mgr_init(pdata))

		return -ENODEV;



	if (!IS_ERR(pdata->clk)) {

		clk_prepare_enable(pdata->clk);

		clk_disable_unprepare(pdata->clk);

		clk_prepare_enable(pdata->clk);

	}



	xgene_enet_ecc_init(pdata);

	xgene_enet_config_ring_if_assoc(pdata);
@@ -285,6 +287,7 @@ static void xgene_enet_xgcle_bypass(struct xgene_enet_pdata *pdata, 


static void xgene_enet_shutdown(struct xgene_enet_pdata *pdata)

{

	if (!IS_ERR(pdata->clk))

		clk_disable_unprepare(pdata->clk);

}