From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758593AbcB1PyM (ORCPT ); Sun, 28 Feb 2016 10:54:12 -0500 Received: from relay4-d.mail.gandi.net ([217.70.183.196]:44278 "EHLO relay4-d.mail.gandi.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758471AbcB1PyI (ORCPT ); Sun, 28 Feb 2016 10:54:08 -0500 From: Maarten ter Huurne To: Wenyou Yang Cc: Zubair Lutfullah Kakakhel , Liam Girdwood , Mark Brown , linux-kernel@vger.kernel.org, Maarten ter Huurne Subject: [PATCH 4/7] regulator: act8865: Rename platform_data field to init_data Date: Sun, 28 Feb 2016 16:53:26 +0100 Message-Id: <1456674809-16422-4-git-send-email-maarten@treewalker.org> X-Mailer: git-send-email 2.6.2 In-Reply-To: <1456674809-16422-1-git-send-email-maarten@treewalker.org> References: <1456674809-16422-1-git-send-email-maarten@treewalker.org> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Make the field name match its type. Signed-off-by: Maarten ter Huurne --- drivers/regulator/act8865-regulator.c | 4 ++-- include/linux/regulator/act8865.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/regulator/act8865-regulator.c b/drivers/regulator/act8865-regulator.c index 477d60c..0d1b235 100644 --- a/drivers/regulator/act8865-regulator.c +++ b/drivers/regulator/act8865-regulator.c @@ -418,7 +418,7 @@ static int act8865_pdata_from_dt(struct device *dev, for (i = 0; i < num_matches; i++) { regulator->id = i; regulator->name = matches[i].name; - regulator->platform_data = matches[i].init_data; + regulator->init_data = matches[i].init_data; of_node[i] = matches[i].of_node; regulator++; } @@ -445,7 +445,7 @@ static struct regulator_init_data for (i = 0; i < pdata->num_regulators; i++) { if (pdata->regulators[i].id == id) - return pdata->regulators[i].platform_data; + return pdata->regulators[i].init_data; } return NULL; diff --git a/include/linux/regulator/act8865.h b/include/linux/regulator/act8865.h index 15fa8f2..2eb3860 100644 --- a/include/linux/regulator/act8865.h +++ b/include/linux/regulator/act8865.h @@ -68,12 +68,12 @@ enum { * act8865_regulator_data - regulator data * @id: regulator id * @name: regulator name - * @platform_data: regulator init data + * @init_data: regulator init data */ struct act8865_regulator_data { int id; const char *name; - struct regulator_init_data *platform_data; + struct regulator_init_data *init_data; }; /** -- 2.6.2