---

yaml --- r: 370999 b: refs/heads/master c: 51d9570 h: refs/heads/master i: 370997: b643966 370995: 8c7bebc 370991: 1f5a9fd v: v3
git-mirror · Apr 2, 2013 · 9af71a4 · 9af71a4
1 parent 47cda29
commit 9af71a4
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 5 deletions.
diff --git 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
@@ -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
@@ -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__ */