From patchwork Mon Feb 4 11:53:31 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 14465 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id 4092723F96 for ; Mon, 4 Feb 2013 11:56:20 +0000 (UTC) Received: from mail-vb0-f41.google.com (mail-vb0-f41.google.com [209.85.212.41]) by fiordland.canonical.com (Postfix) with ESMTP id D9CE3A18477 for ; Mon, 4 Feb 2013 11:56:19 +0000 (UTC) Received: by mail-vb0-f41.google.com with SMTP id l22so3884907vbn.0 for ; Mon, 04 Feb 2013 03:56:19 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:x-forwarded-to:x-forwarded-for:delivered-to:x-received :received-spf:x-received:from:to:cc:subject:date:message-id:x-mailer :in-reply-to:references:x-gm-message-state; bh=4L5MnVISe7iC7I2Id6ZJ7zP1ECN/PwJ6Tl3uyG2nRCQ=; b=WUxYSijuAy+2a4qS8CfrhUjOqCQDpKpWBs8mMBMJaBkrOUwWrwcWoWtxqBz0yel+0t QnkurHp+43WpVtTtOXMI22vUbJdtiI258uTxM7mMVYuYiZ7Hy+SYBKFc2sCGmrD/V0Tk vofi5qKZLU0+yfAL39tqAykhuuq9KWNVIYDU2+sKfXw5+qhQVujKuwUYHWPJ4rCg4NiD tK6OrpLZSNxKyzMZJSFDhh39CBJ82WcIIbdo+1Ta0zpcrr8B48GMGFc3povbfzJE4zJu 2RFA5CQvz2AOK2ApFSGN488OT2P1sf1wl/+sBPJBgbth4bMET+oO2kYG+jK/EICIHKvD IObA== X-Received: by 10.58.48.231 with SMTP id p7mr18051020ven.11.1359978979385; Mon, 04 Feb 2013 03:56:19 -0800 (PST) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.58.252.8 with SMTP id zo8csp83040vec; Mon, 4 Feb 2013 03:56:18 -0800 (PST) X-Received: by 10.180.93.40 with SMTP id cr8mr9994966wib.15.1359978978193; Mon, 04 Feb 2013 03:56:18 -0800 (PST) Received: from mail-wg0-f49.google.com (mail-wg0-f49.google.com [74.125.82.49]) by mx.google.com with ESMTPS id gv6si3469240wib.60.2013.02.04.03.56.17 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 04 Feb 2013 03:56:18 -0800 (PST) Received-SPF: neutral (google.com: 74.125.82.49 is neither permitted nor denied by best guess record for domain of lee.jones@linaro.org) client-ip=74.125.82.49; Authentication-Results: mx.google.com; spf=neutral (google.com: 74.125.82.49 is neither permitted nor denied by best guess record for domain of lee.jones@linaro.org) smtp.mail=lee.jones@linaro.org Received: by mail-wg0-f49.google.com with SMTP id 15so4535896wgd.28 for ; Mon, 04 Feb 2013 03:56:17 -0800 (PST) X-Received: by 10.194.104.137 with SMTP id ge9mr34568960wjb.59.1359978977673; Mon, 04 Feb 2013 03:56:17 -0800 (PST) Received: from localhost.localdomain (cpc34-aztw25-2-0-cust250.18-1.cable.virginmedia.com. [86.16.136.251]) by mx.google.com with ESMTPS id j9sm12937128wia.5.2013.02.04.03.56.15 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 04 Feb 2013 03:56:16 -0800 (PST) From: Lee Jones To: linux-kernel@vger.kernel.org, broonie@opensource.wolfsonmicro.com Cc: Bengt Jonsson , Lee Jones Subject: [PATCH 16/73] regulator: ab8500-ext: Cosmetic changes Date: Mon, 4 Feb 2013 11:53:31 +0000 Message-Id: <1359978868-28736-17-git-send-email-lee.jones@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1359978868-28736-1-git-send-email-lee.jones@linaro.org> References: <1359978868-28736-1-git-send-email-lee.jones@linaro.org> X-Gm-Message-State: ALoCoQkW1UN9Ghee03IYBRmL8uVHgZA9m8zVcMO4xWAoZa/i+EB+lWZTka/pwbUQ/zM1Q41T20wq From: Bengt Jonsson Variable is renamed in driver. Some comments are added. Signed-off-by: Bengt Jonsson Signed-off-by: Lee Jones Reviewed-by: Mattias NILSSON Reviewed-by: Jonas ABERG --- arch/arm/mach-ux500/board-mop500-regulators.c | 2 +- drivers/regulator/ab8500-ext.c | 22 +++++++++++----------- include/linux/regulator/ab8500.h | 2 ++ 3 files changed, 14 insertions(+), 12 deletions(-) diff --git a/arch/arm/mach-ux500/board-mop500-regulators.c b/arch/arm/mach-ux500/board-mop500-regulators.c index c58fc86..72fb449 100644 --- a/arch/arm/mach-ux500/board-mop500-regulators.c +++ b/arch/arm/mach-ux500/board-mop500-regulators.c @@ -280,7 +280,7 @@ static struct ab8500_regulator_reg_init ab8500_reg_init[] = { /* * VextSupply1Regu = HW control * VextSupply2Regu = HW control - * VextSupply3Regu = HW control + * VextSupply3Regu = force HP (-> STBB2=LP and TPS=LP) * ExtSupply2Bypass = ExtSupply12LPn ball is 0 when Ena is 0 * ExtSupply3Bypass = ExtSupply3LPn ball is 0 when Ena is 0 */ diff --git a/drivers/regulator/ab8500-ext.c b/drivers/regulator/ab8500-ext.c index ffcb96e..aa55a05 100644 --- a/drivers/regulator/ab8500-ext.c +++ b/drivers/regulator/ab8500-ext.c @@ -28,7 +28,7 @@ * struct ab8500_ext_regulator_info - ab8500 regulator information * @dev: device pointer * @desc: regulator description - * @regulator_dev: regulator device + * @rdev: regulator device * @is_enabled: status of regulator (on/off) * @fixed_uV: typical voltage (for fixed voltage supplies) * @update_bank: bank to control on/off @@ -44,7 +44,7 @@ struct ab8500_ext_regulator_info { struct device *dev; struct regulator_desc desc; - struct regulator_dev *regulator; + struct regulator_dev *rdev; bool is_enabled; int fixed_uV; u8 update_bank; @@ -69,7 +69,7 @@ static int ab8500_ext_regulator_enable(struct regulator_dev *rdev) info->update_bank, info->update_reg, info->update_mask, info->update_val); if (ret < 0) - dev_err(rdev_get_dev(rdev), + dev_err(rdev_get_dev(info->rdev), "couldn't set enable bits for regulator\n"); info->is_enabled = true; @@ -96,7 +96,7 @@ static int ab8500_ext_regulator_disable(struct regulator_dev *rdev) info->update_bank, info->update_reg, info->update_mask, 0x0); if (ret < 0) - dev_err(rdev_get_dev(rdev), + dev_err(rdev_get_dev(info->rdev), "couldn't set disable bits for regulator\n"); info->is_enabled = false; @@ -249,21 +249,21 @@ int ab8500_ext_regulator_init(struct platform_device *pdev) info->dev = &pdev->dev; /* register regulator with framework */ - info->regulator = regulator_register(&info->desc, &pdev->dev, + info->rdev = regulator_register(&info->desc, &pdev->dev, &pdata->ext_regulator[i], info, NULL); - if (IS_ERR(info->regulator)) { - err = PTR_ERR(info->regulator); + if (IS_ERR(info->rdev)) { + err = PTR_ERR(info->rdev); dev_err(&pdev->dev, "failed to register regulator %s\n", info->desc.name); /* when we fail, un-register all earlier regulators */ while (--i >= 0) { info = &ab8500_ext_regulator_info[i]; - regulator_unregister(info->regulator); + regulator_unregister(info->rdev); } return err; } - dev_dbg(rdev_get_dev(info->regulator), + dev_dbg(rdev_get_dev(info->rdev), "%s-probed\n", info->desc.name); } @@ -278,10 +278,10 @@ int ab8500_ext_regulator_exit(struct platform_device *pdev) struct ab8500_ext_regulator_info *info = NULL; info = &ab8500_ext_regulator_info[i]; - dev_vdbg(rdev_get_dev(info->regulator), + dev_vdbg(rdev_get_dev(info->rdev), "%s-remove\n", info->desc.name); - regulator_unregister(info->regulator); + regulator_unregister(info->rdev); } return 0; diff --git a/include/linux/regulator/ab8500.h b/include/linux/regulator/ab8500.h index 63d2c4e..e9522c9 100644 --- a/include/linux/regulator/ab8500.h +++ b/include/linux/regulator/ab8500.h @@ -160,6 +160,7 @@ enum ab8500_ext_regulator_id { AB8500_NUM_EXT_REGULATORS, }; +/* AB8500 regulator platform data */ struct ab8500_regulator_platform_data { int num_reg_init; struct ab8500_regulator_reg_init *reg_init; @@ -169,6 +170,7 @@ struct ab8500_regulator_platform_data { struct regulator_init_data *ext_regulator; }; +/* AB8500 external regulator functions (internal) */ #ifdef CONFIG_REGULATOR_AB8500_EXT int ab8500_ext_regulator_init(struct platform_device *pdev); int ab8500_ext_regulator_exit(struct platform_device *pdev);