From: Andrzej Hajda <a.hajda@samsung.com>
To: lee.jones@linaro.org
Cc: Andrzej Hajda <a.hajda@samsung.com>,
Rob Herring <rob.herring@calxeda.com>,
Pawel Moll <pawel.moll@arm.com>,
Mark Rutland <mark.rutland@arm.com>,
Stephen Warren <swarren@wwwdotorg.org>,
Ian Campbell <ian.campbell@citrix.com>,
Rob Landley <rob@landley.net>,
Samuel Ortiz <sameo@linux.intel.com>,
Grant Likely <grant.likely@linaro.org>,
Sylwester Nawrocki <s.nawrocki@samsung.com>,
Jonghwa Lee <jonghwa3.lee@samsung.com>,
Kyungmin Park <kyungmin.park@samsung.com>,
devicetree@vger.kernel.org (open list:OPEN FIRMWARE AND...),
linux-kernel@vger.kernel.org (open list)
Subject: [PATCH v3 1/2] max77693: remove device wakeup from driver
Date: Wed, 21 Aug 2013 18:53:33 +0200 [thread overview]
Message-ID: <1377104014-21910-2-git-send-email-a.hajda@samsung.com> (raw)
In-Reply-To: <1377104014-21910-1-git-send-email-a.hajda@samsung.com>
The patch removes wakeup related code from
the driver and plaftorm data - it is already
handled by i2c core using I2C_CLIENT_WAKE flag
from struct i2c_board_info. As a result MFD
itself do not requires platform data.
Signed-off-by: Andrzej Hajda <a.hajda@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
---
drivers/mfd/max77693.c | 10 ----------
include/linux/mfd/max77693-private.h | 1 -
include/linux/mfd/max77693.h | 2 --
3 files changed, 13 deletions(-)
diff --git a/drivers/mfd/max77693.c b/drivers/mfd/max77693.c
index 9e60fed..27f5da3 100644
--- a/drivers/mfd/max77693.c
+++ b/drivers/mfd/max77693.c
@@ -110,15 +110,9 @@ static int max77693_i2c_probe(struct i2c_client *i2c,
const struct i2c_device_id *id)
{
struct max77693_dev *max77693;
- struct max77693_platform_data *pdata = i2c->dev.platform_data;
u8 reg_data;
int ret = 0;
- if (!pdata) {
- dev_err(&i2c->dev, "No platform data found.\n");
- return -EINVAL;
- }
-
max77693 = devm_kzalloc(&i2c->dev,
sizeof(struct max77693_dev), GFP_KERNEL);
if (max77693 == NULL)
@@ -138,8 +132,6 @@ static int max77693_i2c_probe(struct i2c_client *i2c,
return ret;
}
- max77693->wakeup = pdata->wakeup;
-
ret = max77693_read_reg(max77693->regmap, MAX77693_PMIC_REG_PMIC_ID2,
®_data);
if (ret < 0) {
@@ -179,8 +171,6 @@ static int max77693_i2c_probe(struct i2c_client *i2c,
if (ret < 0)
goto err_mfd;
- device_init_wakeup(max77693->dev, pdata->wakeup);
-
return ret;
err_mfd:
diff --git a/include/linux/mfd/max77693-private.h b/include/linux/mfd/max77693-private.h
index 244fb0d..3e050b9 100644
--- a/include/linux/mfd/max77693-private.h
+++ b/include/linux/mfd/max77693-private.h
@@ -323,7 +323,6 @@ struct max77693_dev {
int irq;
int irq_gpio;
- bool wakeup;
struct mutex irqlock;
int irq_masks_cur[MAX77693_IRQ_GROUP_NR];
int irq_masks_cache[MAX77693_IRQ_GROUP_NR];
diff --git a/include/linux/mfd/max77693.h b/include/linux/mfd/max77693.h
index 676f0f3..3f3dc45 100644
--- a/include/linux/mfd/max77693.h
+++ b/include/linux/mfd/max77693.h
@@ -64,8 +64,6 @@ struct max77693_muic_platform_data {
};
struct max77693_platform_data {
- int wakeup;
-
/* regulator data */
struct max77693_regulator_data *regulators;
int num_regulators;
--
1.8.1.2
next prev parent reply other threads:[~2013-08-21 16:53 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-08-21 16:53 [PATCH v3 0/2] max77693: added device tree support Andrzej Hajda
2013-08-21 16:53 ` Andrzej Hajda [this message]
2013-09-26 12:00 ` [PATCH v3 1/2] max77693: remove device wakeup from driver Andrzej Hajda
2013-09-27 7:29 ` Lee Jones
2013-08-21 16:53 ` [PATCH v3 2/2] max77693: added device tree support Andrzej Hajda
2013-08-23 14:14 ` Mark Rutland
2013-08-23 20:36 ` Tomasz Figa
2013-08-23 20:08 ` Tomasz Figa
2013-09-06 10:50 ` Mark Brown
2013-09-26 12:05 ` Andrzej Hajda
2013-09-27 7:17 ` Lee Jones
2013-09-27 7:27 ` [PATCH v4 " Andrzej Hajda
2013-09-27 8:11 ` Lee Jones
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=1377104014-21910-2-git-send-email-a.hajda@samsung.com \
--to=a.hajda@samsung.com \
--cc=devicetree@vger.kernel.org \
--cc=grant.likely@linaro.org \
--cc=ian.campbell@citrix.com \
--cc=jonghwa3.lee@samsung.com \
--cc=kyungmin.park@samsung.com \
--cc=lee.jones@linaro.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mark.rutland@arm.com \
--cc=pawel.moll@arm.com \
--cc=rob.herring@calxeda.com \
--cc=rob@landley.net \
--cc=s.nawrocki@samsung.com \
--cc=sameo@linux.intel.com \
--cc=swarren@wwwdotorg.org \
/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