summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVasanthakumar Thiagarajan2011-07-16 16:59:18 +0200
committerKalle Valo2011-08-09 18:45:20 +0200
commitca06cadb732955fae377b435c83e3746123a71ac (patch)
tree36253364088ef7c09515f9d0e89cf462fd2b1ccb
parentath6kl: Merge scatter rw request functions into one (diff)
downloadkernel-qcow2-linux-ca06cadb732955fae377b435c83e3746123a71ac.tar.gz
kernel-qcow2-linux-ca06cadb732955fae377b435c83e3746123a71ac.tar.xz
kernel-qcow2-linux-ca06cadb732955fae377b435c83e3746123a71ac.zip
ath6kl: Remove ath6kldev_setup_msg_bndl()
Use appropriate hif function directly. Signed-off-by: Vasanthakumar Thiagarajan <vthiagar@qca.qualcomm.com> Signed-off-by: Kalle Valo <kvalo@qca.qualcomm.com>
-rw-r--r--drivers/net/wireless/ath/ath6kl/htc.c2
-rw-r--r--drivers/net/wireless/ath/ath6kl/htc_hif.c5
-rw-r--r--drivers/net/wireless/ath/ath6kl/htc_hif.h1
3 files changed, 1 insertions, 7 deletions
diff --git a/drivers/net/wireless/ath/ath6kl/htc.c b/drivers/net/wireless/ath/ath6kl/htc.c
index e77e7684ee9b..a359332b87fc 100644
--- a/drivers/net/wireless/ath/ath6kl/htc.c
+++ b/drivers/net/wireless/ath/ath6kl/htc.c
@@ -2175,7 +2175,7 @@ static void htc_setup_msg_bndl(struct htc_target *target)
target->msg_per_bndl_max = min(HTC_HOST_MAX_MSG_PER_BUNDLE,
target->msg_per_bndl_max);
- if (ath6kldev_setup_msg_bndl(target->dev, target->msg_per_bndl_max)) {
+ if (ath6kl_hif_enable_scatter(target->dev->ar, scat_info)) {
target->msg_per_bndl_max = 0;
return;
}
diff --git a/drivers/net/wireless/ath/ath6kl/htc_hif.c b/drivers/net/wireless/ath/ath6kl/htc_hif.c
index c5fb78b429bc..003fe0abb352 100644
--- a/drivers/net/wireless/ath/ath6kl/htc_hif.c
+++ b/drivers/net/wireless/ath/ath6kl/htc_hif.c
@@ -216,11 +216,6 @@ int ath6kldev_submit_scat_req(struct ath6kl_device *dev,
return status;
}
-int ath6kldev_setup_msg_bndl(struct ath6kl_device *dev, int max_msg_per_trans)
-{
- return ath6kl_hif_enable_scatter(dev->ar, &dev->hif_scat_info);
-}
-
static int ath6kldev_proc_counter_intr(struct ath6kl_device *dev)
{
u8 counter_int_status;
diff --git a/drivers/net/wireless/ath/ath6kl/htc_hif.h b/drivers/net/wireless/ath/ath6kl/htc_hif.h
index 4cab5fbf1299..5e65f1e28d16 100644
--- a/drivers/net/wireless/ath/ath6kl/htc_hif.h
+++ b/drivers/net/wireless/ath/ath6kl/htc_hif.h
@@ -103,7 +103,6 @@ int ath6kldev_rw_comp_handler(void *context, int status);
int ath6kldev_intr_bh_handler(struct ath6kl *ar);
/* Scatter Function and Definitions */
-int ath6kldev_setup_msg_bndl(struct ath6kl_device *dev, int max_msg_per_xfer);
int ath6kldev_submit_scat_req(struct ath6kl_device *dev,
struct hif_scatter_req *scat_req, bool read);