aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/mfd/lm3533-core.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/mfd/lm3533-core.c')
-rw-r--r--drivers/mfd/lm3533-core.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/drivers/mfd/lm3533-core.c b/drivers/mfd/lm3533-core.c
index ceebf2c1ea97..4b7e6dac1de8 100644
--- a/drivers/mfd/lm3533-core.c
+++ b/drivers/mfd/lm3533-core.c
@@ -496,8 +496,8 @@ static int lm3533_device_init(struct lm3533 *lm3533)
496 dev_set_drvdata(lm3533->dev, lm3533); 496 dev_set_drvdata(lm3533->dev, lm3533);
497 497
498 if (gpio_is_valid(lm3533->gpio_hwen)) { 498 if (gpio_is_valid(lm3533->gpio_hwen)) {
499 ret = gpio_request_one(lm3533->gpio_hwen, GPIOF_OUT_INIT_LOW, 499 ret = devm_gpio_request_one(lm3533->dev, lm3533->gpio_hwen,
500 "lm3533-hwen"); 500 GPIOF_OUT_INIT_LOW, "lm3533-hwen");
501 if (ret < 0) { 501 if (ret < 0) {
502 dev_err(lm3533->dev, 502 dev_err(lm3533->dev,
503 "failed to request HWEN GPIO %d\n", 503 "failed to request HWEN GPIO %d\n",
@@ -528,8 +528,6 @@ err_unregister:
528 mfd_remove_devices(lm3533->dev); 528 mfd_remove_devices(lm3533->dev);
529err_disable: 529err_disable:
530 lm3533_disable(lm3533); 530 lm3533_disable(lm3533);
531 if (gpio_is_valid(lm3533->gpio_hwen))
532 gpio_free(lm3533->gpio_hwen);
533 531
534 return ret; 532 return ret;
535} 533}
@@ -542,8 +540,6 @@ static void lm3533_device_exit(struct lm3533 *lm3533)
542 540
543 mfd_remove_devices(lm3533->dev); 541 mfd_remove_devices(lm3533->dev);
544 lm3533_disable(lm3533); 542 lm3533_disable(lm3533);
545 if (gpio_is_valid(lm3533->gpio_hwen))
546 gpio_free(lm3533->gpio_hwen);
547} 543}
548 544
549static bool lm3533_readable_register(struct device *dev, unsigned int reg) 545static bool lm3533_readable_register(struct device *dev, unsigned int reg)