Commit 2d86cef3 authored by Mark Brown's avatar Mark Brown

ASoC: nau8821: Don't unconditionally free interrupt

The remove() operation unconditionally frees the interrupt for the device
but we may not actually have an interrupt so there might be nothing to
free. Since the interrupt is requested after all other resources we don't
need the explicit free anyway, unwinding is guaranteed to be safe, so just
delete the remove() function and let devm take care of things.
Reported-by: default avatarZheyu Ma <zheyuma97@gmail.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
Tested-by: default avatarZheyu Ma <zheyuma97@gmail.com>
Link: https://lore.kernel.org/r/20220718140405.57233-1-broonie@kernel.orgSigned-off-by: default avatarMark Brown <broonie@kernel.org>
parent 393a40b5
...@@ -1729,15 +1729,6 @@ static int nau8821_i2c_probe(struct i2c_client *i2c) ...@@ -1729,15 +1729,6 @@ static int nau8821_i2c_probe(struct i2c_client *i2c)
return ret; return ret;
} }
static int nau8821_i2c_remove(struct i2c_client *i2c_client)
{
struct nau8821 *nau8821 = i2c_get_clientdata(i2c_client);
devm_free_irq(nau8821->dev, nau8821->irq, nau8821);
return 0;
}
static const struct i2c_device_id nau8821_i2c_ids[] = { static const struct i2c_device_id nau8821_i2c_ids[] = {
{ "nau8821", 0 }, { "nau8821", 0 },
{ } { }
...@@ -1767,7 +1758,6 @@ static struct i2c_driver nau8821_driver = { ...@@ -1767,7 +1758,6 @@ static struct i2c_driver nau8821_driver = {
.acpi_match_table = ACPI_PTR(nau8821_acpi_match), .acpi_match_table = ACPI_PTR(nau8821_acpi_match),
}, },
.probe_new = nau8821_i2c_probe, .probe_new = nau8821_i2c_probe,
.remove = nau8821_i2c_remove,
.id_table = nau8821_i2c_ids, .id_table = nau8821_i2c_ids,
}; };
module_i2c_driver(nau8821_driver); module_i2c_driver(nau8821_driver);
......
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