diff options
author | Vasanthakumar Thiagarajan <vthiagar@qca.qualcomm.com> | 2011-07-16 10:59:18 -0400 |
---|---|---|
committer | Kalle Valo <kvalo@qca.qualcomm.com> | 2011-08-09 12:45:20 -0400 |
commit | ca06cadb732955fae377b435c83e3746123a71ac (patch) | |
tree | 36253364088ef7c09515f9d0e89cf462fd2b1ccb | |
parent | 348a8fbce79e15b1918390120c0d63baa85343a0 (diff) |
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.c | 2 | ||||
-rw-r--r-- | drivers/net/wireless/ath/ath6kl/htc_hif.c | 5 | ||||
-rw-r--r-- | drivers/net/wireless/ath/ath6kl/htc_hif.h | 1 |
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) | |||
2175 | target->msg_per_bndl_max = min(HTC_HOST_MAX_MSG_PER_BUNDLE, | 2175 | target->msg_per_bndl_max = min(HTC_HOST_MAX_MSG_PER_BUNDLE, |
2176 | target->msg_per_bndl_max); | 2176 | target->msg_per_bndl_max); |
2177 | 2177 | ||
2178 | if (ath6kldev_setup_msg_bndl(target->dev, target->msg_per_bndl_max)) { | 2178 | if (ath6kl_hif_enable_scatter(target->dev->ar, scat_info)) { |
2179 | target->msg_per_bndl_max = 0; | 2179 | target->msg_per_bndl_max = 0; |
2180 | return; | 2180 | return; |
2181 | } | 2181 | } |
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, | |||
216 | return status; | 216 | return status; |
217 | } | 217 | } |
218 | 218 | ||
219 | int ath6kldev_setup_msg_bndl(struct ath6kl_device *dev, int max_msg_per_trans) | ||
220 | { | ||
221 | return ath6kl_hif_enable_scatter(dev->ar, &dev->hif_scat_info); | ||
222 | } | ||
223 | |||
224 | static int ath6kldev_proc_counter_intr(struct ath6kl_device *dev) | 219 | static int ath6kldev_proc_counter_intr(struct ath6kl_device *dev) |
225 | { | 220 | { |
226 | u8 counter_int_status; | 221 | 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); | |||
103 | int ath6kldev_intr_bh_handler(struct ath6kl *ar); | 103 | int ath6kldev_intr_bh_handler(struct ath6kl *ar); |
104 | 104 | ||
105 | /* Scatter Function and Definitions */ | 105 | /* Scatter Function and Definitions */ |
106 | int ath6kldev_setup_msg_bndl(struct ath6kl_device *dev, int max_msg_per_xfer); | ||
107 | int ath6kldev_submit_scat_req(struct ath6kl_device *dev, | 106 | int ath6kldev_submit_scat_req(struct ath6kl_device *dev, |
108 | struct hif_scatter_req *scat_req, bool read); | 107 | struct hif_scatter_req *scat_req, bool read); |
109 | 108 | ||