Skip to contentSkip to conversation

libertas: make some functions void

PATCH In review Holger Schurig 2 participants 2 messages Apr 30, 2008 Networking drivers (wireless)

lore
Share & tools
lore

Holger Schurig

author
#0 lore raw

PATCH 1/1 libertas: make some functions void

They don't return anything meaningfull and no-one cares about their results.

Signed-off-by Holger Schurig <[email protected]>
drivers/net/wireless/libertas/main.c +4 -8
Index: wireless-testing/drivers/net/wireless/libertas/main.c
===================================================================
@@ -890,7 +890,7 @@ int lbs_suspend(struct lbs_private *priv
 }
 EXPORT_SYMBOL_GPL(lbs_suspend);
 
-int lbs_resume(struct lbs_private *priv)
+void lbs_resume(struct lbs_private *priv)
 {
 	lbs_deb_enter(LBS_DEB_FW);
 

@@ -906,7 +906,6 @@ int lbs_resume(struct lbs_private *priv)
 		netif_device_attach(priv->mesh_dev);
 
 	lbs_deb_leave(LBS_DEB_FW);
-	return 0;
 }
 EXPORT_SYMBOL_GPL(lbs_resume);
 

@@ -1155,7 +1154,7 @@ done:
 EXPORT_SYMBOL_GPL(lbs_add_card);
 
 
-int lbs_remove_card(struct lbs_private *priv)
+void lbs_remove_card(struct lbs_private *priv)
 {
 	struct net_device *dev = priv->dev;
 	union iwreq_data wrqu;

@@ -1190,7 +1189,6 @@ int lbs_remove_card(struct lbs_private *
 	free_netdev(dev);
 
 	lbs_deb_leave(LBS_DEB_MAIN);
-	return 0;
 }
 EXPORT_SYMBOL_GPL(lbs_remove_card);
 

@@ -1261,10 +1259,9 @@ done:
 EXPORT_SYMBOL_GPL(lbs_start_card);
 
 
-int lbs_stop_card(struct lbs_private *priv)
+void lbs_stop_card(struct lbs_private *priv)
 {
 	struct net_device *dev = priv->dev;
-	int ret = -1;
 	struct cmd_ctrl_node *cmdnode;
 	unsigned long flags;
 

@@ -1289,8 +1286,7 @@ int lbs_stop_card(struct lbs_private *pr
 
 	unregister_netdev(dev);
 
-	lbs_deb_leave_args(LBS_DEB_MAIN, "ret %d", ret);
-	return ret;
+	lbs_deb_leave(LBS_DEB_MAIN);
 }
 EXPORT_SYMBOL_GPL(lbs_stop_card);
drivers/net/wireless/libertas/decl.h +2 -2
Index: wireless-testing/drivers/net/wireless/libertas/decl.h
===================================================================
@@ -64,9 +64,9 @@ void lbs_send_iwevcustom_event(struct lb
 struct chan_freq_power *lbs_get_region_cfp_table(u8 region,
 	int *cfp_no);
 struct lbs_private *lbs_add_card(void *card, struct device *dmdev);
-int lbs_remove_card(struct lbs_private *priv);
+void lbs_remove_card(struct lbs_private *priv);
 int lbs_start_card(struct lbs_private *priv);
-int lbs_stop_card(struct lbs_private *priv);
+void lbs_stop_card(struct lbs_private *priv);
 void lbs_host_to_card_done(struct lbs_private *priv);
 
 int lbs_update_channel(struct lbs_private *priv);
drivers/net/wireless/libertas/cmd.h +1 -1
Index: wireless-testing/drivers/net/wireless/libertas/cmd.h
===================================================================
@@ -44,7 +44,7 @@ int lbs_mesh_config(struct lbs_private *
 
 int lbs_host_sleep_cfg(struct lbs_private *priv, uint32_t criteria);
 int lbs_suspend(struct lbs_private *priv);
-int lbs_resume(struct lbs_private *priv);
+void lbs_resume(struct lbs_private *priv);
 
 int lbs_cmd_802_11_inactivity_timeout(struct lbs_private *priv,
 				      uint16_t cmd_action, uint16_t *timeout);
Acked-by on v1 1/1
#1 lore raw
Quoted 3 lines · Holger Schurig

They don't return anything meaningfull and no-one cares about their results.

Signed-off-by Holger Schurig <[email protected]>
Acked-by Dan Williams <[email protected]>
Quoted 89 lines

Index: wireless-testing/drivers/net/wireless/libertas/main.c
===================================================================

drivers/net/wireless/libertas/main.c +4 -8
@@ -890,7 +890,7 @@ int lbs_suspend(struct lbs_private *priv
 }
 EXPORT_SYMBOL_GPL(lbs_suspend);
 
-int lbs_resume(struct lbs_private *priv)
+void lbs_resume(struct lbs_private *priv)
 {
 	lbs_deb_enter(LBS_DEB_FW);
 

@@ -906,7 +906,6 @@ int lbs_resume(struct lbs_private *priv)
 		netif_device_attach(priv->mesh_dev);
 
 	lbs_deb_leave(LBS_DEB_FW);
-	return 0;
 }
 EXPORT_SYMBOL_GPL(lbs_resume);
 

@@ -1155,7 +1154,7 @@ done:
 EXPORT_SYMBOL_GPL(lbs_add_card);
 
 
-int lbs_remove_card(struct lbs_private *priv)
+void lbs_remove_card(struct lbs_private *priv)
 {
 	struct net_device *dev = priv->dev;
 	union iwreq_data wrqu;

@@ -1190,7 +1189,6 @@ int lbs_remove_card(struct lbs_private *
 	free_netdev(dev);
 
 	lbs_deb_leave(LBS_DEB_MAIN);
-	return 0;
 }
 EXPORT_SYMBOL_GPL(lbs_remove_card);
 

@@ -1261,10 +1259,9 @@ done:
 EXPORT_SYMBOL_GPL(lbs_start_card);
 
 
-int lbs_stop_card(struct lbs_private *priv)
+void lbs_stop_card(struct lbs_private *priv)
 {
 	struct net_device *dev = priv->dev;
-	int ret = -1;
 	struct cmd_ctrl_node *cmdnode;
 	unsigned long flags;
 

@@ -1289,8 +1286,7 @@ int lbs_stop_card(struct lbs_private *pr
 
 	unregister_netdev(dev);
 
-	lbs_deb_leave_args(LBS_DEB_MAIN, "ret %d", ret);
-	return ret;
+	lbs_deb_leave(LBS_DEB_MAIN);
 }
 EXPORT_SYMBOL_GPL(lbs_stop_card);

Index: wireless-testing/drivers/net/wireless/libertas/decl.h
===================================================================

drivers/net/wireless/libertas/decl.h +2 -2
@@ -64,9 +64,9 @@ void lbs_send_iwevcustom_event(struct lb
 struct chan_freq_power *lbs_get_region_cfp_table(u8 region,
 	int *cfp_no);
 struct lbs_private *lbs_add_card(void *card, struct device *dmdev);
-int lbs_remove_card(struct lbs_private *priv);
+void lbs_remove_card(struct lbs_private *priv);
 int lbs_start_card(struct lbs_private *priv);
-int lbs_stop_card(struct lbs_private *priv);
+void lbs_stop_card(struct lbs_private *priv);
 void lbs_host_to_card_done(struct lbs_private *priv);
 
 int lbs_update_channel(struct lbs_private *priv);

Index: wireless-testing/drivers/net/wireless/libertas/cmd.h
===================================================================

drivers/net/wireless/libertas/cmd.h +1 -1
@@ -44,7 +44,7 @@ int lbs_mesh_config(struct lbs_private *
 
 int lbs_host_sleep_cfg(struct lbs_private *priv, uint32_t criteria);
 int lbs_suspend(struct lbs_private *priv);
-int lbs_resume(struct lbs_private *priv);
+void lbs_resume(struct lbs_private *priv);
 
 int lbs_cmd_802_11_inactivity_timeout(struct lbs_private *priv,
 				      uint16_t cmd_action, uint16_t *timeout);