diff options
author | Jean Delvare <khali@linux-fr.org> | 2005-07-27 16:14:49 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2005-09-05 12:14:14 -0400 |
commit | 7bef559455fc71f66f8573cc1aafe1dd33966c1c (patch) | |
tree | 6c342574710f730d39bf5383f81eaa9f9bb10a25 /drivers/i2c/i2c-core.c | |
parent | 1ff4e3065b41847b6fe5908b1214cb508dd49e61 (diff) |
[PATCH] I2C: refactor message in i2c_detach_client
We could refactor the error message 34 different i2c drivers print if
i2c_detach_client() fails in this function itself. Saves quite a few
lines of code. Documentation is updated to reflect that change.
Note that this patch should be applied after Rudolf Marek's w83792d
patches.
Signed-off-by: Jean Delvare <khali@linux-fr.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/i2c/i2c-core.c')
-rw-r--r-- | drivers/i2c/i2c-core.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/i2c/i2c-core.c b/drivers/i2c/i2c-core.c index 7a7837ae3114..b0bceb2fb8b1 100644 --- a/drivers/i2c/i2c-core.c +++ b/drivers/i2c/i2c-core.c | |||
@@ -449,8 +449,12 @@ int i2c_detach_client(struct i2c_client *client) | |||
449 | struct i2c_adapter *adapter = client->adapter; | 449 | struct i2c_adapter *adapter = client->adapter; |
450 | int res = 0; | 450 | int res = 0; |
451 | 451 | ||
452 | if ((client->flags & I2C_CLIENT_ALLOW_USE) && (client->usage_count > 0)) | 452 | if ((client->flags & I2C_CLIENT_ALLOW_USE) |
453 | && (client->usage_count > 0)) { | ||
454 | dev_warn(&client->dev, "Client [%s] still busy, " | ||
455 | "can't detach\n", client->name); | ||
453 | return -EBUSY; | 456 | return -EBUSY; |
457 | } | ||
454 | 458 | ||
455 | if (adapter->client_unregister) { | 459 | if (adapter->client_unregister) { |
456 | res = adapter->client_unregister(client); | 460 | res = adapter->client_unregister(client); |