From: Bartosz Golaszewski <bgolaszewski@baylibre.com>
Date: Tue, 21 May 2019 09:03:06 +0000 (+0200)
Subject: gpio: max732x: use devm_gpiochip_add_data()
X-Git-Tag: v5.3-rc1~176^2~19^2~2
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=2674700c4c0ec3bdeb1cd0ff4bf51ede2bc51c16;p=users%2Fjedix%2Flinux-maple.git

gpio: max732x: use devm_gpiochip_add_data()

We can simplify the code a bit with a resource managed variant of
gpiochip_add_data().

Signed-off-by: Bartosz Golaszewski <bgolaszewski@baylibre.com>
---

diff --git a/drivers/gpio/gpio-max732x.c b/drivers/gpio/gpio-max732x.c
index 7fd1bdfe00e5..42c9b6ce4227 100644
--- a/drivers/gpio/gpio-max732x.c
+++ b/drivers/gpio/gpio-max732x.c
@@ -698,15 +698,13 @@ static int max732x_probe(struct i2c_client *client,
 			return ret;
 	}
 
-	ret = gpiochip_add_data(&chip->gpio_chip, chip);
+	ret = devm_gpiochip_add_data(&client->dev, &chip->gpio_chip, chip);
 	if (ret)
 		return ret;
 
 	ret = max732x_irq_setup(chip, id);
-	if (ret) {
-		gpiochip_remove(&chip->gpio_chip);
+	if (ret)
 		return ret;
-	}
 
 	if (pdata && pdata->setup) {
 		ret = pdata->setup(client, chip->gpio_chip.base,
@@ -736,8 +734,6 @@ static int max732x_remove(struct i2c_client *client)
 		}
 	}
 
-	gpiochip_remove(&chip->gpio_chip);
-
 	return 0;
 }