mirror of
https://github.com/edk2-porting/linux-next.git
synced 2024-12-19 18:53:52 +08:00
i2c: Kill client_register and client_unregister methods
These methods were useful in the legacy binding model but no longer in the new (standard) binding model. There are no users left so we can drop them. Signed-off-by: Jean Delvare <khali@linux-fr.org> Cc: David Brownell <dbrownell@users.sourceforge.net>
This commit is contained in:
parent
0732f87761
commit
352da9820e
@ -368,8 +368,7 @@ Who: Krzysztof Piotr Oledzki <ole@ans.pl>
|
||||
|
||||
---------------------------
|
||||
|
||||
What: i2c_attach_client(), i2c_detach_client(), i2c_driver->detach_client(),
|
||||
i2c_adapter->client_register(), i2c_adapter->client_unregister
|
||||
What: i2c_attach_client(), i2c_detach_client(), i2c_driver->detach_client()
|
||||
When: 2.6.30
|
||||
Check: i2c_attach_client i2c_detach_client
|
||||
Why: Deprecated by the new (standard) device driver binding model. Use
|
||||
|
@ -308,14 +308,6 @@ void i2c_unregister_device(struct i2c_client *client)
|
||||
return;
|
||||
}
|
||||
|
||||
if (adapter->client_unregister) {
|
||||
if (adapter->client_unregister(client)) {
|
||||
dev_warn(&client->dev,
|
||||
"client_unregister [%s] failed\n",
|
||||
client->name);
|
||||
}
|
||||
}
|
||||
|
||||
mutex_lock(&adapter->clist_lock);
|
||||
list_del(&client->list);
|
||||
mutex_unlock(&adapter->clist_lock);
|
||||
@ -855,14 +847,6 @@ int i2c_attach_client(struct i2c_client *client)
|
||||
dev_dbg(&adapter->dev, "client [%s] registered with bus id %s\n",
|
||||
client->name, dev_name(&client->dev));
|
||||
|
||||
if (adapter->client_register) {
|
||||
if (adapter->client_register(client)) {
|
||||
dev_dbg(&adapter->dev, "client_register "
|
||||
"failed for client [%s] at 0x%02x\n",
|
||||
client->name, client->addr);
|
||||
}
|
||||
}
|
||||
|
||||
return 0;
|
||||
|
||||
out_err:
|
||||
@ -875,17 +859,6 @@ EXPORT_SYMBOL(i2c_attach_client);
|
||||
int i2c_detach_client(struct i2c_client *client)
|
||||
{
|
||||
struct i2c_adapter *adapter = client->adapter;
|
||||
int res = 0;
|
||||
|
||||
if (adapter->client_unregister) {
|
||||
res = adapter->client_unregister(client);
|
||||
if (res) {
|
||||
dev_err(&client->dev,
|
||||
"client_unregister [%s] failed, "
|
||||
"client not detached\n", client->name);
|
||||
goto out;
|
||||
}
|
||||
}
|
||||
|
||||
mutex_lock(&adapter->clist_lock);
|
||||
list_del(&client->list);
|
||||
@ -895,8 +868,7 @@ int i2c_detach_client(struct i2c_client *client)
|
||||
device_unregister(&client->dev);
|
||||
wait_for_completion(&client->released);
|
||||
|
||||
out:
|
||||
return res;
|
||||
return 0;
|
||||
}
|
||||
EXPORT_SYMBOL(i2c_detach_client);
|
||||
|
||||
|
@ -352,10 +352,6 @@ struct i2c_adapter {
|
||||
const struct i2c_algorithm *algo; /* the algorithm to access the bus */
|
||||
void *algo_data;
|
||||
|
||||
/* --- administration stuff. */
|
||||
int (*client_register)(struct i2c_client *) __deprecated;
|
||||
int (*client_unregister)(struct i2c_client *) __deprecated;
|
||||
|
||||
/* data fields that are valid for all devices */
|
||||
u8 level; /* nesting level for lockdep */
|
||||
struct mutex bus_lock;
|
||||
|
Loading…
Reference in New Issue
Block a user