Merge branch 'omap-gpmc-fixes-for-v3.10' of git://github.com/jonhunter/linux into...

[firefly-linux-kernel-4.4.55.git] / drivers / mfd / lm3533-core.c

diff --git a/drivers/mfd/lm3533-core.c b/drivers/mfd/lm3533-core.c
index ceebf2c1ea972a41ea036af3c1ffcf68a074cfc0..4b7e6dac1de80ea22b556902d1f7896dbd7a6225 100644 (file)
--- a/drivers/mfd/lm3533-core.c
+++ b/drivers/mfd/lm3533-core.c
@@ -496,8 +496,8 @@ static int lm3533_device_init(struct lm3533 *lm3533)
        dev_set_drvdata(lm3533->dev, lm3533);
 
        if (gpio_is_valid(lm3533->gpio_hwen)) {
-               ret = gpio_request_one(lm3533->gpio_hwen, GPIOF_OUT_INIT_LOW,
-                                                               "lm3533-hwen");
+               ret = devm_gpio_request_one(lm3533->dev, lm3533->gpio_hwen,
+                                       GPIOF_OUT_INIT_LOW, "lm3533-hwen");
                if (ret < 0) {
                        dev_err(lm3533->dev,
                                "failed to request HWEN GPIO %d\n",
@@ -528,8 +528,6 @@ err_unregister:
        mfd_remove_devices(lm3533->dev);
 err_disable:
        lm3533_disable(lm3533);
-       if (gpio_is_valid(lm3533->gpio_hwen))
-               gpio_free(lm3533->gpio_hwen);
 
        return ret;
 }
@@ -542,8 +540,6 @@ static void lm3533_device_exit(struct lm3533 *lm3533)
 
        mfd_remove_devices(lm3533->dev);
        lm3533_disable(lm3533);
-       if (gpio_is_valid(lm3533->gpio_hwen))
-               gpio_free(lm3533->gpio_hwen);
 }
 
 static bool lm3533_readable_register(struct device *dev, unsigned int reg)