From: Wolfram Sang <wsa+renesas@sang-engineering.com>
To: linux-kernel@vger.kernel.org
Cc: linux-renesas-soc@vger.kernel.org,
Lee Jones <lee.jones@linaro.org>, Mark Brown <broonie@kernel.org>,
Support Opensource <support.opensource@diasemi.com>,
Wolfram Sang <wsa+renesas@sang-engineering.com>
Subject: [PATCH 3/6] mfd: da9063: remove platform_data support
Date: Mon, 18 Mar 2019 16:47:55 +0100 [thread overview]
Message-ID: <20190318154759.21978-4-wsa+renesas@sang-engineering.com> (raw)
In-Reply-To: <20190318154759.21978-1-wsa+renesas@sang-engineering.com>
There are no in-kernel users anymore, so remove this outdated interface.
Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
---
drivers/mfd/da9063-core.c | 20 ++------------------
drivers/mfd/da9063-i2c.c | 1 -
drivers/mfd/da9063-irq.c | 1 -
3 files changed, 2 insertions(+), 20 deletions(-)
diff --git a/drivers/mfd/da9063-core.c b/drivers/mfd/da9063-core.c
index 6e4ce49b4405..65ca288b0c90 100644
--- a/drivers/mfd/da9063-core.c
+++ b/drivers/mfd/da9063-core.c
@@ -26,7 +26,6 @@
#include <linux/regmap.h>
#include <linux/mfd/da9063/core.h>
-#include <linux/mfd/da9063/pdata.h>
#include <linux/mfd/da9063/registers.h>
#include <linux/proc_fs.h>
@@ -165,7 +164,6 @@ static int da9063_clear_fault_log(struct da9063 *da9063)
int da9063_device_init(struct da9063 *da9063, unsigned int irq)
{
- struct da9063_pdata *pdata = da9063->dev->platform_data;
int model, variant_id, variant_code;
int ret;
@@ -173,24 +171,10 @@ int da9063_device_init(struct da9063 *da9063, unsigned int irq)
if (ret < 0)
dev_err(da9063->dev, "Cannot clear fault log\n");
- if (pdata) {
- da9063->flags = pdata->flags;
- da9063->irq_base = pdata->irq_base;
- } else {
- da9063->flags = 0;
- da9063->irq_base = -1;
- }
+ da9063->flags = 0;
+ da9063->irq_base = -1;
da9063->chip_irq = irq;
- if (pdata && pdata->init != NULL) {
- ret = pdata->init(da9063);
- if (ret != 0) {
- dev_err(da9063->dev,
- "Platform initialization failed.\n");
- return ret;
- }
- }
-
ret = regmap_read(da9063->regmap, DA9063_REG_CHIP_ID, &model);
if (ret < 0) {
dev_err(da9063->dev, "Cannot read chip model id.\n");
diff --git a/drivers/mfd/da9063-i2c.c b/drivers/mfd/da9063-i2c.c
index 50a24b1921d0..5f707b100e69 100644
--- a/drivers/mfd/da9063-i2c.c
+++ b/drivers/mfd/da9063-i2c.c
@@ -22,7 +22,6 @@
#include <linux/mfd/core.h>
#include <linux/mfd/da9063/core.h>
-#include <linux/mfd/da9063/pdata.h>
#include <linux/mfd/da9063/registers.h>
#include <linux/of.h>
diff --git a/drivers/mfd/da9063-irq.c b/drivers/mfd/da9063-irq.c
index ecc0c8ce6c58..ac02c31c5802 100644
--- a/drivers/mfd/da9063-irq.c
+++ b/drivers/mfd/da9063-irq.c
@@ -19,7 +19,6 @@
#include <linux/interrupt.h>
#include <linux/regmap.h>
#include <linux/mfd/da9063/core.h>
-#include <linux/mfd/da9063/pdata.h>
#define DA9063_REG_EVENT_A_OFFSET 0
#define DA9063_REG_EVENT_B_OFFSET 1
--
2.11.0
next prev parent reply other threads:[~2019-03-18 15:49 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-03-18 15:47 [PATCH 0/6] mfd: da9063: remove platform_data Wolfram Sang
2019-03-18 15:47 ` [PATCH 1/6] regulator: da9063: remove platform_data support Wolfram Sang
2019-03-19 12:49 ` Simon Horman
2019-03-29 10:57 ` Steve Twiss
2019-03-18 15:47 ` [PATCH 2/6] input: da9063_onkey: " Wolfram Sang
2019-03-19 12:49 ` Simon Horman
2019-03-29 10:58 ` Steve Twiss
2019-04-03 9:24 ` Wolfram Sang
2019-03-18 15:47 ` Wolfram Sang [this message]
2019-03-19 12:25 ` [PATCH 3/6] mfd: da9063: " Simon Horman
2019-03-25 20:22 ` Wolfram Sang
2019-03-19 12:49 ` Simon Horman
2019-03-29 10:58 ` Steve Twiss
2019-04-03 8:02 ` Lee Jones
2019-03-18 15:47 ` [PATCH 4/6] regulator: da9063: move definitions out of a header into the driver Wolfram Sang
2019-03-19 12:49 ` Simon Horman
2019-03-19 13:01 ` Mark Brown
2019-04-03 9:22 ` Wolfram Sang
2019-04-03 10:07 ` Mark Brown
2019-03-29 11:00 ` Steve Twiss
2019-03-18 15:47 ` [PATCH 5/6] mfd: da9063: remove leftover platform_data definitions Wolfram Sang
2019-03-19 12:49 ` Simon Horman
2019-03-29 11:00 ` Steve Twiss
2019-04-03 8:07 ` Lee Jones
2019-04-03 8:50 ` Wolfram Sang
2019-04-03 9:03 ` Lee Jones
2019-03-18 15:47 ` [PATCH 6/6] regulator: da9063: platform_data is gone, depend on OF Wolfram Sang
2019-03-19 12:50 ` Simon Horman
2019-03-29 11:01 ` Steve Twiss
2019-03-18 16:34 ` [PATCH 0/6] mfd: da9063: remove platform_data Steve Twiss
2019-03-29 11:02 ` Steve Twiss
2019-03-29 11:27 ` Wolfram Sang
2019-03-29 11:28 ` Steve Twiss
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=20190318154759.21978-4-wsa+renesas@sang-engineering.com \
--to=wsa+renesas@sang-engineering.com \
--cc=broonie@kernel.org \
--cc=lee.jones@linaro.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-renesas-soc@vger.kernel.org \
--cc=support.opensource@diasemi.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).