aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net
diff options
context:
space:
mode:
authorHolger Schurig <hs4233@mail.mn-solutions.de>2008-04-30 04:50:39 -0400
committerJohn W. Linville <linville@tuxdriver.com>2008-05-07 15:02:27 -0400
commita63e5cb22fcc8590abc7d5050118a6d3589ed95f (patch)
tree131ecb25a07ab5d432c85650024a5c2b9b8f6427 /drivers/net
parent5f505d90250c136e1cf63e3ae85e7d3ff3077c1d (diff)
libertas: make some functions void
They don't return anything meaningfull and no-one cares about their results. Signed-off-by: Holger Schurig <hs4233@mail.mn-solutions.de> Acked-by: Dan Williams <dcbw@redhat.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/wireless/libertas/cmd.h2
-rw-r--r--drivers/net/wireless/libertas/decl.h4
-rw-r--r--drivers/net/wireless/libertas/main.c12
3 files changed, 7 insertions, 11 deletions
diff --git a/drivers/net/wireless/libertas/cmd.h b/drivers/net/wireless/libertas/cmd.h
index 3dfc2d43c224..4295bc613669 100644
--- a/drivers/net/wireless/libertas/cmd.h
+++ b/drivers/net/wireless/libertas/cmd.h
@@ -44,7 +44,7 @@ int lbs_mesh_config(struct lbs_private *priv, uint16_t enable, uint16_t chan);
44 44
45int lbs_host_sleep_cfg(struct lbs_private *priv, uint32_t criteria); 45int lbs_host_sleep_cfg(struct lbs_private *priv, uint32_t criteria);
46int lbs_suspend(struct lbs_private *priv); 46int lbs_suspend(struct lbs_private *priv);
47int lbs_resume(struct lbs_private *priv); 47void lbs_resume(struct lbs_private *priv);
48 48
49int lbs_cmd_802_11_inactivity_timeout(struct lbs_private *priv, 49int lbs_cmd_802_11_inactivity_timeout(struct lbs_private *priv,
50 uint16_t cmd_action, uint16_t *timeout); 50 uint16_t cmd_action, uint16_t *timeout);
diff --git a/drivers/net/wireless/libertas/decl.h b/drivers/net/wireless/libertas/decl.h
index b652fa301e19..0632b09655d2 100644
--- a/drivers/net/wireless/libertas/decl.h
+++ b/drivers/net/wireless/libertas/decl.h
@@ -64,9 +64,9 @@ void lbs_send_iwevcustom_event(struct lbs_private *priv, s8 *str);
64struct chan_freq_power *lbs_get_region_cfp_table(u8 region, 64struct chan_freq_power *lbs_get_region_cfp_table(u8 region,
65 int *cfp_no); 65 int *cfp_no);
66struct lbs_private *lbs_add_card(void *card, struct device *dmdev); 66struct lbs_private *lbs_add_card(void *card, struct device *dmdev);
67int lbs_remove_card(struct lbs_private *priv); 67void lbs_remove_card(struct lbs_private *priv);
68int lbs_start_card(struct lbs_private *priv); 68int lbs_start_card(struct lbs_private *priv);
69int lbs_stop_card(struct lbs_private *priv); 69void lbs_stop_card(struct lbs_private *priv);
70void lbs_host_to_card_done(struct lbs_private *priv); 70void lbs_host_to_card_done(struct lbs_private *priv);
71 71
72int lbs_update_channel(struct lbs_private *priv); 72int lbs_update_channel(struct lbs_private *priv);
diff --git a/drivers/net/wireless/libertas/main.c b/drivers/net/wireless/libertas/main.c
index b1c9f3383d7a..223ab3a14a13 100644
--- a/drivers/net/wireless/libertas/main.c
+++ b/drivers/net/wireless/libertas/main.c
@@ -889,7 +889,7 @@ int lbs_suspend(struct lbs_private *priv)
889} 889}
890EXPORT_SYMBOL_GPL(lbs_suspend); 890EXPORT_SYMBOL_GPL(lbs_suspend);
891 891
892int lbs_resume(struct lbs_private *priv) 892void lbs_resume(struct lbs_private *priv)
893{ 893{
894 lbs_deb_enter(LBS_DEB_FW); 894 lbs_deb_enter(LBS_DEB_FW);
895 895
@@ -905,7 +905,6 @@ int lbs_resume(struct lbs_private *priv)
905 netif_device_attach(priv->mesh_dev); 905 netif_device_attach(priv->mesh_dev);
906 906
907 lbs_deb_leave(LBS_DEB_FW); 907 lbs_deb_leave(LBS_DEB_FW);
908 return 0;
909} 908}
910EXPORT_SYMBOL_GPL(lbs_resume); 909EXPORT_SYMBOL_GPL(lbs_resume);
911 910
@@ -1155,7 +1154,7 @@ done:
1155EXPORT_SYMBOL_GPL(lbs_add_card); 1154EXPORT_SYMBOL_GPL(lbs_add_card);
1156 1155
1157 1156
1158int lbs_remove_card(struct lbs_private *priv) 1157void lbs_remove_card(struct lbs_private *priv)
1159{ 1158{
1160 struct net_device *dev = priv->dev; 1159 struct net_device *dev = priv->dev;
1161 union iwreq_data wrqu; 1160 union iwreq_data wrqu;
@@ -1190,7 +1189,6 @@ int lbs_remove_card(struct lbs_private *priv)
1190 free_netdev(dev); 1189 free_netdev(dev);
1191 1190
1192 lbs_deb_leave(LBS_DEB_MAIN); 1191 lbs_deb_leave(LBS_DEB_MAIN);
1193 return 0;
1194} 1192}
1195EXPORT_SYMBOL_GPL(lbs_remove_card); 1193EXPORT_SYMBOL_GPL(lbs_remove_card);
1196 1194
@@ -1261,10 +1259,9 @@ done:
1261EXPORT_SYMBOL_GPL(lbs_start_card); 1259EXPORT_SYMBOL_GPL(lbs_start_card);
1262 1260
1263 1261
1264int lbs_stop_card(struct lbs_private *priv) 1262void lbs_stop_card(struct lbs_private *priv)
1265{ 1263{
1266 struct net_device *dev = priv->dev; 1264 struct net_device *dev = priv->dev;
1267 int ret = -1;
1268 struct cmd_ctrl_node *cmdnode; 1265 struct cmd_ctrl_node *cmdnode;
1269 unsigned long flags; 1266 unsigned long flags;
1270 1267
@@ -1289,8 +1286,7 @@ int lbs_stop_card(struct lbs_private *priv)
1289 1286
1290 unregister_netdev(dev); 1287 unregister_netdev(dev);
1291 1288
1292 lbs_deb_leave_args(LBS_DEB_MAIN, "ret %d", ret); 1289 lbs_deb_leave(LBS_DEB_MAIN);
1293 return ret;
1294} 1290}
1295EXPORT_SYMBOL_GPL(lbs_stop_card); 1291EXPORT_SYMBOL_GPL(lbs_stop_card);
1296 1292