ASoC: rt5645: Move rt5645_platform_data to sound/soc/codecs/rt5645.c

sound/soc/codecs/rt5645.c is the only user of the rt5645_platform_data,
move its definition to sound/soc/codecs/rt5645.c and remove the now
empty include/sound/rt5645.h file.

Note since the DMI quirk mechanism uses pointers to the
rt5645_platform_data struct we can NOT simply add its members to
the rt5645_priv struct and completely remove the struct.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Link: https://lore.kernel.org/r/20210306230223.516566-1-hdegoede@redhat.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/include/sound/rt5645.h b/include/sound/rt5645.h
deleted file mode 100644 (file)
index 710c95b..0000000
--- a/include/sound/rt5645.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-only */
-/*
- * linux/sound/rt5645.h -- Platform data for RT5645
- *
- * Copyright 2013 Realtek Microelectronics
- */
-
-#ifndef __LINUX_SND_RT5645_H
-#define __LINUX_SND_RT5645_H
-
-struct rt5645_platform_data {
-       /* IN2 can optionally be differential */
-       bool in2_diff;
-
-       unsigned int dmic1_data_pin;
-       /* 0 = IN2N; 1 = GPIO5; 2 = GPIO11 */
-       unsigned int dmic2_data_pin;
-       /* 0 = IN2P; 1 = GPIO6; 2 = GPIO10; 3 = GPIO12 */
-
-       unsigned int jd_mode;
-       /* Use level triggered irq */
-       bool level_trigger_irq;
-       /* Invert JD1_1 status polarity */
-       bool inv_jd1_1;
-       /* Invert HP detect status polarity */
-       bool inv_hp_pol;
-
-       /* Value to asign to snd_soc_card.long_name */
-       const char *long_name;
-};
-
-#endif

diff --git a/sound/soc/codecs/rt5645.c b/sound/soc/codecs/rt5645.c
index c39095fa14ce4d3d8a910f2eb84f05eeadb4f215..3849a9987541b667a6f802f67563fd94e30c603f 100644 (file)
--- a/sound/soc/codecs/rt5645.c
+++ b/sound/soc/codecs/rt5645.c
@@ -411,6 +411,27 @@ static const char *const rt5645_supply_names[] = {
        "cpvdd",
 };
 
+struct rt5645_platform_data {
+       /* IN2 can optionally be differential */
+       bool in2_diff;
+
+       unsigned int dmic1_data_pin;
+       /* 0 = IN2N; 1 = GPIO5; 2 = GPIO11 */
+       unsigned int dmic2_data_pin;
+       /* 0 = IN2P; 1 = GPIO6; 2 = GPIO10; 3 = GPIO12 */
+
+       unsigned int jd_mode;
+       /* Use level triggered irq */
+       bool level_trigger_irq;
+       /* Invert JD1_1 status polarity */
+       bool inv_jd1_1;
+       /* Invert HP detect status polarity */
+       bool inv_hp_pol;
+
+       /* Value to assign to snd_soc_card.long_name */
+       const char *long_name;
+};
+
 struct rt5645_priv {
        struct snd_soc_component *component;
        struct rt5645_platform_data pdata;
@@ -3834,7 +3855,7 @@ static int rt5645_parse_dt(struct rt5645_priv *rt5645, struct device *dev)
 static int rt5645_i2c_probe(struct i2c_client *i2c,
                    const struct i2c_device_id *id)
 {
-       struct rt5645_platform_data *pdata = dev_get_platdata(&i2c->dev);
+       struct rt5645_platform_data *pdata = NULL;
        const struct dmi_system_id *dmi_data;
        struct rt5645_priv *rt5645;
        int ret, i;

diff --git a/sound/soc/codecs/rt5645.h b/sound/soc/codecs/rt5645.h
index e2d72ae17484454cf99c17ed89cbba4ab3e0c641..ac3de6f3bc2f027738a0266f71ac514296fa6083 100644 (file)
--- a/sound/soc/codecs/rt5645.h
+++ b/sound/soc/codecs/rt5645.h
@@ -9,8 +9,6 @@
 #ifndef __RT5645_H__
 #define __RT5645_H__
 
-#include <sound/rt5645.h>
-
 /* Info */
 #define RT5645_RESET                           0x00
 #define RT5645_VENDOR_ID                       0xfd