All of lore.kernel.org
 help / color / mirror / Atom feed
* [Linux-kernel-mentees] [PATCH] drivers: net: xgene: Remove acpi_has_method() calls
@ 2019-07-22  3:04 ` Kelsey Skunberg
  0 siblings, 0 replies; 33+ messages in thread
From: skunberg.kelsey @ 2019-07-22  3:04 UTC (permalink / raw)


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: Kelsey Skunberg <skunberg.kelsey at gmail.com>
---
 drivers/net/ethernet/apm/xgene/xgene_enet_hw.c    |  7 +++----
 drivers/net/ethernet/apm/xgene/xgene_enet_sgmac.c | 10 +++++-----
 drivers/net/ethernet/apm/xgene/xgene_enet_xgmac.c |  9 ++++-----
 3 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/drivers/net/ethernet/apm/xgene/xgene_enet_hw.c b/drivers/net/ethernet/apm/xgene/xgene_enet_hw.c
index 61a465097cb8..ef75a09069a8 100644
--- a/drivers/net/ethernet/apm/xgene/xgene_enet_hw.c
+++ b/drivers/net/ethernet/apm/xgene/xgene_enet_hw.c
@@ -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);
 		}
diff --git a/drivers/net/ethernet/apm/xgene/xgene_enet_sgmac.c b/drivers/net/ethernet/apm/xgene/xgene_enet_sgmac.c
index 6453fc2ebb1f..6237a2cfd703 100644
--- a/drivers/net/ethernet/apm/xgene/xgene_enet_sgmac.c
+++ b/drivers/net/ethernet/apm/xgene/xgene_enet_sgmac.c
@@ -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,14 +461,13 @@ 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),
-					     "_RST", NULL, NULL);
-		else if (acpi_has_method(ACPI_HANDLE(&p->pdev->dev), "_INI"))
+		status = acpi_evaluate_object(ACPI_HANDLE(&p->pdev->dev),
+			 		      "_RST", NULL, NULL);
+		if (ACPI_FAILURE(status)) {
 			acpi_evaluate_object(ACPI_HANDLE(&p->pdev->dev),
 					     "_INI", NULL, NULL);
+		}
 #endif
-	}
 
 	if (!p->port_id) {
 		xgene_enet_ecc_init(p);
diff --git a/drivers/net/ethernet/apm/xgene/xgene_enet_xgmac.c b/drivers/net/ethernet/apm/xgene/xgene_enet_xgmac.c
index 133eb91c542e..fede3bfe4d68 100644
--- a/drivers/net/ethernet/apm/xgene/xgene_enet_xgmac.c
+++ b/drivers/net/ethernet/apm/xgene/xgene_enet_xgmac.c
@@ -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),
-					     "_RST", NULL, NULL);
-		} else if (acpi_has_method(ACPI_HANDLE(&pdata->pdev->dev),
-					   "_INI")) {
+		status = acpi_evaluate_object(ACPI_HANDLE(&pdata->pdev->dev),
+				 	      "_RST", NULL, NULL);
+		if (ACPI_FAILURE(status)) {
 			acpi_evaluate_object(ACPI_HANDLE(&pdata->pdev->dev),
 					     "_INI", NULL, NULL);
 		}
-- 
2.20.1

^ permalink raw reply related	[flat|nested] 33+ messages in thread
end of thread, other threads:[~2019-07-24 18:30 UTC | newest]

Thread overview: 33+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-07-22  3:04 [Linux-kernel-mentees] [PATCH] drivers: net: xgene: Remove acpi_has_method() calls skunberg.kelsey
2019-07-22  3:04 ` Kelsey Skunberg
2019-07-22  3:04 ` [Linux-kernel-mentees] " Kelsey Skunberg
2019-07-22 11:05 ` lkp
2019-07-22 11:05   ` kbuild test robot
2019-07-22 11:05   ` [Linux-kernel-mentees] " kbuild test robot
2019-07-23  1:17 ` davem
2019-07-23  1:17   ` David Miller
2019-07-23  1:17   ` [Linux-kernel-mentees] " David Miller
2019-07-23 18:58 ` [Linux-kernel-mentees] [PATCH v2] " skunberg.kelsey
2019-07-23 18:58   ` Kelsey Skunberg
2019-07-23 18:58   ` [Linux-kernel-mentees] " Kelsey Skunberg
2019-07-23 21:06   ` davem
2019-07-23 21:06     ` David Miller
2019-07-23 21:06     ` [Linux-kernel-mentees] " David Miller
2019-07-23 21:07     ` davem
2019-07-23 21:07       ` David Miller
2019-07-23 21:07       ` [Linux-kernel-mentees] " David Miller
2019-07-24  5:56       ` skunberg.kelsey
2019-07-24  5:56         ` Kelsey Skunberg
2019-07-24  5:56         ` [Linux-kernel-mentees] " Kelsey Skunberg
2019-07-23 22:56   ` bjorn.helgaas
2019-07-23 22:56     ` Bjorn Helgaas
2019-07-23 22:56     ` [Linux-kernel-mentees] " Bjorn Helgaas
2019-07-23 23:17     ` skunberg.kelsey
2019-07-23 23:17       ` Kelsey Skunberg
2019-07-23 23:17       ` [Linux-kernel-mentees] " Kelsey Skunberg
2019-07-24  6:06   ` [Linux-kernel-mentees] [PATCH v3] " skunberg.kelsey
2019-07-24  6:06     ` Kelsey Skunberg
2019-07-24  6:06     ` [Linux-kernel-mentees] " Kelsey Skunberg
2019-07-24 18:30     ` davem
2019-07-24 18:30       ` David Miller
2019-07-24 18:30       ` [Linux-kernel-mentees] " David Miller

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.