diff mbox series

ASoC: max98095: Remove unused max98095_jack_detect

Message ID 20250205014458.486207-1-linux@treblig.org (mailing list archive)
State New
Headers show
Series ASoC: max98095: Remove unused max98095_jack_detect | expand

Commit Message

Dr. David Alan Gilbert Feb. 5, 2025, 1:44 a.m. UTC 
From: "Dr. David Alan Gilbert" <linux@treblig.org>

max98095_jack_detect() was added in 2012 as part of
commit 9dd90c5db040 ("ASoC: max98095: add jack detection")
but hasn't been used.

Remove it.

Signed-off-by: Dr. David Alan Gilbert <linux@treblig.org>
---
 sound/soc/codecs/max98095.c | 29 -----------------------------
 sound/soc/codecs/max98095.h |  3 ---
 2 files changed, 32 deletions(-)

Comments

Mark Brown Feb. 5, 2025, 12:21 p.m. UTC | #1 
On Wed, Feb 05, 2025 at 01:44:58AM +0000, linux@treblig.org wrote:
> From: "Dr. David Alan Gilbert" <linux@treblig.org>
> 
> max98095_jack_detect() was added in 2012 as part of
> commit 9dd90c5db040 ("ASoC: max98095: add jack detection")
> but hasn't been used.
> 
> Remove it.

> -	max98095_report_jack(client->irq, component);
> -	return 0;
> -}
> -EXPORT_SYMBOL_GPL(max98095_jack_detect);

No, this is exported for machine drivers which might not be in tree.
Dr. David Alan Gilbert Feb. 5, 2025, 12:38 p.m. UTC | #2 
* Mark Brown (broonie@kernel.org) wrote:
> On Wed, Feb 05, 2025 at 01:44:58AM +0000, linux@treblig.org wrote:
> > From: "Dr. David Alan Gilbert" <linux@treblig.org>
> > 
> > max98095_jack_detect() was added in 2012 as part of
> > commit 9dd90c5db040 ("ASoC: max98095: add jack detection")
> > but hasn't been used.
> > 
> > Remove it.
> 
> > -	max98095_report_jack(client->irq, component);
> > -	return 0;
> > -}
> > -EXPORT_SYMBOL_GPL(max98095_jack_detect);
> 
> No, this is exported for machine drivers which might not be in tree.

Ah OK; of course it would be nice if they were in the tree.

Thanks,

Dave
diff mbox series

Patch

diff --git a/sound/soc/codecs/max98095.c b/sound/soc/codecs/max98095.c
index cfb63fe69267..1d3464308ec4 100644
--- a/sound/soc/codecs/max98095.c
+++ b/sound/soc/codecs/max98095.c
@@ -1884,35 +1884,6 @@  static int max98095_jack_detect_disable(struct snd_soc_component *component)
 	return ret;
 }
 
-int max98095_jack_detect(struct snd_soc_component *component,
-	struct snd_soc_jack *hp_jack, struct snd_soc_jack *mic_jack)
-{
-	struct max98095_priv *max98095 = snd_soc_component_get_drvdata(component);
-	struct i2c_client *client = to_i2c_client(component->dev);
-	int ret = 0;
-
-	max98095->headphone_jack = hp_jack;
-	max98095->mic_jack = mic_jack;
-
-	/* only progress if we have at least 1 jack pointer */
-	if (!hp_jack && !mic_jack)
-		return -EINVAL;
-
-	max98095_jack_detect_enable(component);
-
-	/* enable interrupts for headphone jack detection */
-	ret = snd_soc_component_update_bits(component, M98095_013_JACK_INT_EN,
-		M98095_IDDONE, M98095_IDDONE);
-	if (ret < 0) {
-		dev_err(component->dev, "Failed to cfg jack irqs %d\n", ret);
-		return ret;
-	}
-
-	max98095_report_jack(client->irq, component);
-	return 0;
-}
-EXPORT_SYMBOL_GPL(max98095_jack_detect);
-
 #ifdef CONFIG_PM
 static int max98095_suspend(struct snd_soc_component *component)
 {
diff --git a/sound/soc/codecs/max98095.h b/sound/soc/codecs/max98095.h
index 2af7e77021a2..782e351debe9 100644
--- a/sound/soc/codecs/max98095.h
+++ b/sound/soc/codecs/max98095.h
@@ -312,7 +312,4 @@ 
 /* Default Delay used in Slew Rate Calculation for Jack detection */
 #define M98095_DEFAULT_SLEW_DELAY		0x18
 
-extern int max98095_jack_detect(struct snd_soc_component *component,
-	struct snd_soc_jack *hp_jack, struct snd_soc_jack *mic_jack);
-
 #endif