From patchwork Mon Jun 30 15:57:35 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nishanth Menon X-Patchwork-Id: 32769 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ie0-f200.google.com (mail-ie0-f200.google.com [209.85.223.200]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 86630203C0 for ; Mon, 30 Jun 2014 15:59:31 +0000 (UTC) Received: by mail-ie0-f200.google.com with SMTP id tr6sf53850612ieb.3 for ; Mon, 30 Jun 2014 08:59:31 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:sender:precedence:list-id :x-original-sender:x-original-authentication-results:mailing-list :list-post:list-help:list-archive:list-unsubscribe:content-type; bh=HykumE3FEuwC4fsw/bSImZbT+/q0GumI+I/o7zMqWQY=; b=A1efpIyPNumk3Lzaou+xgG8TGiJ/sv6Q9sHu9PNHPNLv89l5NlzW7Ed4s3BehSr7tY wHg7iI37YgSDSNw8PwNaco+28kFxaM0e0lgdmCqiSWI/mEGA4A2Lp4Y8A4XRxzHnGjrB QoOysKDkUnERTDahh3mH5aL0SnRXweax+U3Qn6pO8xKBcvoAOLcpsL3FZ/c5ZIESDxKr TIKimUp0Us6tpzTaY2oRo90wbQl5Aor71bzXHfuokZIy8bPjICFg7wj1I7eiP7UlxMjt GqfKAxNF3pfSfo7ilX3bew1JjF4U+IOQAj99UlySlpyZN0dy5juMmwUFCu7K0mGuvzxW 2Kgw== X-Gm-Message-State: ALoCoQkiq/j1gR6nk6ZeHa3ULIzw4k0mjp+9RaKEJeEhGVSaFL/ZFbx2DKJd1jGXua1TowUbJAAh X-Received: by 10.43.94.71 with SMTP id bx7mr20773367icc.2.1404143971062; Mon, 30 Jun 2014 08:59:31 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.48.145 with SMTP id o17ls1537470qga.37.gmail; Mon, 30 Jun 2014 08:59:30 -0700 (PDT) X-Received: by 10.220.196.82 with SMTP id ef18mr636887vcb.78.1404143970897; Mon, 30 Jun 2014 08:59:30 -0700 (PDT) Received: from mail-vc0-f170.google.com (mail-vc0-f170.google.com [209.85.220.170]) by mx.google.com with ESMTPS id yd2si10187521vdb.91.2014.06.30.08.59.30 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 30 Jun 2014 08:59:30 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.170 as permitted sender) client-ip=209.85.220.170; Received: by mail-vc0-f170.google.com with SMTP id hy10so7762219vcb.29 for ; Mon, 30 Jun 2014 08:59:30 -0700 (PDT) X-Received: by 10.52.88.44 with SMTP id bd12mr279031vdb.86.1404143970809; Mon, 30 Jun 2014 08:59:30 -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 tc5csp150455vcb; Mon, 30 Jun 2014 08:59:30 -0700 (PDT) X-Received: by 10.68.219.162 with SMTP id pp2mr53029975pbc.47.1404143970048; Mon, 30 Jun 2014 08:59:30 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id jc4si13706269pbb.80.2014.06.30.08.59.29; Mon, 30 Jun 2014 08:59:29 -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 S1756178AbaF3P7S (ORCPT + 27 others); Mon, 30 Jun 2014 11:59:18 -0400 Received: from comal.ext.ti.com ([198.47.26.152]:36563 "EHLO comal.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755185AbaF3P5t (ORCPT ); Mon, 30 Jun 2014 11:57:49 -0400 Received: from dflxv15.itg.ti.com ([128.247.5.124]) by comal.ext.ti.com (8.13.7/8.13.7) with ESMTP id s5UFvh6q007024; Mon, 30 Jun 2014 10:57:43 -0500 Received: from DFLE73.ent.ti.com (dfle73.ent.ti.com [128.247.5.110]) by dflxv15.itg.ti.com (8.14.3/8.13.8) with ESMTP id s5UFvhrD026726; Mon, 30 Jun 2014 10:57:43 -0500 Received: from dflp32.itg.ti.com (10.64.6.15) by DFLE73.ent.ti.com (128.247.5.110) with Microsoft SMTP Server id 14.3.174.1; Mon, 30 Jun 2014 10:57:43 -0500 Received: from localhost (ileax41-snat.itg.ti.com [10.172.224.153]) by dflp32.itg.ti.com (8.14.3/8.13.8) with ESMTP id s5UFvhpG030389; Mon, 30 Jun 2014 10:57:43 -0500 From: Nishanth Menon To: Liam Girdwood , Mark Brown , Samuel Ortiz , Lee Jones , Keerthy J CC: Tero Kristo , , , , Nishanth Menon Subject: [PATCH V2 2/6] regulator: palmas: Rename reg_info to palmas_reg_info Date: Mon, 30 Jun 2014 10:57:35 -0500 Message-ID: <1404143859-8160-3-git-send-email-nm@ti.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1404143859-8160-1-git-send-email-nm@ti.com> References: <1404143859-8160-1-git-send-email-nm@ti.com> MIME-Version: 1.0 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: nm@ti.com 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.170 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: , reg_info is a generic term which might cause conflict at a later point in time. To prevent such a thing from occuring in future, rename to palmas_reg_info. Signed-off-by: Nishanth Menon Acked-by: Lee Jones --- drivers/regulator/palmas-regulator.c | 4 ++-- include/linux/mfd/palmas.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/regulator/palmas-regulator.c b/drivers/regulator/palmas-regulator.c index 91f60fa..05f11b9 100644 --- a/drivers/regulator/palmas-regulator.c +++ b/drivers/regulator/palmas-regulator.c @@ -41,7 +41,7 @@ static const struct regulator_linear_range smps_high_ranges[] = { REGULATOR_LINEAR_RANGE(3300000, 0x7A, 0x7f, 0), }; -static struct regs_info palmas_regs_info[] = { +static struct palmas_regs_info palmas_regs_info[] = { { .name = "SMPS12", .sname = "smps1-in", @@ -227,7 +227,7 @@ static struct regs_info palmas_regs_info[] = { }, }; -static struct regs_info tps65917_regs_info[] = { +static struct palmas_regs_info tps65917_regs_info[] = { { .name = "SMPS1", .sname = "smps1-in", diff --git a/include/linux/mfd/palmas.h b/include/linux/mfd/palmas.h index 1a045ba..fb0390a 100644 --- a/include/linux/mfd/palmas.h +++ b/include/linux/mfd/palmas.h @@ -102,7 +102,7 @@ struct palmas_sleep_requestor_info { int bit_pos; }; -struct regs_info { +struct palmas_regs_info { char *name; char *sname; u8 vsel_addr; @@ -117,7 +117,7 @@ struct palmas_pmic_driver_data { int ldo_begin; int ldo_end; int max_reg; - struct regs_info *palmas_regs_info; + struct palmas_regs_info *palmas_regs_info; struct of_regulator_match *palmas_matches; struct palmas_sleep_requestor_info *sleep_req_info; int (*smps_register)(struct palmas_pmic *pmic,