mirror of
https://github.com/torvalds/linux.git
synced 2024-11-22 12:11:40 +00:00
ed5c2f5fd1
The value returned by an i2c 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. Reviewed-by: Peter Senna Tschudin <peter.senna@gmail.com> Reviewed-by: Jeremy Kerr <jk@codeconstruct.com.au> Reviewed-by: Benjamin Mugnier <benjamin.mugnier@foss.st.com> Reviewed-by: Javier Martinez Canillas <javierm@redhat.com> Reviewed-by: Crt Mori <cmo@melexis.com> Reviewed-by: Heikki Krogerus <heikki.krogerus@linux.intel.com> Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Acked-by: Marek Behún <kabel@kernel.org> # for leds-turris-omnia Acked-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> Reviewed-by: Petr Machata <petrm@nvidia.com> # for mlxsw Reviewed-by: Maximilian Luz <luzmaximilian@gmail.com> # for surface3_power Acked-by: Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com> # for bmc150-accel-i2c + kxcjk-1013 Reviewed-by: Hans Verkuil <hverkuil-cisco@xs4all.nl> # for media/* + staging/media/* Acked-by: Miguel Ojeda <ojeda@kernel.org> # for auxdisplay/ht16k33 + auxdisplay/lcd2s Reviewed-by: Luca Ceresoli <luca.ceresoli@bootlin.com> # for versaclock5 Reviewed-by: Ajay Gupta <ajayg@nvidia.com> # for ucsi_ccg Acked-by: Jonathan Cameron <Jonathan.Cameron@huawei.com> # for iio Acked-by: Peter Rosin <peda@axentia.se> # for i2c-mux-*, max9860 Acked-by: Adrien Grassein <adrien.grassein@gmail.com> # for lontium-lt8912b Reviewed-by: Jean Delvare <jdelvare@suse.de> # for hwmon, i2c-core and i2c/muxes Acked-by: Corey Minyard <cminyard@mvista.com> # for IPMI Reviewed-by: Vladimir Oltean <olteanv@gmail.com> Acked-by: Dmitry Torokhov <dmitry.torokhov@gmail.com> Acked-by: Sebastian Reichel <sebastian.reichel@collabora.com> # for drivers/power Acked-by: Krzysztof Hałasa <khalasa@piap.pl> Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Signed-off-by: Wolfram Sang <wsa@kernel.org>
84 lines
2.1 KiB
C
84 lines
2.1 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/i2c.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 const struct i2c_device_id aic32x4_i2c_id[];
|
|
|
|
static int aic32x4_i2c_probe(struct i2c_client *i2c)
|
|
{
|
|
struct regmap *regmap;
|
|
struct regmap_config config;
|
|
|
|
config = aic32x4_regmap_config;
|
|
config.reg_bits = 8;
|
|
config.val_bits = 8;
|
|
|
|
regmap = devm_regmap_init_i2c(i2c, &config);
|
|
|
|
if (i2c->dev.of_node) {
|
|
const struct of_device_id *oid;
|
|
|
|
oid = of_match_node(aic32x4_of_id, i2c->dev.of_node);
|
|
dev_set_drvdata(&i2c->dev, (void *)oid->data);
|
|
} else {
|
|
const struct i2c_device_id *id;
|
|
|
|
id = i2c_match_id(aic32x4_i2c_id, i2c);
|
|
dev_set_drvdata(&i2c->dev, (void *)id->driver_data);
|
|
}
|
|
|
|
return aic32x4_probe(&i2c->dev, regmap);
|
|
}
|
|
|
|
static void aic32x4_i2c_remove(struct i2c_client *i2c)
|
|
{
|
|
aic32x4_remove(&i2c->dev);
|
|
}
|
|
|
|
static const struct i2c_device_id aic32x4_i2c_id[] = {
|
|
{ "tlv320aic32x4", (kernel_ulong_t)AIC32X4_TYPE_AIC32X4 },
|
|
{ "tlv320aic32x6", (kernel_ulong_t)AIC32X4_TYPE_AIC32X6 },
|
|
{ "tas2505", (kernel_ulong_t)AIC32X4_TYPE_TAS2505 },
|
|
{ /* sentinel */ }
|
|
};
|
|
MODULE_DEVICE_TABLE(i2c, aic32x4_i2c_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 },
|
|
{ .compatible = "ti,tas2505", .data = (void *)AIC32X4_TYPE_TAS2505 },
|
|
{ /* senitel */ }
|
|
};
|
|
MODULE_DEVICE_TABLE(of, aic32x4_of_id);
|
|
|
|
static struct i2c_driver aic32x4_i2c_driver = {
|
|
.driver = {
|
|
.name = "tlv320aic32x4",
|
|
.of_match_table = aic32x4_of_id,
|
|
},
|
|
.probe_new = aic32x4_i2c_probe,
|
|
.remove = aic32x4_i2c_remove,
|
|
.id_table = aic32x4_i2c_id,
|
|
};
|
|
|
|
module_i2c_driver(aic32x4_i2c_driver);
|
|
|
|
MODULE_DESCRIPTION("ASoC TLV320AIC32x4 codec driver I2C");
|
|
MODULE_AUTHOR("Annaliese McDermond <nh6z@nh6z.net>");
|
|
MODULE_LICENSE("GPL");
|