From: Laxman Dewangan <ldewangan@nvidia.com>
To: <sameo@linux.intel.com>, <broonie@opensource.wolfsonmicro.com>,
<lrg@ti.com>
Cc: <linux-kernel@vger.kernel.org>, Laxman Dewangan <ldewangan@nvidia.com>
Subject: [PATCH] regulator: tps65910: fixed build error
Date: Fri, 18 May 2012 17:27:25 +0530 [thread overview]
Message-ID: <1337342245-23154-1-git-send-email-ldewangan@nvidia.com> (raw)
Some of the api calls are not changed and it leads
to following build error:
/regulator/tps65910-regulator.c: In function 'tps65910_enable':
/regulator/tps65910-regulator.c:491:2: error: implicit declaration of
function 'tps65910_set_bits'
/regulator/tps65910-regulator.c: In function 'tps65910_disable':
/regulator/tps65910-regulator.c:504:2: error: implicit declaration of
function 'tps65910_clear_bits'
/regulator/tps65910-regulator.c: In function 'tps65910_get_voltage':
/regulator/tps65910-regulator.c:628:2: warning: passing argument 1 of
'tps65910_reg_read' from incompatible pointer type]
/linux/mfd/tps65910.h:856:19: note: expected 'struct tps65910 *' but
argument is of type 'struct tps65910_reg *'
/regulator/tps65910-regulator.c:628:2: error: too few arguments to
function 'tps65910_reg_read'
cc1: some warnings being treated as errors
Signed-off-by: Laxman Dewangan <ldewangan@nvidia.com>
---
This patch fixes the compilation error in Samuel's tree and should go
through Samuel's for-next.
Some of the function is removed from the regulator for-next and so error
in line number 491 and 504 will not be there but still error at 628 will
be there.
drivers/regulator/tps65910-regulator.c | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/regulator/tps65910-regulator.c b/drivers/regulator/tps65910-regulator.c
index b38fb64..852b05b 100644
--- a/drivers/regulator/tps65910-regulator.c
+++ b/drivers/regulator/tps65910-regulator.c
@@ -488,7 +488,7 @@ static int tps65910_enable(struct regulator_dev *dev)
if (reg < 0)
return reg;
- return tps65910_set_bits(mfd, reg, TPS65910_SUPPLY_STATE_ENABLED);
+ return tps65910_reg_set_bits(mfd, reg, TPS65910_SUPPLY_STATE_ENABLED);
}
static int tps65910_disable(struct regulator_dev *dev)
@@ -501,7 +501,7 @@ static int tps65910_disable(struct regulator_dev *dev)
if (reg < 0)
return reg;
- return tps65910_clear_bits(mfd, reg, TPS65910_SUPPLY_STATE_ENABLED);
+ return tps65910_reg_clear_bits(mfd, reg, TPS65910_SUPPLY_STATE_ENABLED);
}
static int tps65910_enable_time(struct regulator_dev *dev)
@@ -625,7 +625,7 @@ static int tps65910_get_voltage(struct regulator_dev *dev)
if (reg < 0)
return reg;
- value = tps65910_reg_read(pmic, reg);
+ value = tps65910_reg_read_locked(pmic, reg);
if (value < 0)
return value;
--
1.7.1.1
next reply other threads:[~2012-05-18 12:02 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-05-18 11:57 Laxman Dewangan [this message]
2012-05-18 16:37 ` Mark Brown
2012-05-20 15:28 ` Samuel Ortiz
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1337342245-23154-1-git-send-email-ldewangan@nvidia.com \
--to=ldewangan@nvidia.com \
--cc=broonie@opensource.wolfsonmicro.com \
--cc=linux-kernel@vger.kernel.org \
--cc=lrg@ti.com \
--cc=sameo@linux.intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Powered by JetHome