From 9af71a407a8c9287cae28d1f8bed6c68dd5fa9b9 Mon Sep 17 00:00:00 2001 From: Lars-Peter Clausen Date: Sat, 9 Mar 2013 08:16:49 +0000 Subject: [PATCH] --- yaml --- r: 370999 b: refs/heads/master c: 51d95709dddf7fdf6769a547de37a9c98edf8df9 h: refs/heads/master i: 370997: b643966b861cdcc69dcbf81cf4ab5c2ee3342c12 370995: 8c7bebc795af64f2567e6281f51c0d68bb752bf8 370991: 1f5a9fdddc167b0c12f45f86cca716dc90e8ad53 v: v3 --- [refs] | 2 +- trunk/drivers/i2c/i2c-mux.c | 4 +--- trunk/include/linux/i2c-mux.h | 2 +- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index edfd2e7e3ddd..a02ead353d0e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a205e63d12716bd871b6a5746b6b624c5965a059 +refs/heads/master: 51d95709dddf7fdf6769a547de37a9c98edf8df9 diff --git a/trunk/drivers/i2c/i2c-mux.c b/trunk/drivers/i2c/i2c-mux.c index 361b78d76759..7409ebb33c47 100644 --- a/trunk/drivers/i2c/i2c-mux.c +++ b/trunk/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/trunk/include/linux/i2c-mux.h b/trunk/include/linux/i2c-mux.h index 40cb05a97b46..b5f9a007a3ab 100644 --- a/trunk/include/linux/i2c-mux.h +++ b/trunk/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__ */