Commit 52970da2 authored by Mark Brown's avatar Mark Brown

ASoC: Drop some i2c noop remove callbacks

Merge series from Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Uwe Kleine-König <uwe@kleine-koenig.org>:

From: Uwe Kleine-König <uwe@kleine-koenig.org>

Hello,

I intended to send this after -rc1 was cut, but found a few spare
minutes to prepare this series. All four patches were sent already
before based on v5.18, but there were some conflicting changes added in
the merge window. This series contains the four patches on top of
current linus/master and so bases on a tree including the conflicting
changes. Expecting no more sound changes in this merge window, this
should apply cleanly on top of -rc1.

Best regards
Uwe

Uwe Kleine-König (4):
  ASoC: ak4642: Drop no-op remove function
  ASoC: da7219: Drop no-op remove function
  ASoC: lm49453: Drop no-op remove function
  ASoC: da732x: Drop no-op remove function

 sound/soc/codecs/ak4613.c  | 6 ------
 sound/soc/codecs/da7219.c  | 6 ------
 sound/soc/codecs/da732x.c  | 6 ------
 sound/soc/codecs/lm49453.c | 6 ------
 4 files changed, 24 deletions(-)

base-commit: 50fd82b3
--
2.36.1
parents 2947683c fb68cb96
...@@ -919,18 +919,12 @@ static int ak4613_i2c_probe(struct i2c_client *i2c) ...@@ -919,18 +919,12 @@ static int ak4613_i2c_probe(struct i2c_client *i2c)
&ak4613_dai, 1); &ak4613_dai, 1);
} }
static int ak4613_i2c_remove(struct i2c_client *client)
{
return 0;
}
static struct i2c_driver ak4613_i2c_driver = { static struct i2c_driver ak4613_i2c_driver = {
.driver = { .driver = {
.name = "ak4613-codec", .name = "ak4613-codec",
.of_match_table = ak4613_of_match, .of_match_table = ak4613_of_match,
}, },
.probe_new = ak4613_i2c_probe, .probe_new = ak4613_i2c_probe,
.remove = ak4613_i2c_remove,
.id_table = ak4613_i2c_id, .id_table = ak4613_i2c_id,
}; };
......
...@@ -2693,11 +2693,6 @@ static int da7219_i2c_probe(struct i2c_client *i2c) ...@@ -2693,11 +2693,6 @@ static int da7219_i2c_probe(struct i2c_client *i2c)
return ret; return ret;
} }
static int da7219_i2c_remove(struct i2c_client *client)
{
return 0;
}
static const struct i2c_device_id da7219_i2c_id[] = { static const struct i2c_device_id da7219_i2c_id[] = {
{ "da7219", }, { "da7219", },
{ } { }
...@@ -2711,7 +2706,6 @@ static struct i2c_driver da7219_i2c_driver = { ...@@ -2711,7 +2706,6 @@ static struct i2c_driver da7219_i2c_driver = {
.acpi_match_table = ACPI_PTR(da7219_acpi_match), .acpi_match_table = ACPI_PTR(da7219_acpi_match),
}, },
.probe_new = da7219_i2c_probe, .probe_new = da7219_i2c_probe,
.remove = da7219_i2c_remove,
.id_table = da7219_i2c_id, .id_table = da7219_i2c_id,
}; };
......
...@@ -1546,11 +1546,6 @@ static int da732x_i2c_probe(struct i2c_client *i2c) ...@@ -1546,11 +1546,6 @@ static int da732x_i2c_probe(struct i2c_client *i2c)
return ret; return ret;
} }
static int da732x_i2c_remove(struct i2c_client *client)
{
return 0;
}
static const struct i2c_device_id da732x_i2c_id[] = { static const struct i2c_device_id da732x_i2c_id[] = {
{ "da7320", 0}, { "da7320", 0},
{ } { }
...@@ -1562,7 +1557,6 @@ static struct i2c_driver da732x_i2c_driver = { ...@@ -1562,7 +1557,6 @@ static struct i2c_driver da732x_i2c_driver = {
.name = "da7320", .name = "da7320",
}, },
.probe_new = da732x_i2c_probe, .probe_new = da732x_i2c_probe,
.remove = da732x_i2c_remove,
.id_table = da732x_i2c_id, .id_table = da732x_i2c_id,
}; };
......
...@@ -1442,11 +1442,6 @@ static int lm49453_i2c_probe(struct i2c_client *i2c) ...@@ -1442,11 +1442,6 @@ static int lm49453_i2c_probe(struct i2c_client *i2c)
return ret; return ret;
} }
static int lm49453_i2c_remove(struct i2c_client *client)
{
return 0;
}
static const struct i2c_device_id lm49453_i2c_id[] = { static const struct i2c_device_id lm49453_i2c_id[] = {
{ "lm49453", 0 }, { "lm49453", 0 },
{ } { }
...@@ -1458,7 +1453,6 @@ static struct i2c_driver lm49453_i2c_driver = { ...@@ -1458,7 +1453,6 @@ static struct i2c_driver lm49453_i2c_driver = {
.name = "lm49453", .name = "lm49453",
}, },
.probe_new = lm49453_i2c_probe, .probe_new = lm49453_i2c_probe,
.remove = lm49453_i2c_remove,
.id_table = lm49453_i2c_id, .id_table = lm49453_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