From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754136AbaIKXRh (ORCPT ); Thu, 11 Sep 2014 19:17:37 -0400 Received: from mga02.intel.com ([134.134.136.20]:52864 "EHLO mga02.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752744AbaIKXRe (ORCPT ); Thu, 11 Sep 2014 19:17:34 -0400 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.04,508,1406617200"; d="scan'208";a="601722824" From: Jacob Pan To: IIO , LKML , DEVICE TREE , Lee Jones Cc: Carlo Caione , Srinivas Pandruvada , Aaron Lu , Alan Cox , Jean Delvare , Samuel Ortiz , Liam Girdwood , Mark Brown , Grant Likely , Greg Kroah-Hartman , Rob Herring , Lars-Peter Clausen , Hartmut Knaack , Fugang Duan , Arnd Bergmann , Zubair Lutfullah , Sebastian Reichel , Johannes Thumshirn , Philippe Reynes , Angelo Compagnucci , Doug Anderson , Ramakrishna Pallala , Peter Meerwald , Maxime Ripard , Jacob Pan Subject: [PATCH v3 3/5] regulator/axp20x: use axp2xx consolidated header Date: Thu, 11 Sep 2014 16:15:55 -0700 Message-Id: <1410477357-6407-4-git-send-email-jacob.jun.pan@linux.intel.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1410477357-6407-1-git-send-email-jacob.jun.pan@linux.intel.com> References: <1410477357-6407-1-git-send-email-jacob.jun.pan@linux.intel.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org AXP20x driver has been extended to support axp288 variant. Header file and common data structures has also been renamed to suit the new scope of devices supported. This patch makes use of the renamed header and structure. Acked-by: Mark Brown Signed-off-by: Jacob Pan --- drivers/regulator/axp20x-regulator.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/regulator/axp20x-regulator.c b/drivers/regulator/axp20x-regulator.c index 004aadb..c9b6803 100644 --- a/drivers/regulator/axp20x-regulator.c +++ b/drivers/regulator/axp20x-regulator.c @@ -20,7 +20,7 @@ #include #include #include -#include +#include #include #include @@ -161,7 +161,7 @@ static struct of_regulator_match axp20x_matches[] = { static int axp20x_set_dcdc_freq(struct platform_device *pdev, u32 dcdcfreq) { - struct axp20x_dev *axp20x = dev_get_drvdata(pdev->dev.parent); + struct axp2xx_dev *axp20x = dev_get_drvdata(pdev->dev.parent); if (dcdcfreq < 750) { dcdcfreq = 750; @@ -232,7 +232,7 @@ static int axp20x_set_dcdc_workmode(struct regulator_dev *rdev, int id, u32 work static int axp20x_regulator_probe(struct platform_device *pdev) { struct regulator_dev *rdev; - struct axp20x_dev *axp20x = dev_get_drvdata(pdev->dev.parent); + struct axp2xx_dev *axp20x = dev_get_drvdata(pdev->dev.parent); struct regulator_config config = { }; struct regulator_init_data *init_data; int ret, i; -- 1.9.1