From patchwork Wed Feb 6 10:53:32 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 14587 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 017CB2423C for ; Wed, 6 Feb 2013 10:55:09 +0000 (UTC) Received: from mail-vc0-f181.google.com (mail-vc0-f181.google.com [209.85.220.181]) by fiordland.canonical.com (Postfix) with ESMTP id 792CAA187D8 for ; Wed, 6 Feb 2013 10:55:08 +0000 (UTC) Received: by mail-vc0-f181.google.com with SMTP id d16so751017vcd.12 for ; Wed, 06 Feb 2013 02:55:08 -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=6LCtvlBXpjBTbTF6O0NPzSah+H1idmXqkJdrLsstNec=; b=GzSQYO82h9cNmHE4XoTnYLaqHP1Gewn2td/vjOxtluKJq/308qCuY/rm4G+Th5s9HD 5YIdQfNcjdwwUje8WhveZ/Z2ufbeimd3E2rgn7GsYhd5v8b7zope2xZJm6/aPrHHcRwA f0X33XVI41crXh1rAVkj8iWMCvoRZuVHoXjmQlIlMlll+ix5LhTTpkl9TIoQpUz9bmfb MinTBkZvqVj0nrm8dv2NI8+lRgsFc13Wq7r9POLx9e3pE4FtIp9t/2SyyYqOhTOFBE8x cS93dT6EDO2ZlakylTb15LcUq4xoUuhFuSpkREm7QThMdRc2pkAsoieyOQAOmZHiz4W3 eGGQ== X-Received: by 10.58.8.82 with SMTP id p18mr28015597vea.54.1360148107949; Wed, 06 Feb 2013 02:55:07 -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 zo8csp12934vec; Wed, 6 Feb 2013 02:55:03 -0800 (PST) X-Received: by 10.194.19.170 with SMTP id g10mr48832638wje.56.1360148089342; Wed, 06 Feb 2013 02:54:49 -0800 (PST) Received: from mail-wg0-f44.google.com (mail-wg0-f44.google.com [74.125.82.44]) by mx.google.com with ESMTPS id dj2si502748wib.100.2013.02.06.02.54.48 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 06 Feb 2013 02:54:49 -0800 (PST) Received-SPF: neutral (google.com: 74.125.82.44 is neither permitted nor denied by best guess record for domain of lee.jones@linaro.org) client-ip=74.125.82.44; Authentication-Results: mx.google.com; spf=neutral (google.com: 74.125.82.44 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-f44.google.com with SMTP id dr12so967591wgb.11 for ; Wed, 06 Feb 2013 02:54:48 -0800 (PST) X-Received: by 10.180.84.165 with SMTP id a5mr4184008wiz.6.1360148088797; Wed, 06 Feb 2013 02:54:48 -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 be1sm2406649wib.10.2013.02.06.02.54.47 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 06 Feb 2013 02:54:48 -0800 (PST) From: Lee Jones To: linux-kernel@vger.kernel.org Cc: broonie@opensource.wolfsonmicro.com, linus.walleij@linaro.org, Lee Jones Subject: [PATCH 10/49] regulator: ab8500-ext: Cosmetic changes Date: Wed, 6 Feb 2013 10:53:32 +0000 Message-Id: <1360148051-7560-11-git-send-email-lee.jones@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1360148051-7560-1-git-send-email-lee.jones@linaro.org> References: <1360148051-7560-1-git-send-email-lee.jones@linaro.org> X-Gm-Message-State: ALoCoQn/fH4248sY0Chh+SShYcfHWh9vIaEz4ipyZco3g4GLukZFJ/jHGCtzKGOB+kkGXTg8x7Gm Variable is renamed in driver. Some comments are added. Signed-off-by: Lee Jones --- drivers/regulator/ab8500-ext.c | 22 +++++++++++----------- include/linux/regulator/ab8500.h | 2 ++ 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/drivers/regulator/ab8500-ext.c b/drivers/regulator/ab8500-ext.c index 5f6ac8a..2157c11 100644 --- a/drivers/regulator/ab8500-ext.c +++ b/drivers/regulator/ab8500-ext.c @@ -27,7 +27,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 @@ -43,7 +43,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; @@ -68,7 +68,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; @@ -95,7 +95,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; @@ -347,21 +347,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); } @@ -376,10 +376,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 6de36b5..cefd9de 100644 --- a/include/linux/regulator/ab8500.h +++ b/include/linux/regulator/ab8500.h @@ -162,6 +162,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; @@ -171,6 +172,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);