From: Alexander Sverdlin <subaparts@yandex.ru>
To: linux-arm-kernel@lists.infradead.org,
alsa-devel@alsa-project.org, Liam Girdwood <lrg@slimlogic.co.uk>,
Mark Brown <broonie@opensource.wolfsonmicro.com>,
Dimitris Papastamos <dp@opens>
Cc: H Hartley Sweeten <hsweeten@visionengravers.com>,
Lennert Buytenhek <buytenh@wantstofly.org>
Subject: [PATCH] ASoC: CS4271: Move Chip Select control out of the CODEC code.
Date: Thu, 03 Feb 2011 03:11:45 +0300 [thread overview]
Message-ID: <1296691905.1504.47.camel@r60e> (raw)
From: Alexander Sverdlin <subaparts@yandex.ru>
Move Chip Select control out of the CODEC code for CS4271.
Signed-off-by: Alexander Sverdlin <subaparts@yandex.ru>
---
include/sound/cs4271.h | 1 -
sound/soc/codecs/cs4271.c | 22 +++-------------------
2 files changed, 3 insertions(+), 20 deletions(-)
diff --git a/include/sound/cs4271.h b/include/sound/cs4271.h
index 16f8d32..50a059e 100644
--- a/include/sound/cs4271.h
+++ b/include/sound/cs4271.h
@@ -19,7 +19,6 @@
struct cs4271_platform_data {
int gpio_nreset; /* GPIO driving Reset pin, if any */
- int gpio_disable; /* GPIO that disable serial bus, if any */
};
#endif /* __CS4271_H */
diff --git a/sound/soc/codecs/cs4271.c b/sound/soc/codecs/cs4271.c
index 9c5b7db..1791796 100644
--- a/sound/soc/codecs/cs4271.c
+++ b/sound/soc/codecs/cs4271.c
@@ -441,22 +441,11 @@ static int cs4271_probe(struct snd_soc_codec *codec)
struct cs4271_platform_data *cs4271plat = codec->dev->platform_data;
int ret;
int gpio_nreset = -EINVAL;
- int gpio_disable = -EINVAL;
codec->control_data = cs4271->control_data;
- if (cs4271plat) {
- if (gpio_is_valid(cs4271plat->gpio_nreset))
- gpio_nreset = cs4271plat->gpio_nreset;
- if (gpio_is_valid(cs4271plat->gpio_disable))
- gpio_disable = cs4271plat->gpio_disable;
- }
-
- if (gpio_disable >= 0)
- if (gpio_request(gpio_disable, "CS4271 Disable"))
- gpio_disable = -EINVAL;
- if (gpio_disable >= 0)
- gpio_direction_output(gpio_disable, 0);
+ if (cs4271plat && gpio_is_valid(cs4271plat->gpio_nreset))
+ gpio_nreset = cs4271plat->gpio_nreset;
if (gpio_nreset >= 0)
if (gpio_request(gpio_nreset, "CS4271 Reset"))
@@ -471,7 +460,6 @@ static int cs4271_probe(struct snd_soc_codec *codec)
}
cs4271->gpio_nreset = gpio_nreset;
- cs4271->gpio_disable = gpio_disable;
/*
* In case of I2C, chip address specified in board data.
@@ -509,10 +497,9 @@ static int cs4271_probe(struct snd_soc_codec *codec)
static int cs4271_remove(struct snd_soc_codec *codec)
{
struct cs4271_private *cs4271 = snd_soc_codec_get_drvdata(codec);
- int gpio_nreset, gpio_disable;
+ int gpio_nreset;
gpio_nreset = cs4271->gpio_nreset;
- gpio_disable = cs4271->gpio_disable;
if (gpio_is_valid(gpio_nreset)) {
/* Set codec to the reset state */
@@ -520,9 +507,6 @@ static int cs4271_remove(struct snd_soc_codec *codec)
gpio_free(gpio_nreset);
}
- if (gpio_is_valid(gpio_disable))
- gpio_free(gpio_disable);
-
return 0;
};
WARNING: multiple messages have this Message-ID (diff)
From: subaparts@yandex.ru (Alexander Sverdlin)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH] ASoC: CS4271: Move Chip Select control out of the CODEC code.
Date: Thu, 03 Feb 2011 03:11:45 +0300 [thread overview]
Message-ID: <1296691905.1504.47.camel@r60e> (raw)
From: Alexander Sverdlin <subaparts@yandex.ru>
Move Chip Select control out of the CODEC code for CS4271.
Signed-off-by: Alexander Sverdlin <subaparts@yandex.ru>
---
include/sound/cs4271.h | 1 -
sound/soc/codecs/cs4271.c | 22 +++-------------------
2 files changed, 3 insertions(+), 20 deletions(-)
diff --git a/include/sound/cs4271.h b/include/sound/cs4271.h
index 16f8d32..50a059e 100644
--- a/include/sound/cs4271.h
+++ b/include/sound/cs4271.h
@@ -19,7 +19,6 @@
struct cs4271_platform_data {
int gpio_nreset; /* GPIO driving Reset pin, if any */
- int gpio_disable; /* GPIO that disable serial bus, if any */
};
#endif /* __CS4271_H */
diff --git a/sound/soc/codecs/cs4271.c b/sound/soc/codecs/cs4271.c
index 9c5b7db..1791796 100644
--- a/sound/soc/codecs/cs4271.c
+++ b/sound/soc/codecs/cs4271.c
@@ -441,22 +441,11 @@ static int cs4271_probe(struct snd_soc_codec *codec)
struct cs4271_platform_data *cs4271plat = codec->dev->platform_data;
int ret;
int gpio_nreset = -EINVAL;
- int gpio_disable = -EINVAL;
codec->control_data = cs4271->control_data;
- if (cs4271plat) {
- if (gpio_is_valid(cs4271plat->gpio_nreset))
- gpio_nreset = cs4271plat->gpio_nreset;
- if (gpio_is_valid(cs4271plat->gpio_disable))
- gpio_disable = cs4271plat->gpio_disable;
- }
-
- if (gpio_disable >= 0)
- if (gpio_request(gpio_disable, "CS4271 Disable"))
- gpio_disable = -EINVAL;
- if (gpio_disable >= 0)
- gpio_direction_output(gpio_disable, 0);
+ if (cs4271plat && gpio_is_valid(cs4271plat->gpio_nreset))
+ gpio_nreset = cs4271plat->gpio_nreset;
if (gpio_nreset >= 0)
if (gpio_request(gpio_nreset, "CS4271 Reset"))
@@ -471,7 +460,6 @@ static int cs4271_probe(struct snd_soc_codec *codec)
}
cs4271->gpio_nreset = gpio_nreset;
- cs4271->gpio_disable = gpio_disable;
/*
* In case of I2C, chip address specified in board data.
@@ -509,10 +497,9 @@ static int cs4271_probe(struct snd_soc_codec *codec)
static int cs4271_remove(struct snd_soc_codec *codec)
{
struct cs4271_private *cs4271 = snd_soc_codec_get_drvdata(codec);
- int gpio_nreset, gpio_disable;
+ int gpio_nreset;
gpio_nreset = cs4271->gpio_nreset;
- gpio_disable = cs4271->gpio_disable;
if (gpio_is_valid(gpio_nreset)) {
/* Set codec to the reset state */
@@ -520,9 +507,6 @@ static int cs4271_remove(struct snd_soc_codec *codec)
gpio_free(gpio_nreset);
}
- if (gpio_is_valid(gpio_disable))
- gpio_free(gpio_disable);
-
return 0;
};
next reply other threads:[~2011-02-03 0:11 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-02-03 0:11 Alexander Sverdlin [this message]
2011-02-03 0:11 ` [PATCH] ASoC: CS4271: Move Chip Select control out of the CODEC code Alexander Sverdlin
2011-02-03 0:18 ` H Hartley Sweeten
2011-02-03 0:18 ` H Hartley Sweeten
2011-02-03 9:56 ` Liam Girdwood
2011-02-03 9:56 ` Liam Girdwood
2011-02-08 11:26 ` Mark Brown
2011-02-08 11:26 ` Mark Brown
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=1296691905.1504.47.camel@r60e \
--to=subaparts@yandex.ru \
--cc=alsa-devel@alsa-project.org \
--cc=broonie@opensource.wolfsonmicro.com \
--cc=buytenh@wantstofly.org \
--cc=dp@opens \
--cc=hsweeten@visionengravers.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=lrg@slimlogic.co.uk \
/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.