diff options
| author | Lars-Peter Clausen <lars@metafoo.de> | 2013-03-09 08:16:49 +0000 |
|---|---|---|
| committer | Wolfram Sang <wsa@the-dreams.de> | 2013-04-02 07:07:32 +0200 |
| commit | 51d95709dddf7fdf6769a547de37a9c98edf8df9 (patch) | |
| tree | 579dc916a198211c7ec934dfc7adba1b68334d42 | |
| parent | a205e63d12716bd871b6a5746b6b624c5965a059 (diff) | |
| download | olio-linux-3.10-51d95709dddf7fdf6769a547de37a9c98edf8df9.tar.xz olio-linux-3.10-51d95709dddf7fdf6769a547de37a9c98edf8df9.zip | |
i2c: Make the return type of i2c_del_mux_adapter() void
i2c_del_mux_adapter always returns 0 and none of it current users check its
return value anyway. It is also an essential requirement of the Linux device
driver model, that functions which may be called from a device's remove callback
to free resources provided by the device, are not allowed to fail. This is the
case for i2c_del_mux_adapter(), so make its return type void to make the
fact that it won't fail explicit.
Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
Reviewed-by: Jean Delvare <khali@linux-fr.org>
Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
| -rw-r--r-- | drivers/i2c/i2c-mux.c | 4 | ||||
| -rw-r--r-- | include/linux/i2c-mux.h | 2 |
2 files changed, 2 insertions, 4 deletions
diff --git a/drivers/i2c/i2c-mux.c b/drivers/i2c/i2c-mux.c index 361b78d7675..7409ebb33c4 100644 --- a/drivers/i2c/i2c-mux.c +++ b/drivers/i2c/i2c-mux.c @@ -191,14 +191,12 @@ struct i2c_adapter *i2c_add_mux_adapter(struct i2c_adapter *parent, } EXPORT_SYMBOL_GPL(i2c_add_mux_adapter); -int i2c_del_mux_adapter(struct i2c_adapter *adap) +void i2c_del_mux_adapter(struct i2c_adapter *adap) { struct i2c_mux_priv *priv = adap->algo_data; i2c_del_adapter(adap); kfree(priv); - - return 0; } EXPORT_SYMBOL_GPL(i2c_del_mux_adapter); diff --git a/include/linux/i2c-mux.h b/include/linux/i2c-mux.h index 40cb05a97b4..b5f9a007a3a 100644 --- a/include/linux/i2c-mux.h +++ b/include/linux/i2c-mux.h @@ -42,7 +42,7 @@ struct i2c_adapter *i2c_add_mux_adapter(struct i2c_adapter *parent, int (*deselect) (struct i2c_adapter *, void *mux_dev, u32 chan_id)); -int i2c_del_mux_adapter(struct i2c_adapter *adap); +void i2c_del_mux_adapter(struct i2c_adapter *adap); #endif /* __KERNEL__ */ |