From: Keerthy <j-keerthy@ti.com>
To: broonie@kernel.org, tony@atomide.com, robh+dt@kernel.org,
mark.rutland@arm.com, lee.jones@linaro.org
Cc: nm@ti.com, devicetree@vger.kernel.org, nikita@compulab.co.il,
j-keerthy@ti.com, linux-kernel@vger.kernel.org,
linux-omap@vger.kernel.org, linux-arm-kernel@lists.infradead.org
Subject: [PATCH 1/8] mfd: tps65218: Remove redundant read wrapper
Date: Wed, 11 May 2016 11:18:04 +0530 [thread overview]
Message-ID: <1462945691-904-2-git-send-email-j-keerthy@ti.com> (raw)
In-Reply-To: <1462945691-904-1-git-send-email-j-keerthy@ti.com>
Currently read directly calls the repmap read function. Hence
remove the redundant wrapper and use regmap read wherever
needed.
Signed-off-by: Keerthy <j-keerthy@ti.com>
---
drivers/mfd/tps65218.c | 16 +---------------
drivers/regulator/tps65218-regulator.c | 3 ++-
include/linux/mfd/tps65218.h | 2 --
3 files changed, 3 insertions(+), 18 deletions(-)
diff --git a/drivers/mfd/tps65218.c b/drivers/mfd/tps65218.c
index 80b9dc3..f20a531 100644
--- a/drivers/mfd/tps65218.c
+++ b/drivers/mfd/tps65218.c
@@ -34,20 +34,6 @@
#define TPS65218_PASSWORD_REGS_UNLOCK 0x7D
/**
- * tps65218_reg_read: Read a single tps65218 register.
- *
- * @tps: Device to read from.
- * @reg: Register to read.
- * @val: Contians the value
- */
-int tps65218_reg_read(struct tps65218 *tps, unsigned int reg,
- unsigned int *val)
-{
- return regmap_read(tps->regmap, reg, val);
-}
-EXPORT_SYMBOL_GPL(tps65218_reg_read);
-
-/**
* tps65218_reg_write: Write a single tps65218 register.
*
* @tps65218: Device to write to.
@@ -93,7 +79,7 @@ static int tps65218_update_bits(struct tps65218 *tps, unsigned int reg,
int ret;
unsigned int data;
- ret = tps65218_reg_read(tps, reg, &data);
+ ret = regmap_read(tps->regmap, reg, &data);
if (ret) {
dev_err(tps->dev, "Read from reg 0x%x failed\n", reg);
return ret;
diff --git a/drivers/regulator/tps65218-regulator.c b/drivers/regulator/tps65218-regulator.c
index a5e5634..679ab2f 100644
--- a/drivers/regulator/tps65218-regulator.c
+++ b/drivers/regulator/tps65218-regulator.c
@@ -22,6 +22,7 @@
#include <linux/err.h>
#include <linux/platform_device.h>
#include <linux/of_device.h>
+#include <linux/regmap.h>
#include <linux/regulator/of_regulator.h>
#include <linux/regulator/driver.h>
#include <linux/regulator/machine.h>
@@ -224,7 +225,7 @@ static int tps65218_pmic_get_current_limit(struct regulator_dev *dev)
unsigned int index;
struct tps65218 *tps = rdev_get_drvdata(dev);
- retval = tps65218_reg_read(tps, dev->desc->csel_reg, &index);
+ retval = regmap_read(tps->regmap, dev->desc->csel_reg, &index);
if (retval < 0)
return retval;
diff --git a/include/linux/mfd/tps65218.h b/include/linux/mfd/tps65218.h
index d58f3b5..7c9241f 100644
--- a/include/linux/mfd/tps65218.h
+++ b/include/linux/mfd/tps65218.h
@@ -276,8 +276,6 @@ struct tps65218 {
struct regmap *regmap;
};
-int tps65218_reg_read(struct tps65218 *tps, unsigned int reg,
- unsigned int *val);
int tps65218_reg_write(struct tps65218 *tps, unsigned int reg,
unsigned int val, unsigned int level);
int tps65218_set_bits(struct tps65218 *tps, unsigned int reg,
--
1.9.1
next prev parent reply other threads:[~2016-05-11 5:48 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-05-11 5:48 [PATCH 0/8] regulator: tps65218: Clean ups Keerthy
2016-05-11 5:48 ` Keerthy [this message]
2016-05-11 5:48 ` [PATCH 2/8] Documentation: regulator: tps65218: Update examples Keerthy
[not found] ` <1462945691-904-3-git-send-email-j-keerthy-l0cyMroinI0@public.gmane.org>
2016-05-16 14:48 ` Rob Herring
2016-05-17 3:22 ` Keerthy
2016-05-11 5:48 ` [PATCH 3/8] mfd: tps65218: Use mfd_add_devices instead of of_platform_populate Keerthy
2016-06-03 11:08 ` Keerthy
2016-06-06 9:00 ` Lee Jones
2016-06-08 15:50 ` Lee Jones
2016-06-08 16:09 ` Keerthy
2016-05-11 5:48 ` [PATCH 4/8] regulator: tps65218: Remove all the compatibles Keerthy
2016-05-11 10:21 ` Mark Brown
2016-05-11 5:48 ` [PATCH 5/8] ARM: dts: AM437X-GP-EVM: Remove redundant regulator compatibles Keerthy
[not found] ` <1462945691-904-6-git-send-email-j-keerthy-l0cyMroinI0@public.gmane.org>
2016-05-12 17:08 ` Tony Lindgren
2016-05-11 5:48 ` [PATCH 6/8] ARM: dts: AM437X-SK-EVM: " Keerthy
2016-05-11 5:48 ` [PATCH 7/8] ARM: dts: AM437X-CM-T43: " Keerthy
2016-05-11 5:48 ` [PATCH 8/8] ARM: dts: AM43X-EPOS-EVM: " Keerthy
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=1462945691-904-2-git-send-email-j-keerthy@ti.com \
--to=j-keerthy@ti.com \
--cc=broonie@kernel.org \
--cc=devicetree@vger.kernel.org \
--cc=lee.jones@linaro.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-omap@vger.kernel.org \
--cc=mark.rutland@arm.com \
--cc=nikita@compulab.co.il \
--cc=nm@ti.com \
--cc=robh+dt@kernel.org \
--cc=tony@atomide.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;
as well as URLs for NNTP newsgroup(s).