All of lore.kernel.org
 help / color / mirror / Atom feed
From: "Andrew F. Davis" <afd@ti.com>
To: Liam Girdwood <lgirdwood@gmail.com>, Mark Brown <broonie@kernel.org>
Cc: <alsa-devel@alsa-project.org>, <linux-kernel@vger.kernel.org>,
	"Andrew F . Davis" <afd@ti.com>
Subject: [PATCH v3 03/10] ASoC: tlv320aic31xx: Remove platform data
Date: Thu, 7 Dec 2017 09:38:53 -0600	[thread overview]
Message-ID: <20171207153900.9831-4-afd@ti.com> (raw)
In-Reply-To: <20171207153900.9831-1-afd@ti.com>

Platform data is not used by anyone (at least in upstream) so
drop this data.

Signed-off-by: Andrew F. Davis <afd@ti.com>
---
 sound/soc/codecs/tlv320aic31xx.c | 7 -------
 sound/soc/codecs/tlv320aic31xx.h | 6 ------
 2 files changed, 13 deletions(-)

diff --git a/sound/soc/codecs/tlv320aic31xx.c b/sound/soc/codecs/tlv320aic31xx.c
index 655c99db2426..266141d841e7 100644
--- a/sound/soc/codecs/tlv320aic31xx.c
+++ b/sound/soc/codecs/tlv320aic31xx.c
@@ -160,7 +160,6 @@ struct aic31xx_priv {
 	enum aic31xx_type codec_type;
 	struct gpio_desc *gpio_reset;
 	int micbias_vg;
-	struct aic31xx_pdata pdata;
 	struct regulator_bulk_data supplies[AIC31XX_NUM_SUPPLIES];
 	struct aic31xx_disable_nb disable_nb[AIC31XX_NUM_SUPPLIES];
 	unsigned int sysclk;
@@ -1332,12 +1331,6 @@ static int aic31xx_i2c_probe(struct i2c_client *i2c,
 		aic31xx->micbias_vg = MICBIAS_2_0V;
 	}
 
-	if (dev_get_platdata(aic31xx->dev)) {
-		memcpy(&aic31xx->pdata, dev_get_platdata(aic31xx->dev), sizeof(aic31xx->pdata));
-		aic31xx->codec_type = aic31xx->pdata.codec_type;
-		aic31xx->micbias_vg = aic31xx->pdata.micbias_vg;
-	}
-
 	aic31xx->gpio_reset = devm_gpiod_get_optional(aic31xx->dev, "reset",
 						      GPIOD_OUT_LOW);
 	if (IS_ERR(aic31xx->gpio_reset)) {
diff --git a/sound/soc/codecs/tlv320aic31xx.h b/sound/soc/codecs/tlv320aic31xx.h
index 15ac7cba86fe..ab94e6a0c742 100644
--- a/sound/soc/codecs/tlv320aic31xx.h
+++ b/sound/soc/codecs/tlv320aic31xx.h
@@ -29,12 +29,6 @@ enum aic31xx_type {
 	DAC3101 = DAC31XX_BIT | AIC31XX_STEREO_CLASS_D_BIT,
 };
 
-struct aic31xx_pdata {
-	enum aic31xx_type codec_type;
-	unsigned int gpio_reset;
-	int micbias_vg;
-};
-
 #define AIC31XX_REG(page, reg)	((page * 128) + reg)
 
 #define AIC31XX_PAGECTL		AIC31XX_REG(0, 0) /* Page Control Register */
-- 
2.15.0

WARNING: multiple messages have this Message-ID (diff)
From: "Andrew F. Davis" <afd@ti.com>
To: Liam Girdwood <lgirdwood@gmail.com>, Mark Brown <broonie@kernel.org>
Cc: alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org,
	"Andrew F . Davis" <afd@ti.com>
Subject: [PATCH v3 03/10] ASoC: tlv320aic31xx: Remove platform data
Date: Thu, 7 Dec 2017 09:38:53 -0600	[thread overview]
Message-ID: <20171207153900.9831-4-afd@ti.com> (raw)
In-Reply-To: <20171207153900.9831-1-afd@ti.com>

Platform data is not used by anyone (at least in upstream) so
drop this data.

Signed-off-by: Andrew F. Davis <afd@ti.com>
---
 sound/soc/codecs/tlv320aic31xx.c | 7 -------
 sound/soc/codecs/tlv320aic31xx.h | 6 ------
 2 files changed, 13 deletions(-)

diff --git a/sound/soc/codecs/tlv320aic31xx.c b/sound/soc/codecs/tlv320aic31xx.c
index 655c99db2426..266141d841e7 100644
--- a/sound/soc/codecs/tlv320aic31xx.c
+++ b/sound/soc/codecs/tlv320aic31xx.c
@@ -160,7 +160,6 @@ struct aic31xx_priv {
 	enum aic31xx_type codec_type;
 	struct gpio_desc *gpio_reset;
 	int micbias_vg;
-	struct aic31xx_pdata pdata;
 	struct regulator_bulk_data supplies[AIC31XX_NUM_SUPPLIES];
 	struct aic31xx_disable_nb disable_nb[AIC31XX_NUM_SUPPLIES];
 	unsigned int sysclk;
@@ -1332,12 +1331,6 @@ static int aic31xx_i2c_probe(struct i2c_client *i2c,
 		aic31xx->micbias_vg = MICBIAS_2_0V;
 	}
 
-	if (dev_get_platdata(aic31xx->dev)) {
-		memcpy(&aic31xx->pdata, dev_get_platdata(aic31xx->dev), sizeof(aic31xx->pdata));
-		aic31xx->codec_type = aic31xx->pdata.codec_type;
-		aic31xx->micbias_vg = aic31xx->pdata.micbias_vg;
-	}
-
 	aic31xx->gpio_reset = devm_gpiod_get_optional(aic31xx->dev, "reset",
 						      GPIOD_OUT_LOW);
 	if (IS_ERR(aic31xx->gpio_reset)) {
diff --git a/sound/soc/codecs/tlv320aic31xx.h b/sound/soc/codecs/tlv320aic31xx.h
index 15ac7cba86fe..ab94e6a0c742 100644
--- a/sound/soc/codecs/tlv320aic31xx.h
+++ b/sound/soc/codecs/tlv320aic31xx.h
@@ -29,12 +29,6 @@ enum aic31xx_type {
 	DAC3101 = DAC31XX_BIT | AIC31XX_STEREO_CLASS_D_BIT,
 };
 
-struct aic31xx_pdata {
-	enum aic31xx_type codec_type;
-	unsigned int gpio_reset;
-	int micbias_vg;
-};
-
 #define AIC31XX_REG(page, reg)	((page * 128) + reg)
 
 #define AIC31XX_PAGECTL		AIC31XX_REG(0, 0) /* Page Control Register */
-- 
2.15.0

  parent reply	other threads:[~2017-12-07 15:39 UTC|newest]

Thread overview: 25+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-12-07 15:38 [PATCH v3 00/10] Add Headphone Detection to TLV320AIC31xx Driver Andrew F. Davis
2017-12-07 15:38 ` Andrew F. Davis
2017-12-07 15:38 ` [PATCH v3 01/10] ASoC: tlv320aic31xx: Fix GPIO header includes Andrew F. Davis
2017-12-07 15:38   ` Andrew F. Davis
2017-12-07 17:48   ` Applied "ASoC: tlv320aic31xx: Fix GPIO header includes" to the asoc tree Mark Brown
2017-12-07 15:38 ` [PATCH v3 02/10] ASoC: tlv320aic31xx: Use fwnode APIs over raw OF calls Andrew F. Davis
2017-12-07 15:38   ` Andrew F. Davis
2017-12-07 17:48   ` Applied "ASoC: tlv320aic31xx: Use fwnode APIs over raw OF calls" to the asoc tree Mark Brown
2017-12-07 15:38 ` Andrew F. Davis [this message]
2017-12-07 15:38   ` [PATCH v3 03/10] ASoC: tlv320aic31xx: Remove platform data Andrew F. Davis
2017-12-07 15:38 ` [PATCH v3 04/10] ASoC: tlv320aic31xx: Add MICBIAS off setting Andrew F. Davis
2017-12-07 15:38   ` Andrew F. Davis
2017-12-07 15:38 ` [PATCH v3 05/10] ASoC: tlv320aic31xx: Remove regulator notification handling Andrew F. Davis
2017-12-07 15:38   ` Andrew F. Davis
2017-12-07 15:38 ` [PATCH v3 06/10] ASoC: tlv320aic31xx: Reset registers during power up Andrew F. Davis
2017-12-07 15:38   ` Andrew F. Davis
2017-12-07 17:48   ` Applied "ASoC: tlv320aic31xx: Reset registers during power up" to the asoc tree Mark Brown
2017-12-07 15:38 ` [PATCH v3 07/10] ASoC: tlv320aic31xx: Add short circuit detection support Andrew F. Davis
2017-12-07 15:38   ` Andrew F. Davis
2017-12-07 15:38 ` [PATCH v3 08/10] ASoC: tlv320aic31xx: Add overflow " Andrew F. Davis
2017-12-07 15:38   ` Andrew F. Davis
2017-12-07 15:38 ` [PATCH v3 09/10] ASoC: tlv320aic31xx: Add headphone/headset detection Andrew F. Davis
2017-12-07 15:38   ` Andrew F. Davis
2017-12-07 15:39 ` [PATCH v3 10/10] ASoC: tlv320aic31xx: Add button press detection Andrew F. Davis
2017-12-07 15:39   ` Andrew F. Davis

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=20171207153900.9831-4-afd@ti.com \
    --to=afd@ti.com \
    --cc=alsa-devel@alsa-project.org \
    --cc=broonie@kernel.org \
    --cc=lgirdwood@gmail.com \
    --cc=linux-kernel@vger.kernel.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 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.