From patchwork Wed May 22 13:07:05 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 17094 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-gh0-f198.google.com (mail-gh0-f198.google.com [209.85.160.198]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id D9AB5238FE for ; Wed, 22 May 2013 13:08:06 +0000 (UTC) Received: by mail-gh0-f198.google.com with SMTP id r13sf2185694ghr.5 for ; Wed, 22 May 2013 06:07:13 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=mime-version:x-beenthere:x-forwarded-to:x-forwarded-for :delivered-to:from:to:cc:subject:date:message-id:x-mailer :x-gm-message-state:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :x-google-group-id:list-post:list-help:list-archive:list-unsubscribe; bh=DsDdfvdQTgwYXP0haQEqvpy7vwxnTqYYTq2caAgx9P0=; b=iD51uiffL1mkx7Wb+UGtROHKEKlGZFyqeaBkHWM8OtOv4sI6qqMAlul2d46jnmDgiY V+KoKGSy6bc8s4y5EeK9DsFyp5fpbe97s2v3E7DHugi68mH3mhuLXH2fDUFH6JUBQcQV 5Oq0vFBV6uJOW3IhjYiHQhhtxw5fIJzgALKYjexLf0zLAQrZ8AQkcQ5fFa01X0AoEIjC hatH1oQVaDu/INReI6IyTeXP2zZ7kOro1JwdpnfTXzyyW8/FLwo4OyHTGOrvnX7D04NO 98O9aAxzPa516Q3e9cvYMNmZf/URFjGHblchK75K5YPpxUP1pwbJG3AcVAOOOlIZ/AJF 6GUQ== X-Received: by 10.52.103.50 with SMTP id ft18mr1531482vdb.4.1369228033829; Wed, 22 May 2013 06:07:13 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.0.78 with SMTP id 14ls823339qec.10.gmail; Wed, 22 May 2013 06:07:13 -0700 (PDT) X-Received: by 10.58.155.74 with SMTP id vu10mr2766342veb.27.1369228033654; Wed, 22 May 2013 06:07:13 -0700 (PDT) Received: from mail-vc0-f173.google.com (mail-vc0-f173.google.com [209.85.220.173]) by mx.google.com with ESMTPS id tn5si3613479vdc.0.2013.05.22.06.07.13 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 22 May 2013 06:07:13 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.220.173 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.220.173; Received: by mail-vc0-f173.google.com with SMTP id ht10so1281449vcb.4 for ; Wed, 22 May 2013 06:07:13 -0700 (PDT) X-Received: by 10.52.176.65 with SMTP id cg1mr2356531vdc.1.1369228033330; Wed, 22 May 2013 06:07:13 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.220.126.138 with SMTP id c10csp1492vcs; Wed, 22 May 2013 06:07:12 -0700 (PDT) X-Received: by 10.180.109.195 with SMTP id hu3mr14598822wib.13.1369228032065; Wed, 22 May 2013 06:07:12 -0700 (PDT) Received: from mail-wg0-x22c.google.com (mail-wg0-x22c.google.com [2a00:1450:400c:c00::22c]) by mx.google.com with ESMTPS id fu14si5060123wic.34.2013.05.22.06.07.11 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 22 May 2013 06:07:12 -0700 (PDT) Received-SPF: neutral (google.com: 2a00:1450:400c:c00::22c is neither permitted nor denied by best guess record for domain of lee.jones@linaro.org) client-ip=2a00:1450:400c:c00::22c; Received: by mail-wg0-f44.google.com with SMTP id a12so1143727wgh.11 for ; Wed, 22 May 2013 06:07:11 -0700 (PDT) X-Received: by 10.180.185.179 with SMTP id fd19mr14651776wic.1.1369228031513; Wed, 22 May 2013 06:07:11 -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 ESMTPSA id fz8sm28828253wib.2.2013.05.22.06.07.09 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 22 May 2013 06:07:10 -0700 (PDT) From: Lee Jones To: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Cc: arnd@arndb.de, linus.walleij@stericsson.com, srinidhi.kasagar@stericsson.com, Lee Jones , Mark Brown Subject: [PATCH] regulator: ab8500: Remove external regulator init() clauses Date: Wed, 22 May 2013 14:07:05 +0100 Message-Id: <1369228025-17192-1-git-send-email-lee.jones@linaro.org> X-Mailer: git-send-email 1.7.10.4 X-Gm-Message-State: ALoCoQkkO1kq658MS7yEmZTZsf9hdaY9BUTMiwz7oQ9uXEecvkr+k9nGVXFdcOINJsW/BHv/oQQS X-Original-Sender: lee.jones@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.220.173 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Precedence: list Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , The driver no longer needs to worry about which platform can and can't use external regulators successfully. Instead platform code will hold back external regulator initialisation data in the use-cases where the driver isn't applicable. Cc: Mark Brown Signed-off-by: Lee Jones --- drivers/regulator/ab8500.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/drivers/regulator/ab8500.c b/drivers/regulator/ab8500.c index f6656b8..b6270f5 100644 --- a/drivers/regulator/ab8500.c +++ b/drivers/regulator/ab8500.c @@ -3156,12 +3156,10 @@ static int ab8500_regulator_probe(struct platform_device *pdev) return err; } - if (!is_ab8505(ab8500)) { - /* register external regulators (before Vaux1, 2 and 3) */ - err = ab8500_ext_regulator_init(pdev); - if (err) - return err; - } + /* register external regulators (before Vaux1, 2 and 3) */ + err = ab8500_ext_regulator_init(pdev); + if (err) + return err; /* register all regulators */ for (i = 0; i < abx500_regulator.info_size; i++) {