From: Hans de Goede <hdegoede@redhat.com>
Date: Sat, 3 Oct 2015 14:13:19 +0000 (+0200)
Subject: sunxi: power: Drop protection against multiple calls from axp221 axp_init()
X-Git-Tag: v2016.01-rc1~316
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=03f8ae37194f5c2269ebb41236580cf37d090be0;p=oweals%2Fu-boot.git

sunxi: power: Drop protection against multiple calls from axp221 axp_init()

The only thing axp221.c's axp_init() does which needs protection
against multiple calls is calling pmic_bus_init, and pmic_bus_init()
itself is already protected against being called multiple times.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Acked-by: Ian Campbell <ijc@hellion.org.uk>
---

diff --git a/drivers/power/axp221.c b/drivers/power/axp221.c
index d621f2a9f9..65802e4a71 100644
--- a/drivers/power/axp221.c
+++ b/drivers/power/axp221.c
@@ -269,14 +269,9 @@ int axp_set_eldo(int eldo_num, unsigned int mvolt)
 
 int axp_init(void)
 {
-	/* This cannot be 0 because it is used in SPL before BSS is ready */
-	static int needs_init = 1;
 	u8 axp_chip_id;
 	int ret;
 
-	if (!needs_init)
-		return 0;
-
 	ret = pmic_bus_init();
 	if (ret)
 		return ret;
@@ -288,7 +283,6 @@ int axp_init(void)
 	if (!(axp_chip_id == 0x6 || axp_chip_id == 0x7 || axp_chip_id == 0x17))
 		return -ENODEV;
 
-	needs_init = 0;
 	return 0;
 }