Skip to content

L
linux
Commit 122cef68 authored by Mark Brown's avatar Mark Brown
Browse files
Options

ASoC: remaining simple i2c probe changes 

Merge series from Stephen Kitt <steve@sk2.org>:

This series covers all the remaining changes to migrate
sound/soc/codecs i2c probes to probe_new, where the const struct
i2c_client * argument is unused; there are a few remaining files which
use the argument and will need i2c_match_id migration.
parents 09b955f6 cbd5ce7f
Hide whitespace changes
Inline Side-by-side
Showing with 92 additions and 137 deletions
sound/soc/codecs/ak4118.c
View file @ 122cef68
......@@ -356,8 +356,7 @@ static const struct regmap_config ak4118_regmap = {
.max_register = AK4118_REG_MAX - 1,
};
static int ak4118_i2c_probe(struct i2c_client *i2c,
const struct i2c_device_id *id)
static int ak4118_i2c_probe(struct i2c_client *i2c)
{
struct ak4118_priv *ak4118;
int ret;
......@@ -416,7 +415,7 @@ static struct i2c_driver ak4118_i2c_driver = {
.of_match_table = of_match_ptr(ak4118_of_match),
},
.id_table = ak4118_id_table,
.probe = ak4118_i2c_probe,
.probe_new = ak4118_i2c_probe,
};
module_i2c_driver(ak4118_i2c_driver);
......
sound/soc/codecs/ak4535.c
View file @ 122cef68
......@@ -405,8 +405,7 @@ static const struct snd_soc_component_driver soc_component_dev_ak4535 = {
.non_legacy_dai_naming = 1,
};
static int ak4535_i2c_probe(struct i2c_client *i2c,
const struct i2c_device_id *id)
static int ak4535_i2c_probe(struct i2c_client *i2c)
{
struct ak4535_priv *ak4535;
int ret;
......@@ -441,7 +440,7 @@ static struct i2c_driver ak4535_i2c_driver = {
.driver = {
.name = "ak4535",
},
.probe = ak4535_i2c_probe,
.probe_new = ak4535_i2c_probe,
.id_table = ak4535_i2c_id,
};
......
sound/soc/codecs/ak4641.c
View file @ 122cef68
......@@ -548,8 +548,7 @@ static const struct regmap_config ak4641_regmap = {
.cache_type = REGCACHE_RBTREE,
};
static int ak4641_i2c_probe(struct i2c_client *i2c,
const struct i2c_device_id *id)
static int ak4641_i2c_probe(struct i2c_client *i2c)
{
struct ak4641_platform_data *pdata = i2c->dev.platform_data;
struct ak4641_priv *ak4641;
......@@ -632,7 +631,7 @@ static struct i2c_driver ak4641_i2c_driver = {
.driver = {
.name = "ak4641",
},
.probe = ak4641_i2c_probe,
.probe_new = ak4641_i2c_probe,
.remove = ak4641_i2c_remove,
.id_table = ak4641_i2c_id,
};
......
sound/soc/codecs/ak4671.c
View file @ 122cef68
......@@ -629,8 +629,7 @@ static const struct regmap_config ak4671_regmap = {
.cache_type = REGCACHE_RBTREE,
};
static int ak4671_i2c_probe(struct i2c_client *client,
const struct i2c_device_id *id)
static int ak4671_i2c_probe(struct i2c_client *client)
{
struct regmap *regmap;
int ret;
......@@ -657,7 +656,7 @@ static struct i2c_driver ak4671_i2c_driver = {
.driver = {
.name = "ak4671-codec",
},
.probe = ak4671_i2c_probe,
.probe_new = ak4671_i2c_probe,
.id_table = ak4671_i2c_id,
};
......
sound/soc/codecs/cx2072x.c
View file @ 122cef68
......@@ -1626,8 +1626,7 @@ static int __maybe_unused cx2072x_runtime_resume(struct device *dev)
return clk_prepare_enable(cx2072x->mclk);
}
static int cx2072x_i2c_probe(struct i2c_client *i2c,
const struct i2c_device_id *id)
static int cx2072x_i2c_probe(struct i2c_client *i2c)
{
struct cx2072x_priv *cx2072x;
unsigned int ven_id, rev_id;
......@@ -1710,7 +1709,7 @@ static struct i2c_driver cx2072x_i2c_driver = {
.acpi_match_table = ACPI_PTR(cx2072x_acpi_match),
.pm = &cx2072x_runtime_pm,
},
.probe = cx2072x_i2c_probe,
.probe_new = cx2072x_i2c_probe,
.remove = cx2072x_i2c_remove,
.id_table = cx2072x_i2c_id,
};
......
sound/soc/codecs/es8316.c
View file @ 122cef68
......@@ -789,8 +789,7 @@ static const struct regmap_config es8316_regmap = {
.cache_type = REGCACHE_RBTREE,
};
static int es8316_i2c_probe(struct i2c_client *i2c_client,
const struct i2c_device_id *id)
static int es8316_i2c_probe(struct i2c_client *i2c_client)
{
struct device *dev = &i2c_client->dev;
struct es8316_priv *es8316;
......@@ -852,7 +851,7 @@ static struct i2c_driver es8316_i2c_driver = {
.acpi_match_table = ACPI_PTR(es8316_acpi_match),
.of_match_table = of_match_ptr(es8316_of_match),
},
.probe = es8316_i2c_probe,
.probe_new = es8316_i2c_probe,
.id_table = es8316_i2c_id,
};
module_i2c_driver(es8316_i2c_driver);
......
sound/soc/codecs/es8328-i2c.c
View file @ 122cef68
......@@ -29,8 +29,7 @@ static const struct of_device_id es8328_of_match[] = {
};
MODULE_DEVICE_TABLE(of, es8328_of_match);
static int es8328_i2c_probe(struct i2c_client *i2c,
const struct i2c_device_id *id)
static int es8328_i2c_probe(struct i2c_client *i2c)
{
return es8328_probe(&i2c->dev,
devm_regmap_init_i2c(i2c, &es8328_regmap_config));
......@@ -41,7 +40,7 @@ static struct i2c_driver es8328_i2c_driver = {
.name = "es8328",
.of_match_table = es8328_of_match,
},
.probe = es8328_i2c_probe,
.probe_new = es8328_i2c_probe,
.id_table = es8328_id,
};
......
sound/soc/codecs/lm4857.c
View file @ 122cef68
......@@ -115,8 +115,7 @@ static const struct regmap_config lm4857_regmap_config = {
.num_reg_defaults = ARRAY_SIZE(lm4857_default_regs),
};
static int lm4857_i2c_probe(struct i2c_client *i2c,
const struct i2c_device_id *id)
static int lm4857_i2c_probe(struct i2c_client *i2c)
{
struct regmap *regmap;
......@@ -138,7 +137,7 @@ static struct i2c_driver lm4857_i2c_driver = {
.driver = {
.name = "lm4857",
},
.probe = lm4857_i2c_probe,
.probe_new = lm4857_i2c_probe,
.id_table = lm4857_i2c_id,
};
......
sound/soc/codecs/max9768.c
View file @ 122cef68
......@@ -167,8 +167,7 @@ static const struct regmap_config max9768_i2c_regmap_config = {
.cache_type = REGCACHE_RBTREE,
};
static int max9768_i2c_probe(struct i2c_client *client,
const struct i2c_device_id *id)
static int max9768_i2c_probe(struct i2c_client *client)
{
struct max9768 *max9768;
struct max9768_pdata *pdata = client->dev.platform_data;
......@@ -215,7 +214,7 @@ static struct i2c_driver max9768_i2c_driver = {
.driver = {
.name = "max9768",
},
.probe = max9768_i2c_probe,
.probe_new = max9768_i2c_probe,
.id_table = max9768_i2c_id,
};
module_i2c_driver(max9768_i2c_driver);
......
sound/soc/codecs/max98371.c
View file @ 122cef68
......@@ -365,8 +365,7 @@ static const struct regmap_config max98371_regmap = {
.cache_type = REGCACHE_RBTREE,
};
static int max98371_i2c_probe(struct i2c_client *i2c,
const struct i2c_device_id *id)
static int max98371_i2c_probe(struct i2c_client *i2c)
{
struct max98371_priv *max98371;
int ret, reg;
......@@ -421,7 +420,7 @@ static struct i2c_driver max98371_i2c_driver = {
.name = "max98371",
.of_match_table = of_match_ptr(max98371_of_match),
},
.probe = max98371_i2c_probe,
.probe_new = max98371_i2c_probe,
.id_table = max98371_i2c_id,
};
......
sound/soc/codecs/max98373-i2c.c
View file @ 122cef68
......@@ -516,8 +516,7 @@ static const struct regmap_config max98373_regmap = {
.cache_type = REGCACHE_RBTREE,
};
static int max98373_i2c_probe(struct i2c_client *i2c,
const struct i2c_device_id *id)
static int max98373_i2c_probe(struct i2c_client *i2c)
{
int ret = 0;
int reg = 0;
......@@ -622,7 +621,7 @@ static struct i2c_driver max98373_i2c_driver = {
.acpi_match_table = ACPI_PTR(max98373_acpi_match),
.pm = &max98373_pm,
},
.probe = max98373_i2c_probe,
.probe_new = max98373_i2c_probe,
.id_table = max98373_i2c_id,
};
......
sound/soc/codecs/max98390.c
View file @ 122cef68
......@@ -1014,8 +1014,7 @@ static void max98390_slot_config(struct i2c_client *i2c,
max98390->i_l_slot = 1;
}
static int max98390_i2c_probe(struct i2c_client *i2c,
const struct i2c_device_id *id)
static int max98390_i2c_probe(struct i2c_client *i2c)
{
int ret = 0;
int reg = 0;
......@@ -1121,7 +1120,7 @@ static struct i2c_driver max98390_i2c_driver = {
.acpi_match_table = ACPI_PTR(max98390_acpi_match),
.pm = &max98390_pm,
},
.probe = max98390_i2c_probe,
.probe_new = max98390_i2c_probe,
.id_table = max98390_i2c_id,
};
......
sound/soc/codecs/max9850.c
View file @ 122cef68
......@@ -299,8 +299,7 @@ static const struct snd_soc_component_driver soc_component_dev_max9850 = {
.non_legacy_dai_naming = 1,
};
static int max9850_i2c_probe(struct i2c_client *i2c,
const struct i2c_device_id *id)
static int max9850_i2c_probe(struct i2c_client *i2c)
{
struct max9850_priv *max9850;
int ret;
......@@ -331,7 +330,7 @@ static struct i2c_driver max9850_i2c_driver = {
.driver = {
.name = "max9850",
},
.probe = max9850_i2c_probe,
.probe_new = max9850_i2c_probe,
.id_table = max9850_i2c_id,
};
......
sound/soc/codecs/max98504.c
View file @ 122cef68
......@@ -304,8 +304,7 @@ static const struct regmap_config max98504_regmap = {
.cache_type = REGCACHE_RBTREE,
};
static int max98504_i2c_probe(struct i2c_client *client,
const struct i2c_device_id *id)
static int max98504_i2c_probe(struct i2c_client *client)
{
struct device *dev = &client->dev;
struct device_node *node = dev->of_node;
......@@ -371,7 +370,7 @@ static struct i2c_driver max98504_i2c_driver = {
.name = "max98504",
.of_match_table = of_match_ptr(max98504_of_match),
},
.probe = max98504_i2c_probe,
.probe_new = max98504_i2c_probe,
.id_table = max98504_i2c_id,
};
module_i2c_driver(max98504_i2c_driver);
......
sound/soc/codecs/max98520.c
View file @ 122cef68
......@@ -677,7 +677,7 @@ static void max98520_power_on(struct max98520_priv *max98520, bool poweron)
gpiod_set_value_cansleep(max98520->reset_gpio, !poweron);
}
static int max98520_i2c_probe(struct i2c_client *i2c, const struct i2c_device_id *id)
static int max98520_i2c_probe(struct i2c_client *i2c)
{
int ret;
int reg = 0;
......@@ -757,7 +757,7 @@ static struct i2c_driver max98520_i2c_driver = {
.of_match_table = of_match_ptr(max98520_of_match),
.pm = &max98520_pm,
},
.probe = max98520_i2c_probe,
.probe_new = max98520_i2c_probe,
.id_table = max98520_i2c_id,
};
......
sound/soc/codecs/max9867.c
View file @ 122cef68
......@@ -613,8 +613,7 @@ static const struct regmap_config max9867_regmap = {
.cache_type = REGCACHE_RBTREE,
};
static int max9867_i2c_probe(struct i2c_client *i2c,
const struct i2c_device_id *id)
static int max9867_i2c_probe(struct i2c_client *i2c)
{
struct max9867_priv *max9867;
int ret, reg;
......@@ -662,7 +661,7 @@ static struct i2c_driver max9867_i2c_driver = {
.name = "max9867",
.of_match_table = of_match_ptr(max9867_of_match),
},
.probe = max9867_i2c_probe,
.probe_new = max9867_i2c_probe,
.id_table = max9867_i2c_id,
};
......
sound/soc/codecs/max9877.c
View file @ 122cef68
......@@ -133,8 +133,7 @@ static const struct regmap_config max9877_regmap = {
.cache_type = REGCACHE_RBTREE,
};
static int max9877_i2c_probe(struct i2c_client *client,
const struct i2c_device_id *id)
static int max9877_i2c_probe(struct i2c_client *client)
{
struct regmap *regmap;
int i;
......@@ -161,7 +160,7 @@ static struct i2c_driver max9877_i2c_driver = {
.driver = {
.name = "max9877",
},
.probe = max9877_i2c_probe,
.probe_new = max9877_i2c_probe,
.id_table = max9877_i2c_id,
};
......
sound/soc/codecs/max98925.c
View file @ 122cef68
......@@ -558,8 +558,7 @@ static const struct regmap_config max98925_regmap = {
.cache_type = REGCACHE_RBTREE,
};
static int max98925_i2c_probe(struct i2c_client *i2c,
const struct i2c_device_id *id)
static int max98925_i2c_probe(struct i2c_client *i2c)
{
int ret, reg;
u32 value;
......@@ -637,7 +636,7 @@ static struct i2c_driver max98925_i2c_driver = {
.name = "max98925",
.of_match_table = of_match_ptr(max98925_of_match),
},
.probe = max98925_i2c_probe,
.probe_new = max98925_i2c_probe,
.id_table = max98925_i2c_id,
};
......
sound/soc/codecs/max98926.c
View file @ 122cef68
......@@ -510,8 +510,7 @@ static const struct regmap_config max98926_regmap = {
.cache_type = REGCACHE_RBTREE,
};
static int max98926_i2c_probe(struct i2c_client *i2c,
const struct i2c_device_id *id)
static int max98926_i2c_probe(struct i2c_client *i2c)
{
int ret, reg;
u32 value;
......@@ -584,7 +583,7 @@ static struct i2c_driver max98926_i2c_driver = {
.name = "max98926",
.of_match_table = of_match_ptr(max98926_of_match),
},
.probe = max98926_i2c_probe,
.probe_new = max98926_i2c_probe,
.id_table = max98926_i2c_id,
};
......
sound/soc/codecs/max98927.c
View file @ 122cef68
......@@ -863,8 +863,7 @@ static void max98927_slot_config(struct i2c_client *i2c,
max98927->i_l_slot = 1;
}
static int max98927_i2c_probe(struct i2c_client *i2c,
const struct i2c_device_id *id)
static int max98927_i2c_probe(struct i2c_client *i2c)
{
int ret = 0, value;
......@@ -977,7 +976,7 @@ static struct i2c_driver max98927_i2c_driver = {
.acpi_match_table = ACPI_PTR(max98927_acpi_match),
.pm = &max98927_pm,
},
.probe = max98927_i2c_probe,
.probe_new = max98927_i2c_probe,
.remove = max98927_i2c_remove,
.id_table = max98927_i2c_id,
};
......
sound/soc/codecs/ml26124.c
View file @ 122cef68
......@@ -550,8 +550,7 @@ static const struct regmap_config ml26124_i2c_regmap = {
.write_flag_mask = 0x01,
};
static int ml26124_i2c_probe(struct i2c_client *i2c,
const struct i2c_device_id *id)
static int ml26124_i2c_probe(struct i2c_client *i2c)
{
struct ml26124_priv *priv;
int ret;
......@@ -583,7 +582,7 @@ static struct i2c_driver ml26124_i2c_driver = {
.driver = {
.name = "ml26124",
},
.probe = ml26124_i2c_probe,
.probe_new = ml26124_i2c_probe,
.id_table = ml26124_i2c_id,
};
......
sound/soc/codecs/nau8540.c
View file @ 122cef68
......@@ -823,8 +823,7 @@ static const struct regmap_config nau8540_regmap_config = {
.num_reg_defaults = ARRAY_SIZE(nau8540_reg_defaults),
};
static int nau8540_i2c_probe(struct i2c_client *i2c,
const struct i2c_device_id *id)
static int nau8540_i2c_probe(struct i2c_client *i2c)
{
struct device *dev = &i2c->dev;
struct nau8540 *nau8540 = dev_get_platdata(dev);
......@@ -874,7 +873,7 @@ static struct i2c_driver nau8540_i2c_driver = {
.name = "nau8540",
.of_match_table = of_match_ptr(nau8540_of_ids),
},
.probe = nau8540_i2c_probe,
.probe_new = nau8540_i2c_probe,
.id_table = nau8540_i2c_ids,
};
module_i2c_driver(nau8540_i2c_driver);
......
sound/soc/codecs/nau8810.c
View file @ 122cef68
......@@ -869,8 +869,7 @@ static const struct snd_soc_component_driver nau8810_component_driver = {
.non_legacy_dai_naming = 1,
};
static int nau8810_i2c_probe(struct i2c_client *i2c,
const struct i2c_device_id *id)
static int nau8810_i2c_probe(struct i2c_client *i2c)
{
struct device *dev = &i2c->dev;
struct nau8810 *nau8810 = dev_get_platdata(dev);
......@@ -916,7 +915,7 @@ static struct i2c_driver nau8810_i2c_driver = {
.name = "nau8810",
.of_match_table = of_match_ptr(nau8810_of_match),
},
.probe = nau8810_i2c_probe,
.probe_new = nau8810_i2c_probe,
.id_table = nau8810_i2c_id,
};
......
sound/soc/codecs/nau8821.c
View file @ 122cef68
......@@ -1626,8 +1626,7 @@ static int nau8821_setup_irq(struct nau8821 *nau8821)
return 0;
}
static int nau8821_i2c_probe(struct i2c_client *i2c,
const struct i2c_device_id *id)
static int nau8821_i2c_probe(struct i2c_client *i2c)
{
struct device *dev = &i2c->dev;
struct nau8821 *nau8821 = dev_get_platdata(&i2c->dev);
......@@ -1703,7 +1702,7 @@ static struct i2c_driver nau8821_driver = {
.of_match_table = of_match_ptr(nau8821_of_ids),
.acpi_match_table = ACPI_PTR(nau8821_acpi_match),
},
.probe = nau8821_i2c_probe,
.probe_new = nau8821_i2c_probe,
.remove = nau8821_i2c_remove,
.id_table = nau8821_i2c_ids,
};
......
sound/soc/codecs/nau8822.c
View file @ 122cef68
......@@ -1083,8 +1083,7 @@ static const struct regmap_config nau8822_regmap_config = {
.num_reg_defaults = ARRAY_SIZE(nau8822_reg_defaults),
};
static int nau8822_i2c_probe(struct i2c_client *i2c,
const struct i2c_device_id *id)
static int nau8822_i2c_probe(struct i2c_client *i2c)
{
struct device *dev = &i2c->dev;
struct nau8822 *nau8822 = dev_get_platdata(dev);
......@@ -1141,7 +1140,7 @@ static struct i2c_driver nau8822_i2c_driver = {
.name = "nau8822",
.of_match_table = of_match_ptr(nau8822_of_match),
},
.probe = nau8822_i2c_probe,
.probe_new = nau8822_i2c_probe,
.id_table = nau8822_i2c_id,
};
module_i2c_driver(nau8822_i2c_driver);
......
sound/soc/codecs/nau8824.c
View file @ 122cef68
......@@ -1910,8 +1910,7 @@ const char *nau8824_components(void)
}
EXPORT_SYMBOL_GPL(nau8824_components);
static int nau8824_i2c_probe(struct i2c_client *i2c,
const struct i2c_device_id *id)
static int nau8824_i2c_probe(struct i2c_client *i2c)
{
struct device *dev = &i2c->dev;
struct nau8824 *nau8824 = dev_get_platdata(dev);
......@@ -1985,7 +1984,7 @@ static struct i2c_driver nau8824_i2c_driver = {
.of_match_table = of_match_ptr(nau8824_of_ids),
.acpi_match_table = ACPI_PTR(nau8824_acpi_match),
},
.probe = nau8824_i2c_probe,
.probe_new = nau8824_i2c_probe,
.id_table = nau8824_i2c_ids,
};
module_i2c_driver(nau8824_i2c_driver);
......
sound/soc/codecs/nau8825.c
View file @ 122cef68
......@@ -2613,8 +2613,7 @@ static int nau8825_setup_irq(struct nau8825 *nau8825)
return 0;
}
static int nau8825_i2c_probe(struct i2c_client *i2c,
const struct i2c_device_id *id)
static int nau8825_i2c_probe(struct i2c_client *i2c)
{
struct device *dev = &i2c->dev;
struct nau8825 *nau8825 = dev_get_platdata(&i2c->dev);
......@@ -2703,7 +2702,7 @@ static struct i2c_driver nau8825_driver = {
.of_match_table = of_match_ptr(nau8825_of_ids),
.acpi_match_table = ACPI_PTR(nau8825_acpi_match),
},
.probe = nau8825_i2c_probe,
.probe_new = nau8825_i2c_probe,
.remove = nau8825_i2c_remove,
.id_table = nau8825_i2c_ids,
};
......
sound/soc/codecs/pcm1681.c
View file @ 122cef68
......@@ -299,8 +299,7 @@ static const struct i2c_device_id pcm1681_i2c_id[] = {
};
MODULE_DEVICE_TABLE(i2c, pcm1681_i2c_id);
static int pcm1681_i2c_probe(struct i2c_client *client,
const struct i2c_device_id *id)
static int pcm1681_i2c_probe(struct i2c_client *client)
{
int ret;
struct pcm1681_private *priv;
......@@ -329,7 +328,7 @@ static struct i2c_driver pcm1681_i2c_driver = {
.of_match_table = of_match_ptr(pcm1681_dt_ids),
},
.id_table = pcm1681_i2c_id,
.probe = pcm1681_i2c_probe,
.probe_new = pcm1681_i2c_probe,
};
module_i2c_driver(pcm1681_i2c_driver);
......
sound/soc/codecs/pcm1789-i2c.c
View file @ 122cef68
......@@ -12,8 +12,7 @@
#include "pcm1789.h"
static int pcm1789_i2c_probe(struct i2c_client *client,
const struct i2c_device_id *id)
static int pcm1789_i2c_probe(struct i2c_client *client)
{
struct regmap *regmap;
int ret;
......@@ -53,7 +52,7 @@ static struct i2c_driver pcm1789_i2c_driver = {
.of_match_table = of_match_ptr(pcm1789_of_match),
},
.id_table = pcm1789_i2c_ids,
.probe = pcm1789_i2c_probe,
.probe_new = pcm1789_i2c_probe,
.remove = pcm1789_i2c_remove,
};
......
sound/soc/codecs/pcm179x-i2c.c
View file @ 122cef68
......@@ -14,8 +14,7 @@
#include "pcm179x.h"
static int pcm179x_i2c_probe(struct i2c_client *client,
const struct i2c_device_id *id)
static int pcm179x_i2c_probe(struct i2c_client *client)
{
struct regmap *regmap;
int ret;
......@@ -50,7 +49,7 @@ static struct i2c_driver pcm179x_i2c_driver = {
.of_match_table = of_match_ptr(pcm179x_of_match),
},
.id_table = pcm179x_i2c_ids,
.probe = pcm179x_i2c_probe,
.probe_new = pcm179x_i2c_probe,
};
module_i2c_driver(pcm179x_i2c_driver);
......
sound/soc/codecs/pcm3168a-i2c.c
View file @ 122cef68
......@@ -15,8 +15,7 @@
#include "pcm3168a.h"
static int pcm3168a_i2c_probe(struct i2c_client *i2c,
const struct i2c_device_id *id)
static int pcm3168a_i2c_probe(struct i2c_client *i2c)
{
struct regmap *regmap;
......@@ -47,7 +46,7 @@ static const struct of_device_id pcm3168a_of_match[] = {
MODULE_DEVICE_TABLE(of, pcm3168a_of_match);
static struct i2c_driver pcm3168a_i2c_driver = {
.probe = pcm3168a_i2c_probe,
.probe_new = pcm3168a_i2c_probe,
.remove = pcm3168a_i2c_remove,
.id_table = pcm3168a_i2c_id,
.driver = {
......
sound/soc/codecs/pcm512x-i2c.c
View file @ 122cef68
......@@ -13,8 +13,7 @@
#include "pcm512x.h"
static int pcm512x_i2c_probe(struct i2c_client *i2c,
const struct i2c_device_id *id)
static int pcm512x_i2c_probe(struct i2c_client *i2c)
{
struct regmap *regmap;
struct regmap_config config = pcm512x_regmap;
......@@ -68,7 +67,7 @@ MODULE_DEVICE_TABLE(acpi, pcm512x_acpi_match);
#endif
static struct i2c_driver pcm512x_i2c_driver = {
.probe = pcm512x_i2c_probe,
.probe_new = pcm512x_i2c_probe,
.remove = pcm512x_i2c_remove,
.id_table = pcm512x_i2c_id,
.driver = {
......
sound/soc/codecs/sta32x.c
View file @ 122cef68
......@@ -1094,8 +1094,7 @@ static int sta32x_probe_dt(struct device *dev, struct sta32x_priv *sta32x)
}
#endif
static int sta32x_i2c_probe(struct i2c_client *i2c,
const struct i2c_device_id *id)
static int sta32x_i2c_probe(struct i2c_client *i2c)
{
struct device *dev = &i2c->dev;
struct sta32x_priv *sta32x;
......@@ -1175,7 +1174,7 @@ static struct i2c_driver sta32x_i2c_driver = {
.name = "sta32x",
.of_match_table = of_match_ptr(st32x_dt_ids),
},
.probe = sta32x_i2c_probe,
.probe_new = sta32x_i2c_probe,
.id_table = sta32x_i2c_id,
};
......
sound/soc/codecs/sta350.c
View file @ 122cef68
......@@ -1187,8 +1187,7 @@ static int sta350_probe_dt(struct device *dev, struct sta350_priv *sta350)
}
#endif
static int sta350_i2c_probe(struct i2c_client *i2c,
const struct i2c_device_id *id)
static int sta350_i2c_probe(struct i2c_client *i2c)
{
struct device *dev = &i2c->dev;
struct sta350_priv *sta350;
......@@ -1263,7 +1262,7 @@ static struct i2c_driver sta350_i2c_driver = {
.name = "sta350",
.of_match_table = of_match_ptr(st350_dt_ids),
},
.probe = sta350_i2c_probe,
.probe_new = sta350_i2c_probe,
.remove = sta350_i2c_remove,
.id_table = sta350_i2c_id,
};
......
sound/soc/codecs/sta529.c
View file @ 122cef68
......@@ -337,8 +337,7 @@ static const struct regmap_config sta529_regmap = {
.num_reg_defaults = ARRAY_SIZE(sta529_reg_defaults),
};
static int sta529_i2c_probe(struct i2c_client *i2c,
const struct i2c_device_id *id)
static int sta529_i2c_probe(struct i2c_client *i2c)
{
struct sta529 *sta529;
int ret;
......@@ -381,7 +380,7 @@ static struct i2c_driver sta529_i2c_driver = {
.name = "sta529",
.of_match_table = sta529_of_match,
},
.probe = sta529_i2c_probe,
.probe_new = sta529_i2c_probe,
.id_table = sta529_i2c_id,
};
......
sound/soc/codecs/tas2552.c
View file @ 122cef68
......@@ -681,8 +681,7 @@ static const struct regmap_config tas2552_regmap_config = {
.cache_type = REGCACHE_RBTREE,
};
static int tas2552_probe(struct i2c_client *client,
const struct i2c_device_id *id)
static int tas2552_probe(struct i2c_client *client)
{
struct device *dev;
struct tas2552_data *data;
......@@ -764,7 +763,7 @@ static struct i2c_driver tas2552_i2c_driver = {
.of_match_table = of_match_ptr(tas2552_of_match),
.pm = &tas2552_pm,
},
.probe = tas2552_probe,
.probe_new = tas2552_probe,
.remove = tas2552_i2c_remove,
.id_table = tas2552_id,
};
......
sound/soc/codecs/tas2764.c
View file @ 122cef68
......@@ -621,8 +621,7 @@ static int tas2764_parse_dt(struct device *dev, struct tas2764_priv *tas2764)
return 0;
}
static int tas2764_i2c_probe(struct i2c_client *client,
const struct i2c_device_id *id)
static int tas2764_i2c_probe(struct i2c_client *client)
{
struct tas2764_priv *tas2764;
int result;
......@@ -678,7 +677,7 @@ static struct i2c_driver tas2764_i2c_driver = {
.name = "tas2764",
.of_match_table = of_match_ptr(tas2764_of_match),
},
.probe = tas2764_i2c_probe,
.probe_new = tas2764_i2c_probe,
.id_table = tas2764_i2c_id,
};
module_i2c_driver(tas2764_i2c_driver);
......
sound/soc/codecs/tas2770.c
View file @ 122cef68
......@@ -672,8 +672,7 @@ static int tas2770_parse_dt(struct device *dev, struct tas2770_priv *tas2770)
return 0;
}
static int tas2770_i2c_probe(struct i2c_client *client,
const struct i2c_device_id *id)
static int tas2770_i2c_probe(struct i2c_client *client)
{
struct tas2770_priv *tas2770;
int result;
......@@ -739,7 +738,7 @@ static struct i2c_driver tas2770_i2c_driver = {
.name = "tas2770",
.of_match_table = of_match_ptr(tas2770_of_match),
},
.probe = tas2770_i2c_probe,
.probe_new = tas2770_i2c_probe,
.id_table = tas2770_i2c_id,
};
module_i2c_driver(tas2770_i2c_driver);
......
sound/soc/codecs/tas5086.c
View file @ 122cef68
......@@ -911,8 +911,7 @@ static const struct regmap_config tas5086_regmap = {
.reg_write = tas5086_reg_write,
};
static int tas5086_i2c_probe(struct i2c_client *i2c,
const struct i2c_device_id *id)
static int tas5086_i2c_probe(struct i2c_client *i2c)
{
struct tas5086_private *priv;
struct device *dev = &i2c->dev;
......@@ -994,7 +993,7 @@ static struct i2c_driver tas5086_i2c_driver = {
.of_match_table = of_match_ptr(tas5086_dt_ids),
},
.id_table = tas5086_i2c_id,
.probe = tas5086_i2c_probe,
.probe_new = tas5086_i2c_probe,
.remove = tas5086_i2c_remove,
};
......
sound/soc/codecs/tas6424.c
View file @ 122cef68
......@@ -682,8 +682,7 @@ static const struct of_device_id tas6424_of_ids[] = {
MODULE_DEVICE_TABLE(of, tas6424_of_ids);
#endif
static int tas6424_i2c_probe(struct i2c_client *client,
const struct i2c_device_id *id)
static int tas6424_i2c_probe(struct i2c_client *client)
{
struct device *dev = &client->dev;
struct tas6424_data *tas6424;
......@@ -805,7 +804,7 @@ static struct i2c_driver tas6424_i2c_driver = {
.name = "tas6424",
.of_match_table = of_match_ptr(tas6424_of_ids),
},
.probe = tas6424_i2c_probe,
.probe_new = tas6424_i2c_probe,
.remove = tas6424_i2c_remove,
.id_table = tas6424_i2c_ids,
};
......
sound/soc/codecs/tda7419.c
View file @ 122cef68
......@@ -571,8 +571,7 @@ static const struct snd_soc_component_driver tda7419_component_driver = {
.num_dapm_routes = ARRAY_SIZE(tda7419_dapm_routes),
};
static int tda7419_probe(struct i2c_client *i2c,
const struct i2c_device_id *id)
static int tda7419_probe(struct i2c_client *i2c)
{
struct tda7419_data *tda7419;
int i, ret;
......@@ -630,7 +629,7 @@ static struct i2c_driver tda7419_driver = {
.name = "tda7419",
.of_match_table = tda7419_of_match,
},
.probe = tda7419_probe,
.probe_new = tda7419_probe,
.id_table = tda7419_i2c_id,
};
......
sound/soc/codecs/tlv320adcx140.c
View file @ 122cef68
......@@ -1083,8 +1083,7 @@ static const struct of_device_id tlv320adcx140_of_match[] = {
MODULE_DEVICE_TABLE(of, tlv320adcx140_of_match);
#endif
static int adcx140_i2c_probe(struct i2c_client *i2c,
const struct i2c_device_id *id)
static int adcx140_i2c_probe(struct i2c_client *i2c)
{
struct adcx140_priv *adcx140;
int ret;
......@@ -1143,7 +1142,7 @@ static struct i2c_driver adcx140_i2c_driver = {
.name = "tlv320adcx140-codec",
.of_match_table = of_match_ptr(tlv320adcx140_of_match),
},
.probe = adcx140_i2c_probe,
.probe_new = adcx140_i2c_probe,
.id_table = adcx140_i2c_id,
};
module_i2c_driver(adcx140_i2c_driver);
......
sound/soc/codecs/tlv320aic23-i2c.c
View file @ 122cef68
......@@ -16,8 +16,7 @@
#include "tlv320aic23.h"
static int tlv320aic23_i2c_probe(struct i2c_client *i2c,
const struct i2c_device_id *i2c_id)
static int tlv320aic23_i2c_probe(struct i2c_client *i2c)
{
struct regmap *regmap;
......@@ -48,7 +47,7 @@ static struct i2c_driver tlv320aic23_i2c_driver = {
.name = "tlv320aic23-codec",
.of_match_table = of_match_ptr(tlv320aic23_of_match),
},
.probe = tlv320aic23_i2c_probe,
.probe_new = tlv320aic23_i2c_probe,
.id_table = tlv320aic23_id,
};
......
sound/soc/codecs/tlv320dac33.c
View file @ 122cef68
......@@ -1463,8 +1463,7 @@ static struct snd_soc_dai_driver dac33_dai = {
.ops = &dac33_dai_ops,
};
static int dac33_i2c_probe(struct i2c_client *client,
const struct i2c_device_id *id)
static int dac33_i2c_probe(struct i2c_client *client)
{
struct tlv320dac33_platform_data *pdata;
struct tlv320dac33_priv *dac33;
......@@ -1566,7 +1565,7 @@ static struct i2c_driver tlv320dac33_i2c_driver = {
.driver = {
.name = "tlv320dac33-codec",
},
.probe = dac33_i2c_probe,
.probe_new = dac33_i2c_probe,
.remove = dac33_i2c_remove,
.id_table = tlv320dac33_i2c_id,
};
......
sound/soc/codecs/ts3a227e.c
View file @ 122cef68
......@@ -282,8 +282,7 @@ static int ts3a227e_parse_device_property(struct ts3a227e *ts3a227e,
return 0;
}
static int ts3a227e_i2c_probe(struct i2c_client *i2c,
const struct i2c_device_id *id)
static int ts3a227e_i2c_probe(struct i2c_client *i2c)
{
struct ts3a227e *ts3a227e;
struct device *dev = &i2c->dev;
......@@ -389,7 +388,7 @@ static struct i2c_driver ts3a227e_driver = {
.of_match_table = of_match_ptr(ts3a227e_of_match),
.acpi_match_table = ACPI_PTR(ts3a227e_acpi_match),
},
.probe = ts3a227e_i2c_probe,
.probe_new = ts3a227e_i2c_probe,
.id_table = ts3a227e_i2c_ids,
};
module_i2c_driver(ts3a227e_driver);
......
sound/soc/codecs/uda1380.c
View file @ 122cef68
......@@ -739,8 +739,7 @@ static const struct snd_soc_component_driver soc_component_dev_uda1380 = {
.non_legacy_dai_naming = 1,
};
static int uda1380_i2c_probe(struct i2c_client *i2c,
const struct i2c_device_id *id)
static int uda1380_i2c_probe(struct i2c_client *i2c)
{
struct uda1380_platform_data *pdata = i2c->dev.platform_data;
struct uda1380_priv *uda1380;
......@@ -800,7 +799,7 @@ static struct i2c_driver uda1380_i2c_driver = {
.name = "uda1380-codec",
.of_match_table = uda1380_of_match,
},
.probe = uda1380_i2c_probe,
.probe_new = uda1380_i2c_probe,
.id_table = uda1380_i2c_id,
};
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7