From: Mark Brown Date: Mon, 18 Jul 2022 14:04:05 +0000 (+0100) Subject: ASoC: nau8821: Don't unconditionally free interrupt X-Git-Tag: v6.6.17~6759^2~6^2~47 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=2d86cef353b8f3d20b16f8c5615742fd6938c801;p=platform%2Fkernel%2Flinux-rpi.git 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: Zheyu Ma Signed-off-by: Mark Brown Tested-by: Zheyu Ma Link: https://lore.kernel.org/r/20220718140405.57233-1-broonie@kernel.org Signed-off-by: Mark Brown --- diff --git a/sound/soc/codecs/nau8821.c b/sound/soc/codecs/nau8821.c index 83a17c48..2d21339 100644 --- a/sound/soc/codecs/nau8821.c +++ b/sound/soc/codecs/nau8821.c @@ -1729,15 +1729,6 @@ static int nau8821_i2c_probe(struct i2c_client *i2c) 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[] = { { "nau8821", 0 }, { } @@ -1767,7 +1758,6 @@ static struct i2c_driver nau8821_driver = { .acpi_match_table = ACPI_PTR(nau8821_acpi_match), }, .probe_new = nau8821_i2c_probe, - .remove = nau8821_i2c_remove, .id_table = nau8821_i2c_ids, }; module_i2c_driver(nau8821_driver);