mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git
synced 2025-01-15 11:37:47 +00:00
Merge branch 'i2c/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux.git
This commit is contained in:
Stephen Rothwell
commit
fae4bf3b85
@ -412,7 +412,7 @@ static int i2c_atr_bus_notifier_call(struct notifier_block *nb,
|
||||
dev_name(dev), ret);
|
||||
break;
|
||||
|
||||
case BUS_NOTIFY_DEL_DEVICE:
|
||||
case BUS_NOTIFY_REMOVED_DEVICE:
|
||||
i2c_atr_detach_client(client->adapter, client);
|
||||
break;
|
||||
|
||||
|
||||
@ -1293,14 +1293,12 @@ new_device_store(struct device *dev, struct device_attribute *attr,
|
||||
info.flags |= I2C_CLIENT_SLAVE;
|
||||
}
|
||||
|
||||
info.flags |= I2C_CLIENT_USER;
|
||||
|
||||
client = i2c_new_client_device(adap, &info);
|
||||
if (IS_ERR(client))
|
||||
return PTR_ERR(client);
|
||||
|
||||
/* Keep track of the added device */
|
||||
mutex_lock(&adap->userspace_clients_lock);
|
||||
list_add_tail(&client->detected, &adap->userspace_clients);
|
||||
mutex_unlock(&adap->userspace_clients_lock);
|
||||
dev_info(dev, "%s: Instantiated device %s at 0x%02hx\n", "new_device",
|
||||
info.type, info.addr);
|
||||
|
||||
@ -1308,6 +1306,15 @@ new_device_store(struct device *dev, struct device_attribute *attr,
|
||||
}
|
||||
static DEVICE_ATTR_WO(new_device);
|
||||
|
||||
static int __i2c_find_user_addr(struct device *dev, void *addrp)
|
||||
{
|
||||
struct i2c_client *client = i2c_verify_client(dev);
|
||||
unsigned short addr = *(unsigned short *)addrp;
|
||||
|
||||
return client && client->flags & I2C_CLIENT_USER &&
|
||||
i2c_encode_flags_to_addr(client) == addr;
|
||||
}
|
||||
|
||||
/*
|
||||
* And of course let the users delete the devices they instantiated, if
|
||||
* they got it wrong. This interface can only be used to delete devices
|
||||
@ -1322,7 +1329,7 @@ delete_device_store(struct device *dev, struct device_attribute *attr,
|
||||
const char *buf, size_t count)
|
||||
{
|
||||
struct i2c_adapter *adap = to_i2c_adapter(dev);
|
||||
struct i2c_client *client, *next;
|
||||
struct device *child_dev;
|
||||
unsigned short addr;
|
||||
char end;
|
||||
int res;
|
||||
@ -1338,28 +1345,19 @@ delete_device_store(struct device *dev, struct device_attribute *attr,
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
mutex_lock(&core_lock);
|
||||
/* Make sure the device was added through sysfs */
|
||||
res = -ENOENT;
|
||||
mutex_lock_nested(&adap->userspace_clients_lock,
|
||||
i2c_adapter_depth(adap));
|
||||
list_for_each_entry_safe(client, next, &adap->userspace_clients,
|
||||
detected) {
|
||||
if (i2c_encode_flags_to_addr(client) == addr) {
|
||||
dev_info(dev, "%s: Deleting device %s at 0x%02hx\n",
|
||||
"delete_device", client->name, client->addr);
|
||||
|
||||
list_del(&client->detected);
|
||||
i2c_unregister_device(client);
|
||||
res = count;
|
||||
break;
|
||||
child_dev = device_find_child(&adap->dev, &addr, __i2c_find_user_addr);
|
||||
if (child_dev) {
|
||||
i2c_unregister_device(i2c_verify_client(child_dev));
|
||||
put_device(child_dev);
|
||||
} else {
|
||||
dev_err(dev, "Can't find userspace-created device at %#x\n", addr);
|
||||
count = -ENOENT;
|
||||
}
|
||||
}
|
||||
mutex_unlock(&adap->userspace_clients_lock);
|
||||
mutex_unlock(&core_lock);
|
||||
|
||||
if (res < 0)
|
||||
dev_err(dev, "%s: Can't find device in list\n",
|
||||
"delete_device");
|
||||
return res;
|
||||
return count;
|
||||
}
|
||||
static DEVICE_ATTR_IGNORE_LOCKDEP(delete_device, S_IWUSR, NULL,
|
||||
delete_device_store);
|
||||
@ -1530,8 +1528,6 @@ static int i2c_register_adapter(struct i2c_adapter *adap)
|
||||
adap->locked_flags = 0;
|
||||
rt_mutex_init(&adap->bus_lock);
|
||||
rt_mutex_init(&adap->mux_lock);
|
||||
mutex_init(&adap->userspace_clients_lock);
|
||||
INIT_LIST_HEAD(&adap->userspace_clients);
|
||||
|
||||
/* Set default timeout to 1 second if not already set */
|
||||
if (adap->timeout == 0)
|
||||
@ -1562,6 +1558,7 @@ static int i2c_register_adapter(struct i2c_adapter *adap)
|
||||
res = device_add(&adap->dev);
|
||||
if (res) {
|
||||
pr_err("adapter '%s': can't register device (%d)\n", adap->name, res);
|
||||
put_device(&adap->dev);
|
||||
goto out_list;
|
||||
}
|
||||
|
||||
@ -1696,23 +1693,6 @@ int i2c_add_numbered_adapter(struct i2c_adapter *adap)
|
||||
}
|
||||
EXPORT_SYMBOL_GPL(i2c_add_numbered_adapter);
|
||||
|
||||
static void i2c_do_del_adapter(struct i2c_driver *driver,
|
||||
struct i2c_adapter *adapter)
|
||||
{
|
||||
struct i2c_client *client, *_n;
|
||||
|
||||
/* Remove the devices we created ourselves as the result of hardware
|
||||
* probing (using a driver's detect method) */
|
||||
list_for_each_entry_safe(client, _n, &driver->clients, detected) {
|
||||
if (client->adapter == adapter) {
|
||||
dev_dbg(&adapter->dev, "Removing %s at 0x%x\n",
|
||||
client->name, client->addr);
|
||||
list_del(&client->detected);
|
||||
i2c_unregister_device(client);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
static int __unregister_client(struct device *dev, void *dummy)
|
||||
{
|
||||
struct i2c_client *client = i2c_verify_client(dev);
|
||||
@ -1728,12 +1708,6 @@ static int __unregister_dummy(struct device *dev, void *dummy)
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int __process_removed_adapter(struct device_driver *d, void *data)
|
||||
{
|
||||
i2c_do_del_adapter(to_i2c_driver(d), data);
|
||||
return 0;
|
||||
}
|
||||
|
||||
/**
|
||||
* i2c_del_adapter - unregister I2C adapter
|
||||
* @adap: the adapter being unregistered
|
||||
@ -1745,7 +1719,6 @@ static int __process_removed_adapter(struct device_driver *d, void *data)
|
||||
void i2c_del_adapter(struct i2c_adapter *adap)
|
||||
{
|
||||
struct i2c_adapter *found;
|
||||
struct i2c_client *client, *next;
|
||||
|
||||
/* First make sure that this adapter was ever added */
|
||||
mutex_lock(&core_lock);
|
||||
@ -1757,31 +1730,16 @@ void i2c_del_adapter(struct i2c_adapter *adap)
|
||||
}
|
||||
|
||||
i2c_acpi_remove_space_handler(adap);
|
||||
/* Tell drivers about this removal */
|
||||
mutex_lock(&core_lock);
|
||||
bus_for_each_drv(&i2c_bus_type, NULL, adap,
|
||||
__process_removed_adapter);
|
||||
mutex_unlock(&core_lock);
|
||||
|
||||
/* Remove devices instantiated from sysfs */
|
||||
mutex_lock_nested(&adap->userspace_clients_lock,
|
||||
i2c_adapter_depth(adap));
|
||||
list_for_each_entry_safe(client, next, &adap->userspace_clients,
|
||||
detected) {
|
||||
dev_dbg(&adap->dev, "Removing %s at 0x%x\n", client->name,
|
||||
client->addr);
|
||||
list_del(&client->detected);
|
||||
i2c_unregister_device(client);
|
||||
}
|
||||
mutex_unlock(&adap->userspace_clients_lock);
|
||||
|
||||
/* Detach any active clients. This can't fail, thus we do not
|
||||
* check the returned value. This is a two-pass process, because
|
||||
* we can't remove the dummy devices during the first pass: they
|
||||
* could have been instantiated by real devices wishing to clean
|
||||
* them up properly, so we give them a chance to do that first. */
|
||||
mutex_lock(&core_lock);
|
||||
device_for_each_child(&adap->dev, NULL, __unregister_client);
|
||||
device_for_each_child(&adap->dev, NULL, __unregister_dummy);
|
||||
mutex_unlock(&core_lock);
|
||||
|
||||
/* device name is gone after device_unregister */
|
||||
dev_dbg(&adap->dev, "adapter [%s] unregistered\n", adap->name);
|
||||
@ -2001,7 +1959,6 @@ int i2c_register_driver(struct module *owner, struct i2c_driver *driver)
|
||||
/* add the driver to the list of i2c drivers in the driver core */
|
||||
driver->driver.owner = owner;
|
||||
driver->driver.bus = &i2c_bus_type;
|
||||
INIT_LIST_HEAD(&driver->clients);
|
||||
|
||||
/* When registration returns, the driver core
|
||||
* will have called probe() for all matching-but-unbound devices.
|
||||
@ -2019,10 +1976,13 @@ int i2c_register_driver(struct module *owner, struct i2c_driver *driver)
|
||||
}
|
||||
EXPORT_SYMBOL(i2c_register_driver);
|
||||
|
||||
static int __process_removed_driver(struct device *dev, void *data)
|
||||
static int __i2c_unregister_detected_client(struct device *dev, void *argp)
|
||||
{
|
||||
if (dev->type == &i2c_adapter_type)
|
||||
i2c_do_del_adapter(data, to_i2c_adapter(dev));
|
||||
struct i2c_client *client = i2c_verify_client(dev);
|
||||
|
||||
if (client && client->flags & I2C_CLIENT_AUTO)
|
||||
i2c_unregister_device(client);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
@ -2033,7 +1993,12 @@ static int __process_removed_driver(struct device *dev, void *data)
|
||||
*/
|
||||
void i2c_del_driver(struct i2c_driver *driver)
|
||||
{
|
||||
i2c_for_each_dev(driver, __process_removed_driver);
|
||||
mutex_lock(&core_lock);
|
||||
/* Satisfy __must_check, function can't fail */
|
||||
if (driver_for_each_device(&driver->driver, NULL, NULL,
|
||||
__i2c_unregister_detected_client)) {
|
||||
}
|
||||
mutex_unlock(&core_lock);
|
||||
|
||||
driver_unregister(&driver->driver);
|
||||
pr_debug("driver [%s] unregistered\n", driver->driver.name);
|
||||
@ -2460,6 +2425,7 @@ static int i2c_detect_address(struct i2c_client *temp_client,
|
||||
/* Finally call the custom detection function */
|
||||
memset(&info, 0, sizeof(struct i2c_board_info));
|
||||
info.addr = addr;
|
||||
info.flags = I2C_CLIENT_AUTO;
|
||||
err = driver->detect(temp_client, &info);
|
||||
if (err) {
|
||||
/* -ENODEV is returned if the detection fails. We catch it
|
||||
@ -2486,9 +2452,7 @@ static int i2c_detect_address(struct i2c_client *temp_client,
|
||||
dev_dbg(&adapter->dev, "Creating %s at 0x%02x\n",
|
||||
info.type, info.addr);
|
||||
client = i2c_new_client_device(adapter, &info);
|
||||
if (!IS_ERR(client))
|
||||
list_add_tail(&client->detected, &driver->clients);
|
||||
else
|
||||
if (IS_ERR(client))
|
||||
dev_err(&adapter->dev, "Failed creating %s at 0x%02x\n",
|
||||
info.type, info.addr);
|
||||
}
|
||||
@ -2498,7 +2462,7 @@ static int i2c_detect_address(struct i2c_client *temp_client,
|
||||
static int i2c_detect(struct i2c_adapter *adapter, struct i2c_driver *driver)
|
||||
{
|
||||
const unsigned short *address_list;
|
||||
struct i2c_client *temp_client;
|
||||
struct i2c_client temp_client;
|
||||
int i, err = 0;
|
||||
|
||||
address_list = driver->address_list;
|
||||
@ -2519,22 +2483,19 @@ static int i2c_detect(struct i2c_adapter *adapter, struct i2c_driver *driver)
|
||||
return 0;
|
||||
|
||||
/* Set up a temporary client to help detect callback */
|
||||
temp_client = kzalloc(sizeof(struct i2c_client), GFP_KERNEL);
|
||||
if (!temp_client)
|
||||
return -ENOMEM;
|
||||
temp_client->adapter = adapter;
|
||||
memset(&temp_client, 0, sizeof(temp_client));
|
||||
temp_client.adapter = adapter;
|
||||
|
||||
for (i = 0; address_list[i] != I2C_CLIENT_END; i += 1) {
|
||||
dev_dbg(&adapter->dev,
|
||||
"found normal entry for adapter %d, addr 0x%02x\n",
|
||||
i2c_adapter_id(adapter), address_list[i]);
|
||||
temp_client->addr = address_list[i];
|
||||
err = i2c_detect_address(temp_client, driver);
|
||||
temp_client.addr = address_list[i];
|
||||
err = i2c_detect_address(&temp_client, driver);
|
||||
if (unlikely(err))
|
||||
break;
|
||||
}
|
||||
|
||||
kfree(temp_client);
|
||||
return err;
|
||||
}
|
||||
|
||||
|
||||
@ -91,7 +91,7 @@ static int i2c_slave_eeprom_slave_cb(struct i2c_client *client,
|
||||
}
|
||||
|
||||
static ssize_t i2c_slave_eeprom_bin_read(struct file *filp, struct kobject *kobj,
|
||||
struct bin_attribute *attr, char *buf, loff_t off, size_t count)
|
||||
const struct bin_attribute *attr, char *buf, loff_t off, size_t count)
|
||||
{
|
||||
struct eeprom_data *eeprom;
|
||||
unsigned long flags;
|
||||
@ -106,7 +106,7 @@ static ssize_t i2c_slave_eeprom_bin_read(struct file *filp, struct kobject *kobj
|
||||
}
|
||||
|
||||
static ssize_t i2c_slave_eeprom_bin_write(struct file *filp, struct kobject *kobj,
|
||||
struct bin_attribute *attr, char *buf, loff_t off, size_t count)
|
||||
const struct bin_attribute *attr, char *buf, loff_t off, size_t count)
|
||||
{
|
||||
struct eeprom_data *eeprom;
|
||||
unsigned long flags;
|
||||
@ -165,8 +165,8 @@ static int i2c_slave_eeprom_probe(struct i2c_client *client)
|
||||
sysfs_bin_attr_init(&eeprom->bin);
|
||||
eeprom->bin.attr.name = "slave-eeprom";
|
||||
eeprom->bin.attr.mode = S_IRUSR | S_IWUSR;
|
||||
eeprom->bin.read = i2c_slave_eeprom_bin_read;
|
||||
eeprom->bin.write = i2c_slave_eeprom_bin_write;
|
||||
eeprom->bin.read_new = i2c_slave_eeprom_bin_read;
|
||||
eeprom->bin.write_new = i2c_slave_eeprom_bin_write;
|
||||
eeprom->bin.size = size;
|
||||
|
||||
ret = sysfs_create_bin_file(&client->dev.kobj, &eeprom->bin);
|
||||
|
||||
@ -244,7 +244,6 @@ enum i2c_driver_flags {
|
||||
* @id_table: List of I2C devices supported by this driver
|
||||
* @detect: Callback for device detection
|
||||
* @address_list: The I2C addresses to probe (for detect)
|
||||
* @clients: List of detected clients we created (for i2c-core use only)
|
||||
* @flags: A bitmask of flags defined in &enum i2c_driver_flags
|
||||
*
|
||||
* The driver.owner field should be set to the module owner of this driver.
|
||||
@ -299,7 +298,6 @@ struct i2c_driver {
|
||||
/* Device detection callback for automatic device creation */
|
||||
int (*detect)(struct i2c_client *client, struct i2c_board_info *info);
|
||||
const unsigned short *address_list;
|
||||
struct list_head clients;
|
||||
|
||||
u32 flags;
|
||||
};
|
||||
@ -315,8 +313,6 @@ struct i2c_driver {
|
||||
* @dev: Driver model device node for the slave.
|
||||
* @init_irq: IRQ that was set at initialization
|
||||
* @irq: indicates the IRQ generated by this device (if any)
|
||||
* @detected: member of an i2c_driver.clients list or i2c-core's
|
||||
* userspace_devices list
|
||||
* @slave_cb: Callback when I2C slave mode of an adapter is used. The adapter
|
||||
* calls it to pass on slave events to the slave driver.
|
||||
* @devres_group_id: id of the devres group that will be created for resources
|
||||
@ -334,6 +330,8 @@ struct i2c_client {
|
||||
#define I2C_CLIENT_SLAVE 0x20 /* we are the slave */
|
||||
#define I2C_CLIENT_HOST_NOTIFY 0x40 /* We want to use I2C host notify */
|
||||
#define I2C_CLIENT_WAKE 0x80 /* for board_info; true iff can wake */
|
||||
#define I2C_CLIENT_AUTO 0x100 /* client was auto-detected */
|
||||
#define I2C_CLIENT_USER 0x200 /* client was userspace-created */
|
||||
#define I2C_CLIENT_SCCB 0x9000 /* Use Omnivision SCCB protocol */
|
||||
/* Must match I2C_M_STOP|IGNORE_NAK */
|
||||
|
||||
@ -345,7 +343,6 @@ struct i2c_client {
|
||||
struct device dev; /* the device structure */
|
||||
int init_irq; /* irq set at initialization */
|
||||
int irq; /* irq issued by device */
|
||||
struct list_head detected;
|
||||
#if IS_ENABLED(CONFIG_I2C_SLAVE)
|
||||
i2c_slave_cb_t slave_cb; /* callback for slave mode */
|
||||
#endif
|
||||
@ -751,9 +748,6 @@ struct i2c_adapter {
|
||||
char name[48];
|
||||
struct completion dev_released;
|
||||
|
||||
struct mutex userspace_clients_lock;
|
||||
struct list_head userspace_clients;
|
||||
|
||||
struct i2c_bus_recovery_info *bus_recovery_info;
|
||||
const struct i2c_adapter_quirks *quirks;
|
||||
|
||||
|
||||
@ -61,12 +61,6 @@ static int keywest_attach_adapter(struct i2c_adapter *adapter)
|
||||
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;
|
||||
}
|
||||
|
||||
@ -99,6 +93,7 @@ static struct i2c_driver keywest_driver = {
|
||||
void snd_pmac_keywest_cleanup(struct pmac_keywest *i2c)
|
||||
{
|
||||
if (keywest_ctx && keywest_ctx == i2c) {
|
||||
i2c_unregister_device(keywest_ctx->client);
|
||||
i2c_del_driver(&keywest_driver);
|
||||
keywest_ctx = NULL;
|
||||
}
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user