mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-12 13:55:32 +00:00
a0386bba70
The value returned by an spi driver's remove function is mostly ignored. (Only an error message is printed if the value is non-zero that the error is ignored.) So change the prototype of the remove function to return no value. This way driver authors are not tempted to assume that passing an error to the upper layer is a good idea. All drivers are adapted accordingly. There is no intended change of behaviour, all callbacks were prepared to return 0 before. Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Acked-by: Marc Kleine-Budde <mkl@pengutronix.de> Acked-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be> Acked-by: Jérôme Pouiller <jerome.pouiller@silabs.com> Acked-by: Miquel Raynal <miquel.raynal@bootlin.com> Acked-by: Jonathan Cameron <Jonathan.Cameron@huawei.com> Acked-by: Claudius Heine <ch@denx.de> Acked-by: Stefan Schmidt <stefan@datenfreihafen.org> Acked-by: Alexandre Belloni <alexandre.belloni@bootlin.com> Acked-by: Ulf Hansson <ulf.hansson@linaro.org> # For MMC Acked-by: Marcus Folkesson <marcus.folkesson@gmail.com> Acked-by: Łukasz Stelmach <l.stelmach@samsung.com> Acked-by: Lee Jones <lee.jones@linaro.org> Link: https://lore.kernel.org/r/20220123175201.34839-6-u.kleine-koenig@pengutronix.de Signed-off-by: Mark Brown <broonie@kernel.org>
83 lines
2 KiB
C
83 lines
2 KiB
C
/* SPDX-License-Identifier: GPL-2.0
|
|
*
|
|
* Copyright 2011-2019 NW Digital Radio
|
|
*
|
|
* Author: Annaliese McDermond <nh6z@nh6z.net>
|
|
*
|
|
* Based on sound/soc/codecs/wm8974 and TI driver for kernel 2.6.27.
|
|
*
|
|
*/
|
|
|
|
#include <linux/spi/spi.h>
|
|
#include <linux/module.h>
|
|
#include <linux/of.h>
|
|
#include <linux/regmap.h>
|
|
#include <sound/soc.h>
|
|
|
|
#include "tlv320aic32x4.h"
|
|
|
|
static const struct of_device_id aic32x4_of_id[];
|
|
|
|
static int aic32x4_spi_probe(struct spi_device *spi)
|
|
{
|
|
struct regmap *regmap;
|
|
struct regmap_config config;
|
|
|
|
config = aic32x4_regmap_config;
|
|
config.reg_bits = 7;
|
|
config.pad_bits = 1;
|
|
config.val_bits = 8;
|
|
config.read_flag_mask = 0x01;
|
|
|
|
regmap = devm_regmap_init_spi(spi, &config);
|
|
|
|
if (spi->dev.of_node) {
|
|
const struct of_device_id *oid;
|
|
|
|
oid = of_match_node(aic32x4_of_id, spi->dev.of_node);
|
|
dev_set_drvdata(&spi->dev, (void *)oid->data);
|
|
} else {
|
|
const struct spi_device_id *id_entry;
|
|
|
|
id_entry = spi_get_device_id(spi);
|
|
dev_set_drvdata(&spi->dev, (void *)id_entry->driver_data);
|
|
}
|
|
|
|
return aic32x4_probe(&spi->dev, regmap);
|
|
}
|
|
|
|
static void aic32x4_spi_remove(struct spi_device *spi)
|
|
{
|
|
aic32x4_remove(&spi->dev);
|
|
}
|
|
|
|
static const struct spi_device_id aic32x4_spi_id[] = {
|
|
{ "tlv320aic32x4", (kernel_ulong_t)AIC32X4_TYPE_AIC32X4 },
|
|
{ "tlv320aic32x6", (kernel_ulong_t)AIC32X4_TYPE_AIC32X6 },
|
|
{ /* sentinel */ }
|
|
};
|
|
MODULE_DEVICE_TABLE(spi, aic32x4_spi_id);
|
|
|
|
static const struct of_device_id aic32x4_of_id[] = {
|
|
{ .compatible = "ti,tlv320aic32x4", .data = (void *)AIC32X4_TYPE_AIC32X4 },
|
|
{ .compatible = "ti,tlv320aic32x6", .data = (void *)AIC32X4_TYPE_AIC32X6 },
|
|
{ /* senitel */ }
|
|
};
|
|
MODULE_DEVICE_TABLE(of, aic32x4_of_id);
|
|
|
|
static struct spi_driver aic32x4_spi_driver = {
|
|
.driver = {
|
|
.name = "tlv320aic32x4",
|
|
.owner = THIS_MODULE,
|
|
.of_match_table = aic32x4_of_id,
|
|
},
|
|
.probe = aic32x4_spi_probe,
|
|
.remove = aic32x4_spi_remove,
|
|
.id_table = aic32x4_spi_id,
|
|
};
|
|
|
|
module_spi_driver(aic32x4_spi_driver);
|
|
|
|
MODULE_DESCRIPTION("ASoC TLV320AIC32x4 codec driver SPI");
|
|
MODULE_AUTHOR("Annaliese McDermond <nh6z@nh6z.net>");
|
|
MODULE_LICENSE("GPL");
|