From f009cfde7ab62912178d3a1d8491c5c1a74e9ebf Mon Sep 17 00:00:00 2001
From: Axel Lin <axel.lin@ingics.com>
Date: Sun, 19 May 2013 14:00:47 +0800
Subject: [PATCH] --- yaml --- r: 376085 b: refs/heads/master c:
 cfb10898efe1bc1f3eb8d8f37f164d9e2ac8b43a h: refs/heads/master i:   376083:
 90959827d0be022aa00c3c0958d601d978255bec v: v3

---
 [refs]                               | 2 +-
 trunk/drivers/gpio/gpio-ml-ioh.c     | 3 +--
 trunk/drivers/gpio/gpio-pch.c        | 3 +--
 trunk/drivers/gpio/gpio-sch.c        | 6 ++----
 trunk/drivers/gpio/gpio-viperboard.c | 3 ++-
 5 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/[refs] b/[refs]
index d7d4a44f8cb7..247d60e7c7e1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 90dae4ebf03063a70d992aad00d5f5a607c31db8
+refs/heads/master: cfb10898efe1bc1f3eb8d8f37f164d9e2ac8b43a
diff --git a/trunk/drivers/gpio/gpio-ml-ioh.c b/trunk/drivers/gpio/gpio-ml-ioh.c
index b73366523fae..0966f2637ad2 100644
--- a/trunk/drivers/gpio/gpio-ml-ioh.c
+++ b/trunk/drivers/gpio/gpio-ml-ioh.c
@@ -496,8 +496,7 @@ static int ioh_gpio_probe(struct pci_dev *pdev,
 err_gpiochip_add:
 	while (--i >= 0) {
 		chip--;
-		ret = gpiochip_remove(&chip->gpio);
-		if (ret)
+		if (gpiochip_remove(&chip->gpio))
 			dev_err(&pdev->dev, "Failed gpiochip_remove(%d)\n", i);
 	}
 	kfree(chip_save);
diff --git a/trunk/drivers/gpio/gpio-pch.c b/trunk/drivers/gpio/gpio-pch.c
index cdf599687cf7..0fec097e838d 100644
--- a/trunk/drivers/gpio/gpio-pch.c
+++ b/trunk/drivers/gpio/gpio-pch.c
@@ -424,8 +424,7 @@ static int pch_gpio_probe(struct pci_dev *pdev,
 err_request_irq:
 	irq_free_descs(irq_base, gpio_pins[chip->ioh]);
 
-	ret = gpiochip_remove(&chip->gpio);
-	if (ret)
+	if (gpiochip_remove(&chip->gpio))
 		dev_err(&pdev->dev, "%s gpiochip_remove failed\n", __func__);
 
 err_gpiochip_add:
diff --git a/trunk/drivers/gpio/gpio-sch.c b/trunk/drivers/gpio/gpio-sch.c
index 1e4de16ceb41..5af65719b95d 100644
--- a/trunk/drivers/gpio/gpio-sch.c
+++ b/trunk/drivers/gpio/gpio-sch.c
@@ -272,10 +272,8 @@ static int sch_gpio_probe(struct platform_device *pdev)
 	return 0;
 
 err_sch_gpio_resume:
-	err = gpiochip_remove(&sch_gpio_core);
-	if (err)
-		dev_err(&pdev->dev, "%s failed, %d\n",
-				"gpiochip_remove()", err);
+	if (gpiochip_remove(&sch_gpio_core))
+		dev_err(&pdev->dev, "%s gpiochip_remove failed\n", __func__);
 
 err_sch_gpio_core:
 	release_region(res->start, resource_size(res));
diff --git a/trunk/drivers/gpio/gpio-viperboard.c b/trunk/drivers/gpio/gpio-viperboard.c
index 095ab14cea4d..5ac2919197fe 100644
--- a/trunk/drivers/gpio/gpio-viperboard.c
+++ b/trunk/drivers/gpio/gpio-viperboard.c
@@ -446,7 +446,8 @@ static int vprbrd_gpio_probe(struct platform_device *pdev)
 	return ret;
 
 err_gpiob:
-	ret = gpiochip_remove(&vb_gpio->gpioa);
+	if (gpiochip_remove(&vb_gpio->gpioa))
+		dev_err(&pdev->dev, "%s gpiochip_remove failed\n", __func__);
 
 err_gpioa:
 	return ret;