i2c: Refactor for_each callbacks
Functions i2c_do_add_adapter() and __attach_adapter() do essentially the same thing, differing only in how the parameters are passed. Same for i2c_do_add_adapter() and __detach_adapter(). Introduce wrappers to normalize the parameters, so that we do not have to duplicate the code. Signed-off-by: Jean Delvare <khali@linux-fr.org> Cc: David Brownell <dbrownell@users.sourceforge.net>
This commit is contained in:
parent
7e2193a8f9
commit
69b0089a67
|
@ -558,11 +558,9 @@ static void i2c_scan_static_board_info(struct i2c_adapter *adapter)
|
||||||
up_read(&__i2c_board_lock);
|
up_read(&__i2c_board_lock);
|
||||||
}
|
}
|
||||||
|
|
||||||
static int i2c_do_add_adapter(struct device_driver *d, void *data)
|
static int i2c_do_add_adapter(struct i2c_driver *driver,
|
||||||
|
struct i2c_adapter *adap)
|
||||||
{
|
{
|
||||||
struct i2c_driver *driver = to_i2c_driver(d);
|
|
||||||
struct i2c_adapter *adap = data;
|
|
||||||
|
|
||||||
/* Detect supported devices on that bus, and instantiate them */
|
/* Detect supported devices on that bus, and instantiate them */
|
||||||
i2c_detect(adap, driver);
|
i2c_detect(adap, driver);
|
||||||
|
|
||||||
|
@ -574,6 +572,11 @@ static int i2c_do_add_adapter(struct device_driver *d, void *data)
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static int __process_new_adapter(struct device_driver *d, void *data)
|
||||||
|
{
|
||||||
|
return i2c_do_add_adapter(to_i2c_driver(d), data);
|
||||||
|
}
|
||||||
|
|
||||||
static int i2c_register_adapter(struct i2c_adapter *adap)
|
static int i2c_register_adapter(struct i2c_adapter *adap)
|
||||||
{
|
{
|
||||||
int res = 0, dummy;
|
int res = 0, dummy;
|
||||||
|
@ -614,7 +617,7 @@ static int i2c_register_adapter(struct i2c_adapter *adap)
|
||||||
/* Notify drivers */
|
/* Notify drivers */
|
||||||
mutex_lock(&core_lock);
|
mutex_lock(&core_lock);
|
||||||
dummy = bus_for_each_drv(&i2c_bus_type, NULL, adap,
|
dummy = bus_for_each_drv(&i2c_bus_type, NULL, adap,
|
||||||
i2c_do_add_adapter);
|
__process_new_adapter);
|
||||||
mutex_unlock(&core_lock);
|
mutex_unlock(&core_lock);
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
|
@ -715,10 +718,9 @@ retry:
|
||||||
}
|
}
|
||||||
EXPORT_SYMBOL_GPL(i2c_add_numbered_adapter);
|
EXPORT_SYMBOL_GPL(i2c_add_numbered_adapter);
|
||||||
|
|
||||||
static int i2c_do_del_adapter(struct device_driver *d, void *data)
|
static int i2c_do_del_adapter(struct i2c_driver *driver,
|
||||||
|
struct i2c_adapter *adapter)
|
||||||
{
|
{
|
||||||
struct i2c_driver *driver = to_i2c_driver(d);
|
|
||||||
struct i2c_adapter *adapter = data;
|
|
||||||
struct i2c_client *client, *_n;
|
struct i2c_client *client, *_n;
|
||||||
int res;
|
int res;
|
||||||
|
|
||||||
|
@ -750,6 +752,11 @@ static int __unregister_client(struct device *dev, void *dummy)
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static int __process_removed_adapter(struct device_driver *d, void *data)
|
||||||
|
{
|
||||||
|
return i2c_do_del_adapter(to_i2c_driver(d), data);
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* i2c_del_adapter - unregister I2C adapter
|
* i2c_del_adapter - unregister I2C adapter
|
||||||
* @adap: the adapter being unregistered
|
* @adap: the adapter being unregistered
|
||||||
|
@ -777,7 +784,7 @@ int i2c_del_adapter(struct i2c_adapter *adap)
|
||||||
/* Tell drivers about this removal */
|
/* Tell drivers about this removal */
|
||||||
mutex_lock(&core_lock);
|
mutex_lock(&core_lock);
|
||||||
res = bus_for_each_drv(&i2c_bus_type, NULL, adap,
|
res = bus_for_each_drv(&i2c_bus_type, NULL, adap,
|
||||||
i2c_do_del_adapter);
|
__process_removed_adapter);
|
||||||
mutex_unlock(&core_lock);
|
mutex_unlock(&core_lock);
|
||||||
if (res)
|
if (res)
|
||||||
return res;
|
return res;
|
||||||
|
@ -826,22 +833,11 @@ EXPORT_SYMBOL(i2c_del_adapter);
|
||||||
|
|
||||||
/* ------------------------------------------------------------------------- */
|
/* ------------------------------------------------------------------------- */
|
||||||
|
|
||||||
static int __attach_adapter(struct device *dev, void *data)
|
static int __process_new_driver(struct device *dev, void *data)
|
||||||
{
|
{
|
||||||
struct i2c_adapter *adapter;
|
|
||||||
struct i2c_driver *driver = data;
|
|
||||||
|
|
||||||
if (dev->type != &i2c_adapter_type)
|
if (dev->type != &i2c_adapter_type)
|
||||||
return 0;
|
return 0;
|
||||||
adapter = to_i2c_adapter(dev);
|
return i2c_do_add_adapter(data, to_i2c_adapter(dev));
|
||||||
|
|
||||||
i2c_detect(adapter, driver);
|
|
||||||
|
|
||||||
/* Legacy drivers scan i2c busses directly */
|
|
||||||
if (driver->attach_adapter)
|
|
||||||
driver->attach_adapter(adapter);
|
|
||||||
|
|
||||||
return 0;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
@ -873,40 +869,18 @@ int i2c_register_driver(struct module *owner, struct i2c_driver *driver)
|
||||||
INIT_LIST_HEAD(&driver->clients);
|
INIT_LIST_HEAD(&driver->clients);
|
||||||
/* Walk the adapters that are already present */
|
/* Walk the adapters that are already present */
|
||||||
mutex_lock(&core_lock);
|
mutex_lock(&core_lock);
|
||||||
bus_for_each_dev(&i2c_bus_type, NULL, driver, __attach_adapter);
|
bus_for_each_dev(&i2c_bus_type, NULL, driver, __process_new_driver);
|
||||||
mutex_unlock(&core_lock);
|
mutex_unlock(&core_lock);
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
EXPORT_SYMBOL(i2c_register_driver);
|
EXPORT_SYMBOL(i2c_register_driver);
|
||||||
|
|
||||||
static int __detach_adapter(struct device *dev, void *data)
|
static int __process_removed_driver(struct device *dev, void *data)
|
||||||
{
|
{
|
||||||
struct i2c_adapter *adapter;
|
|
||||||
struct i2c_driver *driver = data;
|
|
||||||
struct i2c_client *client, *_n;
|
|
||||||
|
|
||||||
if (dev->type != &i2c_adapter_type)
|
if (dev->type != &i2c_adapter_type)
|
||||||
return 0;
|
return 0;
|
||||||
adapter = to_i2c_adapter(dev);
|
return i2c_do_del_adapter(data, to_i2c_adapter(dev));
|
||||||
|
|
||||||
/* 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) {
|
|
||||||
dev_dbg(&adapter->dev, "Removing %s at 0x%x\n",
|
|
||||||
client->name, client->addr);
|
|
||||||
list_del(&client->detected);
|
|
||||||
i2c_unregister_device(client);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (driver->detach_adapter) {
|
|
||||||
if (driver->detach_adapter(adapter))
|
|
||||||
dev_err(&adapter->dev,
|
|
||||||
"detach_adapter failed for driver [%s]\n",
|
|
||||||
driver->driver.name);
|
|
||||||
}
|
|
||||||
|
|
||||||
return 0;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -917,7 +891,7 @@ static int __detach_adapter(struct device *dev, void *data)
|
||||||
void i2c_del_driver(struct i2c_driver *driver)
|
void i2c_del_driver(struct i2c_driver *driver)
|
||||||
{
|
{
|
||||||
mutex_lock(&core_lock);
|
mutex_lock(&core_lock);
|
||||||
bus_for_each_dev(&i2c_bus_type, NULL, driver, __detach_adapter);
|
bus_for_each_dev(&i2c_bus_type, NULL, driver, __process_removed_driver);
|
||||||
mutex_unlock(&core_lock);
|
mutex_unlock(&core_lock);
|
||||||
|
|
||||||
driver_unregister(&driver->driver);
|
driver_unregister(&driver->driver);
|
||||||
|
|
Loading…
Reference in a new issue