From patchwork Fri Jul 25 18:09:17 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 34312 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-yh0-f72.google.com (mail-yh0-f72.google.com [209.85.213.72]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 886C0235AB for ; Fri, 25 Jul 2014 18:09:34 +0000 (UTC) Received: by mail-yh0-f72.google.com with SMTP id f73sf15970268yha.11 for ; Fri, 25 Jul 2014 11:09:34 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:date :message-id:subject:sender:precedence:list-id:x-original-sender :x-original-authentication-results:mailing-list:list-post:list-help :list-archive:list-unsubscribe; bh=u41K753kluenVJa2vWgqYP0LDMNzgrdfxD1v49O0/h0=; b=GotzShEdSnKLyfgHbBFIP505Mo7bMECMzHBA7/cB8aP3gpqgxew/EYMXlNZxygw5Sz 5DlLKPbjUwPzM0hNG+RgMO9OhTG8dDDJNodYgL2AUee/25/ukADIsOnS8sTctgf92l8m C1B4jYdG3od666ON8Ntu3pwsysEkqcZlJksbiKXyBEzE2dXzJ7iN77LeTWHUzvtpDhJB I3RSPKSbDxytWtVFZEH7H6iwwOPanfQr9btw25LvWyrZd/xXeGXWLsbRzN4781p8Vtl0 KKbGFMoZYsM0WmX3ao17XZHG8utciazdQMcUgH5DvYY7EWa47LhUPWAcu0q520FeYg2z MKyw== X-Gm-Message-State: ALoCoQlxOwzjBJx5p6hDLXq6MckbAl3edlshPwe9Duk+1eNysFEybxBxzU2PTTYP/3Bq7ssy3Wd0 X-Received: by 10.236.17.234 with SMTP id j70mr7578357yhj.26.1406311774379; Fri, 25 Jul 2014 11:09:34 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.86.112 with SMTP id o103ls1371438qgd.30.gmail; Fri, 25 Jul 2014 11:09:34 -0700 (PDT) X-Received: by 10.52.88.74 with SMTP id be10mr3930318vdb.54.1406311774217; Fri, 25 Jul 2014 11:09:34 -0700 (PDT) Received: from mail-vc0-f169.google.com (mail-vc0-f169.google.com [209.85.220.169]) by mx.google.com with ESMTPS id dj5si8081593vcb.21.2014.07.25.11.09.34 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 25 Jul 2014 11:09:34 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.169 as permitted sender) client-ip=209.85.220.169; Received: by mail-vc0-f169.google.com with SMTP id hu12so7919033vcb.28 for ; Fri, 25 Jul 2014 11:09:34 -0700 (PDT) X-Received: by 10.52.120.38 with SMTP id kz6mr3308438vdb.86.1406311774057; Fri, 25 Jul 2014 11:09:34 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.221.37.5 with SMTP id tc5csp56510vcb; Fri, 25 Jul 2014 11:09:33 -0700 (PDT) X-Received: by 10.66.173.144 with SMTP id bk16mr20898114pac.34.1406311773230; Fri, 25 Jul 2014 11:09:33 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id ib1si9911197pbb.227.2014.07.25.11.09.32 for ; Fri, 25 Jul 2014 11:09:33 -0700 (PDT) Received-SPF: none (google.com: linux-kernel-owner@vger.kernel.org does not designate permitted sender hosts) client-ip=209.132.180.67; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934863AbaGYSJb (ORCPT + 14 others); Fri, 25 Jul 2014 14:09:31 -0400 Received: from mezzanine.sirena.org.uk ([106.187.55.193]:55055 "EHLO mezzanine.sirena.org.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753270AbaGYSJa (ORCPT ); Fri, 25 Jul 2014 14:09:30 -0400 Received: from cpc11-sgyl31-2-0-cust672.sgyl.cable.virginm.net ([94.175.94.161] helo=debutante) by mezzanine.sirena.org.uk with esmtpsa (TLS1.2:RSA_AES_128_CBC_SHA1:128) (Exim 4.80) (envelope-from ) id 1XAjvl-00026j-7G; Fri, 25 Jul 2014 18:09:25 +0000 Received: from broonie by debutante with local (Exim 4.82_1-5b7a7c0-XX) (envelope-from ) id 1XAjvi-0000kJ-Dy; Fri, 25 Jul 2014 19:09:18 +0100 From: Mark Brown To: linux-kernel@vger.kernel.org Cc: linaro-kernel@lists.linaro.org, Mark Brown Date: Fri, 25 Jul 2014 19:09:17 +0100 Message-Id: <1406311757-2834-1-git-send-email-broonie@kernel.org> X-Mailer: git-send-email 2.0.1 X-SA-Exim-Connect-IP: 94.175.94.161 X-SA-Exim-Mail-From: broonie@sirena.org.uk X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on mezzanine.sirena.org.uk X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=ALL_TRUSTED,BAYES_00 autolearn=ham version=3.3.2 Subject: [PATCH] regulator: Add missing statics for stub functions X-SA-Exim-Version: 4.2.1 (built Mon, 26 Dec 2011 16:24:06 +0000) X-SA-Exim-Scanned: Yes (on mezzanine.sirena.org.uk) Sender: linux-kernel-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: broonie@kernel.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.169 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , From: Mark Brown So we don't get multiple definitions. Signed-off-by: Mark Brown --- include/linux/regulator/consumer.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/include/linux/regulator/consumer.h b/include/linux/regulator/consumer.h index 0b1c8d09a6b1..a5937148f8a1 100644 --- a/include/linux/regulator/consumer.h +++ b/include/linux/regulator/consumer.h @@ -460,20 +460,20 @@ static inline int regulator_allow_bypass(struct regulator *regulator, return 0; } -struct regmap *regulator_get_regmap(struct regulator *regulator) +static struct regmap *regulator_get_regmap(struct regulator *regulator) { return ERR_PTR(-EOPNOTSUPP); } -int regulator_get_hardware_vsel_register(struct regulator *regulator, - unsigned *vsel_reg, - unsigned *vsel_mask) +static int regulator_get_hardware_vsel_register(struct regulator *regulator, + unsigned *vsel_reg, + unsigned *vsel_mask) { return -EOPNOTSUPP; } -int regulator_list_hardware_vsel(struct regulator *regulator, - unsigned selector) +static int regulator_list_hardware_vsel(struct regulator *regulator, + unsigned selector) { return -EOPNOTSUPP; }