From 65c874bec032d504f56104a375e82bc6764bfe43 Mon Sep 17 00:00:00 2001 From: Mohammed Shafi Shajakhan Date: Thu, 27 Sep 2012 18:19:48 +0530 Subject: [PATCH] --- yaml --- r: 341459 b: refs/heads/master c: cf0dfa1330495ae2c3757788224cc043cfb17e77 h: refs/heads/master i: 341457: 965a96d2459009996ec6a6578321fe333ab704f5 341455: 737459b9aacd53285e429b08a92a61008e866975 v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/ath/ath6kl/hif.c | 5 ----- trunk/drivers/net/wireless/ath/ath6kl/htc_mbox.c | 10 +--------- 3 files changed, 2 insertions(+), 15 deletions(-) diff --git a/[refs] b/[refs] index 35cb7ce0453f..a6273123cdb9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 307749406d7daea452d55df76f734b4fffddf599 +refs/heads/master: cf0dfa1330495ae2c3757788224cc043cfb17e77 diff --git a/trunk/drivers/net/wireless/ath/ath6kl/hif.c b/trunk/drivers/net/wireless/ath/ath6kl/hif.c index 029914a22ea0..a7a1ec406365 100644 --- a/trunk/drivers/net/wireless/ath/ath6kl/hif.c +++ b/trunk/drivers/net/wireless/ath/ath6kl/hif.c @@ -696,11 +696,6 @@ int ath6kl_hif_setup(struct ath6kl_device *dev) ath6kl_dbg(ATH6KL_DBG_HIF, "hif block size %d mbox addr 0x%x\n", dev->htc_cnxt->block_sz, dev->ar->mbox_info.htc_addr); - /* usb doesn't support enabling interrupts */ - /* FIXME: remove check once USB support is implemented */ - if (dev->ar->hif_type == ATH6KL_HIF_TYPE_USB) - return 0; - status = ath6kl_hif_disable_intrs(dev); fail_setup: diff --git a/trunk/drivers/net/wireless/ath/ath6kl/htc_mbox.c b/trunk/drivers/net/wireless/ath/ath6kl/htc_mbox.c index ceaf92192658..fbb78dfe078f 100644 --- a/trunk/drivers/net/wireless/ath/ath6kl/htc_mbox.c +++ b/trunk/drivers/net/wireless/ath/ath6kl/htc_mbox.c @@ -2656,12 +2656,6 @@ static int ath6kl_htc_mbox_wait_target(struct htc_target *target) struct htc_service_connect_resp resp; int status; - /* FIXME: remove once USB support is implemented */ - if (target->dev->ar->hif_type == ATH6KL_HIF_TYPE_USB) { - ath6kl_err("HTC doesn't support USB yet. Patience!\n"); - return -EOPNOTSUPP; - } - /* we should be getting 1 control message that the target is ready */ packet = htc_wait_for_ctrl_msg(target); @@ -2891,9 +2885,7 @@ static void ath6kl_htc_mbox_cleanup(struct htc_target *target) { struct htc_packet *packet, *tmp_packet; - /* FIXME: remove check once USB support is implemented */ - if (target->dev->ar->hif_type != ATH6KL_HIF_TYPE_USB) - ath6kl_hif_cleanup_scatter(target->dev->ar); + ath6kl_hif_cleanup_scatter(target->dev->ar); list_for_each_entry_safe(packet, tmp_packet, &target->free_ctrl_txbuf, list) {