ath6kl: Remove callback msg_pending() and used the function directly

Signed-off-by: Vasanthakumar Thiagarajan <vthiagar@qca.qualcomm.com> Signed-off-by: Kalle Valo <kvalo@qca.qualcomm.com>
git-mirror · Aug 9, 2011 · df45f7f · df45f7f
1 parent 23b7840
commit df45f7f
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 7 deletions.
diff --git a/drivers/net/wireless/ath/ath6kl/htc.c b/drivers/net/wireless/ath/ath6kl/htc.c
@@ -1723,9 +1723,8 @@ static int htc_fetch_rxpkts(struct htc_target *target,
 	return status;
 }
 
-static int htc_rxmsg_pending_handler(struct htc_target *target,
-				     u32 msg_look_ahead[],
-				     int *num_pkts)
+int htc_rxmsg_pending_handler(struct htc_target *target, u32 msg_look_ahead[],
+			      int *num_pkts)
 {
 	struct htc_packet *packets, *tmp_pkt;
 	struct htc_endpoint *endpoint;
@@ -2388,7 +2387,6 @@ void *htc_create(struct ath6kl *ar)
 
 	target->dev->ar = ar;
 	target->dev->htc_cnxt = target;
-	target->dev->msg_pending = htc_rxmsg_pending_handler;
 	target->ep_waiting = ENDPOINT_MAX;
 
 	reset_ep_state(target);

diff --git a/drivers/net/wireless/ath/ath6kl/htc.h b/drivers/net/wireless/ath/ath6kl/htc.h
@@ -549,6 +549,8 @@ void htc_indicate_activity_change(struct htc_target *target,
 				  enum htc_endpoint_id endpoint, bool active);
 int htc_get_rxbuf_num(struct htc_target *target, enum htc_endpoint_id endpoint);
 int htc_add_rxbuf_multiple(struct htc_target *target, struct list_head *pktq);
+int htc_rxmsg_pending_handler(struct htc_target *target, u32 msg_look_ahead[],
+			      int *n_pkts);
 
 static inline void set_htc_pkt_info(struct htc_packet *packet, void *context,
 				    u8 *buf, unsigned int len,

diff --git a/drivers/net/wireless/ath/ath6kl/htc_hif.c b/drivers/net/wireless/ath/ath6kl/htc_hif.c
@@ -416,7 +416,8 @@ static int proc_pending_irqs(struct ath6kl_device *dev, bool *done)
 		 * improve performance by reducing context switching when
 		 * we rapidly pull packets.
 		 */
-		status = dev->msg_pending(dev->htc_cnxt, &lk_ahd, &fetched);
+		status = htc_rxmsg_pending_handler(dev->htc_cnxt,
+						   &lk_ahd, &fetched);
 		if (status)
 			goto out;
 

diff --git a/drivers/net/wireless/ath/ath6kl/htc_hif.h b/drivers/net/wireless/ath/ath6kl/htc_hif.h
@@ -82,8 +82,6 @@ struct ath6kl_device {
 	u32 block_sz;
 	u32 block_mask;
 	struct htc_target *htc_cnxt;
-	int (*msg_pending) (struct htc_target *target, u32 lk_ahds[],
-			    int *npkts_fetched);
 	struct hif_dev_scat_sup_info hif_scat_info;
 	int max_rx_bndl_sz;
 	int max_tx_bndl_sz;