mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Lee Jones <lee.jones@linaro.org>
To: linux-kernel@vger.kernel.org, broonie@opensource.wolfsonmicro.com
Cc: Lee Jones <lee.jones@linaro.org>
Subject: [PATCH 32/33] regulator: ab8500: Shuffle init functions into a more logical order
Date: Thu, 28 Mar 2013 16:11:32 +0000	[thread overview]
Message-ID: <1364487093-19551-33-git-send-email-lee.jones@linaro.org> (raw)
In-Reply-To: <1364487093-19551-1-git-send-email-lee.jones@linaro.org>

The ab*_match[] arrays should be moved out of the way, instead of
bunched in the middle of the initialisation functions. This patch
moves all initialisation code which currently resides above these
arrays down to be grouped with the others. This makes the whole
thing slightly easier to read.

Signed-off-by: Lee Jones <lee.jones@linaro.org>
---
 drivers/regulator/ab8500.c |  170 ++++++++++++++++++++++----------------------
 1 file changed, 85 insertions(+), 85 deletions(-)

diff --git a/drivers/regulator/ab8500.c b/drivers/regulator/ab8500.c
index bb574bf..535a94f 100644
--- a/drivers/regulator/ab8500.c
+++ b/drivers/regulator/ab8500.c
@@ -2916,91 +2916,6 @@ static struct ab8500_reg_init ab8540_reg_init[] = {
 	REG_INIT(AB8540_REGUCTRLDISCH4,		0x04, 0x49, 0x07),
 };
 
-static struct {
-	struct ab8500_regulator_info *info;
-	int info_size;
-	struct ab8500_reg_init *init;
-	int init_size;
-	struct of_regulator_match *match;
-	int match_size;
-} abx500_regulator;
-
-static int ab8500_regulator_init_registers(struct platform_device *pdev,
-					   int id, int mask, int value)
-{
-	struct ab8500_reg_init *reg_init = abx500_regulator.init;
-	int err;
-
-	BUG_ON(value & ~mask);
-	BUG_ON(mask & ~reg_init[id].mask);
-
-	/* initialize register */
-	err = abx500_mask_and_set_register_interruptible(
-		&pdev->dev,
-		reg_init[id].bank,
-		reg_init[id].addr,
-		mask, value);
-	if (err < 0) {
-		dev_err(&pdev->dev,
-			"Failed to initialize 0x%02x, 0x%02x.\n",
-			reg_init[id].bank,
-			reg_init[id].addr);
-		return err;
-	}
-	dev_vdbg(&pdev->dev,
-		 "  init: 0x%02x, 0x%02x, 0x%02x, 0x%02x\n",
-		 reg_init[id].bank,
-		 reg_init[id].addr,
-		 mask, value);
-
-	return 0;
-}
-
-static int ab8500_regulator_register(struct platform_device *pdev,
-				     struct regulator_init_data *init_data,
-				     int id, struct device_node *np)
-{
-	struct ab8500 *ab8500 = dev_get_drvdata(pdev->dev.parent);
-	struct ab8500_regulator_info *info = NULL;
-	struct regulator_config config = { };
-	int err;
-
-	/* assign per-regulator data */
-	info = &abx500_regulator.info[id];
-	info->dev = &pdev->dev;
-
-	config.dev = &pdev->dev;
-	config.init_data = init_data;
-	config.driver_data = info;
-	config.of_node = np;
-
-	/* fix for hardware before ab8500v2.0 */
-	if (is_ab8500_1p1_or_earlier(ab8500)) {
-		if (info->desc.id == AB8500_LDO_AUX3) {
-			info->desc.n_voltages =
-				ARRAY_SIZE(ldo_vauxn_voltages);
-			info->desc.volt_table = ldo_vauxn_voltages;
-			info->voltage_mask = 0xf;
-		}
-	}
-
-	/* register regulator with framework */
-	info->regulator = regulator_register(&info->desc, &config);
-	if (IS_ERR(info->regulator)) {
-		err = PTR_ERR(info->regulator);
-		dev_err(&pdev->dev, "failed to register regulator %s\n",
-			info->desc.name);
-		/* when we fail, un-register all earlier regulators */
-		while (--id >= 0) {
-			info = &abx500_regulator.info[id];
-			regulator_unregister(info->regulator);
-		}
-		return err;
-	}
-
-	return 0;
-}
-
 static struct of_regulator_match ab8500_regulator_match[] = {
 	{ .name	= "ab8500_ldo_aux1",    .driver_data = (void *) AB8500_LDO_AUX1, },
 	{ .name	= "ab8500_ldo_aux2",    .driver_data = (void *) AB8500_LDO_AUX2, },
@@ -3061,6 +2976,15 @@ static struct of_regulator_match ab9540_regulator_match[] = {
 	{ .name	= "ab8500_ldo_ana",     .driver_data = (void *) AB9540_LDO_ANA, },
 };
 
+static struct {
+	struct ab8500_regulator_info *info;
+	int info_size;
+	struct ab8500_reg_init *init;
+	int init_size;
+	struct of_regulator_match *match;
+	int match_size;
+} abx500_regulator;
+
 static void abx500_get_regulator_info(struct ab8500 *ab8500)
 {
 	if (is_ab9540(ab8500)) {
@@ -3094,6 +3018,82 @@ static void abx500_get_regulator_info(struct ab8500 *ab8500)
 	}
 }
 
+static int ab8500_regulator_init_registers(struct platform_device *pdev,
+					   int id, int mask, int value)
+{
+	struct ab8500_reg_init *reg_init = abx500_regulator.init;
+	int err;
+
+	BUG_ON(value & ~mask);
+	BUG_ON(mask & ~reg_init[id].mask);
+
+	/* initialize register */
+	err = abx500_mask_and_set_register_interruptible(
+		&pdev->dev,
+		reg_init[id].bank,
+		reg_init[id].addr,
+		mask, value);
+	if (err < 0) {
+		dev_err(&pdev->dev,
+			"Failed to initialize 0x%02x, 0x%02x.\n",
+			reg_init[id].bank,
+			reg_init[id].addr);
+		return err;
+	}
+	dev_vdbg(&pdev->dev,
+		 "  init: 0x%02x, 0x%02x, 0x%02x, 0x%02x\n",
+		 reg_init[id].bank,
+		 reg_init[id].addr,
+		 mask, value);
+
+	return 0;
+}
+
+static int ab8500_regulator_register(struct platform_device *pdev,
+				     struct regulator_init_data *init_data,
+				     int id, struct device_node *np)
+{
+	struct ab8500 *ab8500 = dev_get_drvdata(pdev->dev.parent);
+	struct ab8500_regulator_info *info = NULL;
+	struct regulator_config config = { };
+	int err;
+
+	/* assign per-regulator data */
+	info = &abx500_regulator.info[id];
+	info->dev = &pdev->dev;
+
+	config.dev = &pdev->dev;
+	config.init_data = init_data;
+	config.driver_data = info;
+	config.of_node = np;
+
+	/* fix for hardware before ab8500v2.0 */
+	if (is_ab8500_1p1_or_earlier(ab8500)) {
+		if (info->desc.id == AB8500_LDO_AUX3) {
+			info->desc.n_voltages =
+				ARRAY_SIZE(ldo_vauxn_voltages);
+			info->desc.volt_table = ldo_vauxn_voltages;
+			info->voltage_mask = 0xf;
+		}
+	}
+
+	/* register regulator with framework */
+	info->regulator = regulator_register(&info->desc, &config);
+	if (IS_ERR(info->regulator)) {
+		err = PTR_ERR(info->regulator);
+		dev_err(&pdev->dev, "failed to register regulator %s\n",
+			info->desc.name);
+		/* when we fail, un-register all earlier regulators */
+		while (--id >= 0) {
+			info = &abx500_regulator.info[id];
+			regulator_unregister(info->regulator);
+		}
+		return err;
+	}
+
+	return 0;
+}
+
 static int
 ab8500_regulator_of_probe(struct platform_device *pdev,
 			  struct device_node *np)
-- 
1.7.10.4


  parent reply	other threads:[~2013-03-28 16:13 UTC|newest]

Thread overview: 41+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-03-28 16:11 [PATCH 00/33] Regulators: Bring the AB8500 into the 21st century Lee Jones
2013-03-28 16:11 ` [PATCH 01/33] regulator: ab8500-ext: New driver to control external regulators Lee Jones
2013-03-29 17:49   ` Mark Brown
2013-03-28 16:11 ` [PATCH 02/33] ARM: ux500: Add regulator platform data for AB8500 " Lee Jones
2013-03-28 16:11 ` [PATCH 03/33] ARM: ux500: Provide a mechanism to over-ride regulator init values Lee Jones
2013-03-28 16:11 ` [PATCH 04/33] ARM: ux500: Turn off external regulator #1 when early HREFs suspend Lee Jones
2013-03-28 16:11 ` [PATCH 05/33] ARM: ux500: Setup external regulator supply #2 for HREF v20 boards Lee Jones
2013-03-28 16:11 ` [PATCH 06/33] regulator: ab8500-ext: Add HW request support Lee Jones
2013-03-28 16:11 ` [PATCH 07/33] regulator: ab8500-ext: Add suspend support Lee Jones
2013-03-29 17:44   ` Mark Brown
2013-03-28 16:11 ` [PATCH 08/33] regulator: ab8500: Remove USB regulator Lee Jones
2013-03-29 17:50   ` Mark Brown
2013-03-28 16:11 ` [PATCH 09/33] regulator: ab8500: Init debug from regulator driver Lee Jones
2013-03-29 17:50   ` Mark Brown
2013-03-28 16:11 ` [PATCH 10/33] regulator: ab8500: Prepare the driver for additional platforms Lee Jones
2013-03-28 16:11 ` [PATCH 11/33] regulator: ab8500: Add support for the ab9540 Lee Jones
2013-03-28 16:11 ` [PATCH 12/33] regulator: ab8500: Correct TVOUT regulator enable time Lee Jones
2013-03-28 16:11 ` [PATCH 13/33] regulator: ab8500-ext: Add support for AB8505/AB9540 Lee Jones
2013-04-01 12:21   ` Mark Brown
2013-03-28 16:11 ` [PATCH 14/33] regulator: ab8500: add support for ab8505 Lee Jones
2013-03-28 16:11 ` [PATCH 15/33] regulator: ab8500-ext: Add support for AB9540 regulators Lee Jones
2013-04-01 12:22   ` Mark Brown
2013-03-28 16:11 ` [PATCH 16/33] regulator: ab8500: Add support for the ab8540 Lee Jones
2013-03-28 16:11 ` [PATCH 17/33] regulator: ab8500: Update voltage handling for fixed voltage regulators Lee Jones
2013-03-28 16:11 ` [PATCH 18/33] regulator: ab8500: Use regulator_list_voltage_table() Lee Jones
2013-04-01 12:24   ` Mark Brown
2013-03-28 16:11 ` [PATCH 19/33] regulator: ab8500: Supply platform specific regulator id values Lee Jones
2013-03-28 16:11 ` [PATCH 20/33] regulator: ab8500: Don't register external regulators on AB8505 Lee Jones
2013-03-28 16:11 ` [PATCH 21/33] regulator: ab8500: Add voltage selection for AUDIO and ANA " Lee Jones
2013-03-28 16:11 ` [PATCH 22/33] regulator: ab8500: Also check for AB8505 based platforms Lee Jones
2013-03-28 16:11 ` [PATCH 23/33] regulator: ab8500: Add new operations for Vaux3 Lee Jones
2013-03-28 16:11 ` [PATCH 24/33] regulator: ab8500: Add mode operation for v-amic Lee Jones
2013-03-28 16:11 ` [PATCH 25/33] regulator: ab8500: Update vdmic, vamic[1|2] parameters for AB8540 Lee Jones
2013-03-28 16:11 ` [PATCH 26/33] regulator: ab8500: Use a struct to select the good regulator configuration Lee Jones
2013-03-28 16:11 ` [PATCH 27/33] regulator: ab8500: Introduce aux5, aux6 regulators for AB8540 Lee Jones
2013-03-28 16:11 ` [PATCH 28/33] regulator: ab8500: Set enable enable_time in regulator_desc Lee Jones
2013-03-28 16:11 ` [PATCH 29/33] regulator: ab8500: Remove the need for a 'delay' property Lee Jones
2013-03-28 16:11 ` [PATCH 30/33] regulator: ab8500: Use regulator_list_voltage_table() to look-up voltages Lee Jones
2013-03-28 16:11 ` [PATCH 31/33] ARM: ux500: Pass regulator platform data using the new format Lee Jones
2013-03-28 16:11 ` Lee Jones [this message]
2013-03-28 16:11 ` [PATCH 33/33] ARM: ux500: Regulators: Bring the AB8500 regulator platform data up-to-date Lee Jones

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1364487093-19551-33-git-send-email-lee.jones@linaro.org \
    --to=lee.jones@linaro.org \
    --cc=broonie@opensource.wolfsonmicro.com \
    --cc=linux-kernel@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®