From patchwork Thu Mar 28 16:11:29 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 15749 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 AE7E223E10 for ; Thu, 28 Mar 2013 16:12:58 +0000 (UTC) Received: from mail-ve0-f180.google.com (mail-ve0-f180.google.com [209.85.128.180]) by fiordland.canonical.com (Postfix) with ESMTP id 6BE01A18890 for ; Thu, 28 Mar 2013 16:12:58 +0000 (UTC) Received: by mail-ve0-f180.google.com with SMTP id c13so6235766vea.39 for ; Thu, 28 Mar 2013 09:12:58 -0700 (PDT) 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=zMlaZXk1TjCcvqeDh+OqTA1fFXKzYrC/iA5hHnBxOwk=; b=J/0iqO3zkr/C7S7i5Gsy+jA9i6vY9gKUeBf49QQrpUV5OFYTEb1Kx/Z8f3xY2tEyqI 5+XvJf/FfZqxdzvBjz2kwE1cD7IJyre5FsR6XbUB+jQS5es6wHbun78Mz73mDXp0FjY0 a+HVnX9ayCTeITywUvk2QklW3uD/YoDe2uEJl2LL2+gtYAChSTr5BfuBceLrQN9nsZjq Hr/PSVMP6EjuA+o4Qtr5lO8ce4JZz8R1BYj7f41pesGqYGwtI4Cj0TWoaZkNqj2ez6Z3 +Cp7y1zCjN9cmu9PGWLU6lq++6yYKE3038uPIOoXqDcw8j7Hs5sBeIv4q7I9REKubiYJ XR8g== X-Received: by 10.58.253.33 with SMTP id zx1mr13947945vec.35.1364487178001; Thu, 28 Mar 2013 09:12:58 -0700 (PDT) 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.59.4.204 with SMTP id cg12csp22449ved; Thu, 28 Mar 2013 09:12:57 -0700 (PDT) X-Received: by 10.194.77.110 with SMTP id r14mr39714307wjw.2.1364487171754; Thu, 28 Mar 2013 09:12:51 -0700 (PDT) Received: from mail-wi0-x22d.google.com ([2a00:1450:400c:c05::22d]) by mx.google.com with ESMTPS id ni7si4314485wic.103.2013.03.28.09.12.51 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 28 Mar 2013 09:12:51 -0700 (PDT) Received-SPF: neutral (google.com: 2a00:1450:400c:c05::22d is neither permitted nor denied by best guess record for domain of lee.jones@linaro.org) client-ip=2a00:1450:400c:c05::22d; Authentication-Results: mx.google.com; spf=neutral (google.com: 2a00:1450:400c:c05::22d 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-wi0-f173.google.com with SMTP id ez12so3479009wid.0 for ; Thu, 28 Mar 2013 09:12:51 -0700 (PDT) X-Received: by 10.180.77.226 with SMTP id v2mr17246454wiw.33.1364487170130; Thu, 28 Mar 2013 09:12:50 -0700 (PDT) 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 o5sm16765926wix.3.2013.03.28.09.12.48 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 28 Mar 2013 09:12:49 -0700 (PDT) From: Lee Jones To: linux-kernel@vger.kernel.org, broonie@opensource.wolfsonmicro.com Cc: Lee Jones Subject: [PATCH 29/33] regulator: ab8500: Remove the need for a 'delay' property Date: Thu, 28 Mar 2013 16:11:29 +0000 Message-Id: <1364487093-19551-30-git-send-email-lee.jones@linaro.org> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1364487093-19551-1-git-send-email-lee.jones@linaro.org> References: <1364487093-19551-1-git-send-email-lee.jones@linaro.org> X-Gm-Message-State: ALoCoQni0R99/Pfn+j9YB14b9li4h8bzYOp3bL1DrTBZ0DToNoCFUXfmY5jSWvnf3WeisDuSyyvF The regulator framework now has provisions to read a regulator's start-up time via the 'enable_time' attribute. So let's remove all 'enable_time'/'delay' duplication and just stick with 'enable_time' from now on. Signed-off-by: Lee Jones --- drivers/regulator/ab8500.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/drivers/regulator/ab8500.c b/drivers/regulator/ab8500.c index 8a9cd45..7892a51 100644 --- a/drivers/regulator/ab8500.c +++ b/drivers/regulator/ab8500.c @@ -654,7 +654,7 @@ static int ab8500_regulator_set_voltage_time_sel(struct regulator_dev *rdev, { struct ab8500_regulator_info *info = rdev_get_drvdata(rdev); - return info->delay; + return info->desc.enable_time; } static struct regulator_ops ab8500_regulator_volt_mode_ops = { @@ -1108,7 +1108,6 @@ static struct ab8500_regulator_info .volt_table = fixed_2000000_voltage, .enable_time = 10000, }, - .delay = 10000, .load_lp_uA = 1000, .update_bank = 0x03, .update_reg = 0x80, @@ -1374,7 +1373,6 @@ static struct ab8500_regulator_info .volt_table = fixed_2000000_voltage, .enable_time = 10000, }, - .delay = 10000, .load_lp_uA = 1000, .update_bank = 0x03, .update_reg = 0x80, @@ -1672,7 +1670,6 @@ static struct ab8500_regulator_info .n_voltages = 1, .enable_time = 10000, }, - .delay = 10000, .load_lp_uA = 1000, .update_bank = 0x03, .update_reg = 0x80,