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

Commit 570d785b authored by Kelsey Skunberg's avatar Kelsey Skunberg Committed by David S. Miller
Browse files

drivers: net: xgene: Remove acpi_has_method() calls 



acpi_evaluate_object will already return an error if the needed method
does not exist. Remove unnecessary acpi_has_method() calls and check the
returned acpi_status for failure instead.

Signed-off-by: default avatarKelsey Skunberg <skunberg.kelsey@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 3e3bb695

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

+4 −5
Original line number Diff line number Diff line
@@ -694,6 +694,7 @@ bool xgene_ring_mgr_init(struct xgene_enet_pdata *p) 
static int xgene_enet_reset(struct xgene_enet_pdata *pdata)

{

	struct device *dev = &pdata->pdev->dev;

	acpi_status status;



	if (!xgene_ring_mgr_init(pdata))

		return -ENODEV;
@@ -712,11 +713,9 @@ static int xgene_enet_reset(struct xgene_enet_pdata *pdata) 
		udelay(5);

	} else {

#ifdef CONFIG_ACPI

		if (acpi_has_method(ACPI_HANDLE(&pdata->pdev->dev), "_RST")) {

			acpi_evaluate_object(ACPI_HANDLE(&pdata->pdev->dev),

		status = acpi_evaluate_object(ACPI_HANDLE(&pdata->pdev->dev),

					      "_RST", NULL, NULL);

		} else if (acpi_has_method(ACPI_HANDLE(&pdata->pdev->dev),

					 "_INI")) {

		if (ACPI_FAILURE(status)) {

			acpi_evaluate_object(ACPI_HANDLE(&pdata->pdev->dev),

					     "_INI", NULL, NULL);

		}

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

+5 −4
Original line number Diff line number Diff line
@@ -437,6 +437,7 @@ static void xgene_sgmac_tx_disable(struct xgene_enet_pdata *p) 
static int xgene_enet_reset(struct xgene_enet_pdata *p)

{

	struct device *dev = &p->pdev->dev;

	acpi_status status;



	if (!xgene_ring_mgr_init(p))

		return -ENODEV;
@@ -460,12 +461,12 @@ static int xgene_enet_reset(struct xgene_enet_pdata *p) 
		}

	} else {

#ifdef CONFIG_ACPI

		if (acpi_has_method(ACPI_HANDLE(&p->pdev->dev), "_RST"))

			acpi_evaluate_object(ACPI_HANDLE(&p->pdev->dev),

		status = acpi_evaluate_object(ACPI_HANDLE(&p->pdev->dev),

					      "_RST", NULL, NULL);

		else if (acpi_has_method(ACPI_HANDLE(&p->pdev->dev), "_INI"))

		if (ACPI_FAILURE(status)) {

			acpi_evaluate_object(ACPI_HANDLE(&p->pdev->dev),

					     "_INI", NULL, NULL);

		}

#endif

	}

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

+4 −5
Original line number Diff line number Diff line
@@ -380,6 +380,7 @@ static void xgene_xgmac_tx_disable(struct xgene_enet_pdata *pdata) 
static int xgene_enet_reset(struct xgene_enet_pdata *pdata)

{

	struct device *dev = &pdata->pdev->dev;

	acpi_status status;



	if (!xgene_ring_mgr_init(pdata))

		return -ENODEV;
@@ -393,11 +394,9 @@ static int xgene_enet_reset(struct xgene_enet_pdata *pdata) 
		udelay(5);

	} else {

#ifdef CONFIG_ACPI

		if (acpi_has_method(ACPI_HANDLE(&pdata->pdev->dev), "_RST")) {

			acpi_evaluate_object(ACPI_HANDLE(&pdata->pdev->dev),

		status = acpi_evaluate_object(ACPI_HANDLE(&pdata->pdev->dev),

					      "_RST", NULL, NULL);

		} else if (acpi_has_method(ACPI_HANDLE(&pdata->pdev->dev),

					   "_INI")) {

		if (ACPI_FAILURE(status)) {

			acpi_evaluate_object(ACPI_HANDLE(&pdata->pdev->dev),

					     "_INI", NULL, NULL);

		}