mirror of
https://github.com/torvalds/linux.git
synced 2024-12-27 05:11:48 +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>
161 lines
3.6 KiB
C
161 lines
3.6 KiB
C
// SPDX-License-Identifier: GPL-2.0-or-later
|
|
/*
|
|
* common keywest i2c layer
|
|
*
|
|
* Copyright (c) by Takashi Iwai <tiwai@suse.de>
|
|
*/
|
|
|
|
|
|
#include <linux/init.h>
|
|
#include <linux/i2c.h>
|
|
#include <linux/delay.h>
|
|
#include <linux/module.h>
|
|
#include <sound/core.h>
|
|
#include "pmac.h"
|
|
|
|
static struct pmac_keywest *keywest_ctx;
|
|
static bool keywest_probed;
|
|
|
|
static int keywest_probe(struct i2c_client *client,
|
|
const struct i2c_device_id *id)
|
|
{
|
|
keywest_probed = true;
|
|
/* If instantiated via i2c-powermac, we still need to set the client */
|
|
if (!keywest_ctx->client)
|
|
keywest_ctx->client = client;
|
|
i2c_set_clientdata(client, keywest_ctx);
|
|
return 0;
|
|
}
|
|
|
|
/*
|
|
* This is kind of a hack, best would be to turn powermac to fixed i2c
|
|
* bus numbers and declare the sound device as part of platform
|
|
* initialization
|
|
*/
|
|
static int keywest_attach_adapter(struct i2c_adapter *adapter)
|
|
{
|
|
struct i2c_board_info info;
|
|
struct i2c_client *client;
|
|
|
|
if (! keywest_ctx)
|
|
return -EINVAL;
|
|
|
|
if (strncmp(adapter->name, "mac-io", 6))
|
|
return -EINVAL; /* ignored */
|
|
|
|
memset(&info, 0, sizeof(struct i2c_board_info));
|
|
strscpy(info.type, "keywest", I2C_NAME_SIZE);
|
|
info.addr = keywest_ctx->addr;
|
|
client = i2c_new_client_device(adapter, &info);
|
|
if (IS_ERR(client))
|
|
return PTR_ERR(client);
|
|
keywest_ctx->client = client;
|
|
|
|
/*
|
|
* We know the driver is already loaded, so the device should be
|
|
* already bound. If not it means binding failed, and then there
|
|
* is no point in keeping the device instantiated.
|
|
*/
|
|
if (!keywest_ctx->client->dev.driver) {
|
|
i2c_unregister_device(keywest_ctx->client);
|
|
keywest_ctx->client = NULL;
|
|
return -ENODEV;
|
|
}
|
|
|
|
/*
|
|
* Let i2c-core delete that device on driver removal.
|
|
* This is safe because i2c-core holds the core_lock mutex for us.
|
|
*/
|
|
list_add_tail(&keywest_ctx->client->detected,
|
|
&to_i2c_driver(keywest_ctx->client->dev.driver)->clients);
|
|
return 0;
|
|
}
|
|
|
|
static void keywest_remove(struct i2c_client *client)
|
|
{
|
|
if (! keywest_ctx)
|
|
return;
|
|
if (client == keywest_ctx->client)
|
|
keywest_ctx->client = NULL;
|
|
}
|
|
|
|
|
|
static const struct i2c_device_id keywest_i2c_id[] = {
|
|
{ "MAC,tas3004", 0 }, /* instantiated by i2c-powermac */
|
|
{ "keywest", 0 }, /* instantiated by us if needed */
|
|
{ }
|
|
};
|
|
MODULE_DEVICE_TABLE(i2c, keywest_i2c_id);
|
|
|
|
static struct i2c_driver keywest_driver = {
|
|
.driver = {
|
|
.name = "PMac Keywest Audio",
|
|
},
|
|
.probe = keywest_probe,
|
|
.remove = keywest_remove,
|
|
.id_table = keywest_i2c_id,
|
|
};
|
|
|
|
/* exported */
|
|
void snd_pmac_keywest_cleanup(struct pmac_keywest *i2c)
|
|
{
|
|
if (keywest_ctx && keywest_ctx == i2c) {
|
|
i2c_del_driver(&keywest_driver);
|
|
keywest_ctx = NULL;
|
|
}
|
|
}
|
|
|
|
int snd_pmac_tumbler_post_init(void)
|
|
{
|
|
int err;
|
|
|
|
if (!keywest_ctx || !keywest_ctx->client)
|
|
return -ENXIO;
|
|
|
|
err = keywest_ctx->init_client(keywest_ctx);
|
|
if (err < 0) {
|
|
snd_printk(KERN_ERR "tumbler: %i :cannot initialize the MCS\n", err);
|
|
return err;
|
|
}
|
|
return 0;
|
|
}
|
|
|
|
/* exported */
|
|
int snd_pmac_keywest_init(struct pmac_keywest *i2c)
|
|
{
|
|
struct i2c_adapter *adap;
|
|
int err, i = 0;
|
|
|
|
if (keywest_ctx)
|
|
return -EBUSY;
|
|
|
|
adap = i2c_get_adapter(0);
|
|
if (!adap)
|
|
return -EPROBE_DEFER;
|
|
|
|
keywest_ctx = i2c;
|
|
|
|
err = i2c_add_driver(&keywest_driver);
|
|
if (err) {
|
|
snd_printk(KERN_ERR "cannot register keywest i2c driver\n");
|
|
i2c_put_adapter(adap);
|
|
return err;
|
|
}
|
|
|
|
/* There was already a device from i2c-powermac. Great, let's return */
|
|
if (keywest_probed)
|
|
return 0;
|
|
|
|
/* We assume Macs have consecutive I2C bus numbers starting at 0 */
|
|
while (adap) {
|
|
/* Scan for devices to be bound to */
|
|
err = keywest_attach_adapter(adap);
|
|
if (!err)
|
|
return 0;
|
|
i2c_put_adapter(adap);
|
|
adap = i2c_get_adapter(++i);
|
|
}
|
|
|
|
return -ENODEV;
|
|
}
|