From: Axel Lin <axel.lin@ingics.com>
To: Mark Brown <broonie@kernel.org>
Cc: Brian Austin <brian.austin@cirrus.com>,
alsa-devel@alsa-project.org, Liam Girdwood <lgirdwood@gmail.com>,
Paul Handrigan <Paul.Handrigan@cirrus.com>,
Tim Howe <tim.howe@cirrus.com>
Subject: [PATCH 2/2] ASoC: cs4349: Drop platform data support
Date: Sun, 19 Jul 2015 09:15:38 +0800 [thread overview]
Message-ID: <1437268538.11309.3.camel@ingics.com> (raw)
In-Reply-To: <1437268463.11309.1.camel@ingics.com>
The struct cs4349_platform_data should be defined in a public header in
include/sound/ rather than in sound/soc/codecs folder.
In additional, the platform data support is not properly handled in this
driver so remove it now.
Signed-off-by: Axel Lin <axel.lin@ingics.com>
---
sound/soc/codecs/cs4349.c | 7 +------
sound/soc/codecs/cs4349.h | 7 -------
2 files changed, 1 insertion(+), 13 deletions(-)
diff --git a/sound/soc/codecs/cs4349.c b/sound/soc/codecs/cs4349.c
index eb55889..7befc05 100644
--- a/sound/soc/codecs/cs4349.c
+++ b/sound/soc/codecs/cs4349.c
@@ -45,7 +45,6 @@ static const struct reg_default cs4349_reg_defaults[] = {
/* Private data for the CS4349 */
struct cs4349_private {
struct regmap *regmap;
- struct cs4349_platform_data pdata;
struct gpio_desc *reset_gpio;
unsigned int mode;
int rate;
@@ -283,8 +282,7 @@ static int cs4349_i2c_probe(struct i2c_client *client,
const struct i2c_device_id *id)
{
struct cs4349_private *cs4349;
- struct cs4349_platform_data *pdata = dev_get_platdata(&client->dev);
- int ret = 0;
+ int ret;
cs4349 = devm_kzalloc(&client->dev, sizeof(*cs4349), GFP_KERNEL);
if (!cs4349)
@@ -297,9 +295,6 @@ static int cs4349_i2c_probe(struct i2c_client *client,
return ret;
}
- if (pdata)
- cs4349->pdata = *pdata;
-
/* Reset the Device */
cs4349->reset_gpio = devm_gpiod_get_optional(&client->dev,
"reset", GPIOD_OUT_LOW);
diff --git a/sound/soc/codecs/cs4349.h b/sound/soc/codecs/cs4349.h
index 7effa0a..d58c06a 100644
--- a/sound/soc/codecs/cs4349.h
+++ b/sound/soc/codecs/cs4349.h
@@ -19,13 +19,6 @@
#ifndef __CS4349_H__
#define __CS4349_H__
-struct cs4349_platform_data {
-
- /* GPIO for Reset */
- unsigned int gpio_nreset;
-
-};
-
/* CS4349 registers addresses */
#define CS4349_CHIPID 0x01 /* Device and Rev ID, Read Only */
#define CS4349_MODE 0x02 /* Mode Control */
--
2.1.0
next prev parent reply other threads:[~2015-07-19 1:15 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-07-19 1:14 [PATCH 1/2] ASoC: cs4349: Set .writeable_reg for cs4349_regmap Axel Lin
2015-07-19 1:15 ` Axel Lin [this message]
2015-07-20 17:52 ` Applied "ASoC: cs4349: Drop platform data support" to the asoc tree Mark Brown
2015-07-20 17:52 ` Applied "ASoC: cs4349: Set .writeable_reg for cs4349_regmap" " Mark Brown
2015-07-30 21:19 ` [PATCH 1/2] ASoC: cs4349: Set .writeable_reg for cs4349_regmap Tim Howe
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=1437268538.11309.3.camel@ingics.com \
--to=axel.lin@ingics.com \
--cc=Paul.Handrigan@cirrus.com \
--cc=alsa-devel@alsa-project.org \
--cc=brian.austin@cirrus.com \
--cc=broonie@kernel.org \
--cc=lgirdwood@gmail.com \
--cc=tim.howe@cirrus.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.