From patchwork Wed Mar 30 00:56:30 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luis Rodriguez X-Patchwork-Id: 672902 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id p2U0vwHF029369 for ; Wed, 30 Mar 2011 00:57:58 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755378Ab1C3A55 (ORCPT ); Tue, 29 Mar 2011 20:57:57 -0400 Received: from mail.atheros.com ([12.19.149.2]:47205 "EHLO mail.atheros.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755125Ab1C3A54 (ORCPT ); Tue, 29 Mar 2011 20:57:56 -0400 Received: from mail.atheros.com ([10.10.20.105]) by sidewinder.atheros.com for ; Tue, 29 Mar 2011 17:57:32 -0700 Received: from tux (10.10.10.239) by SC1EXHC-01.global.atheros.com (10.10.20.106) with Microsoft SMTP Server (TLS) id 8.2.213.0; Tue, 29 Mar 2011 17:57:54 -0700 Received: by tux (sSMTP sendmail emulation); Tue, 29 Mar 2011 17:57:53 -0700 From: "Luis R. Rodriguez" To: CC: , , , , "Luis R. Rodriguez" Subject: [PATCH 33/34] ath6kl: remove ar6000_prepare_target() crap Date: Tue, 29 Mar 2011 17:56:30 -0700 Message-ID: <1301446591-15236-34-git-send-email-lrodriguez@atheros.com> X-Mailer: git-send-email 1.7.4.15.g7811d In-Reply-To: <1301446591-15236-1-git-send-email-lrodriguez@atheros.com> References: <1301446591-15236-1-git-send-email-lrodriguez@atheros.com> MIME-Version: 1.0 Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Wed, 30 Mar 2011 00:57:59 +0000 (UTC) diff --git a/drivers/staging/ath6kl/include/common_drv.h b/drivers/staging/ath6kl/include/common_drv.h index b606334..34db299 100644 --- a/drivers/staging/ath6kl/include/common_drv.h +++ b/drivers/staging/ath6kl/include/common_drv.h @@ -81,10 +81,6 @@ int ar6000_set_htc_params(struct hif_device *hifDevice, u32 MboxIsrYieldValue, u8 HtcControlBuffers); -int ar6000_prepare_target(struct hif_device *hifDevice, - u32 TargetType, - u32 TargetVersion); - int ar6000_set_hci_bridge_flags(struct hif_device *hifDevice, u32 TargetType, u32 Flags); diff --git a/drivers/staging/ath6kl/miscdrv/common_drv.c b/drivers/staging/ath6kl/miscdrv/common_drv.c index a23a524..2be2ea4 100644 --- a/drivers/staging/ath6kl/miscdrv/common_drv.c +++ b/drivers/staging/ath6kl/miscdrv/common_drv.c @@ -683,40 +683,6 @@ int ar6000_set_htc_params(struct hif_device *hifDevice, return status; } - -static int prepare_ar6002(struct hif_device *hifDevice, u32 TargetVersion) -{ - int status = 0; - - /* placeholder */ - - return status; -} - -static int prepare_ar6003(struct hif_device *hifDevice, u32 TargetVersion) -{ - int status = 0; - - /* placeholder */ - - return status; -} - -/* this function assumes the caller has already initialized the BMI APIs */ -int ar6000_prepare_target(struct hif_device *hifDevice, - u32 TargetType, - u32 TargetVersion) -{ - if (TargetType == TARGET_TYPE_AR6002) { - /* do any preparations for AR6002 devices */ - return prepare_ar6002(hifDevice,TargetVersion); - } else if (TargetType == TARGET_TYPE_AR6003) { - return prepare_ar6003(hifDevice,TargetVersion); - } - - return 0; -} - #if defined(CONFIG_AR6002_REV1_FORCE_HOST) /* * Call this function just before the call to BMIInit diff --git a/drivers/staging/ath6kl/os/linux/ar6000_drv.c b/drivers/staging/ath6kl/os/linux/ar6000_drv.c index e3c1f58..666d5e6 100644 --- a/drivers/staging/ath6kl/os/linux/ar6000_drv.c +++ b/drivers/staging/ath6kl/os/linux/ar6000_drv.c @@ -1698,14 +1698,6 @@ ar6000_avail_ev(void *context, void *hif_handle) ar->arVersion.target_ver = targ_info.target_ver; ar->arTargetType = targ_info.target_type; - - /* do any target-specific preparation that can be done through BMI */ - r = ar6000_prepare_target(ar->arHifDevice, - targ_info.target_type, - targ_info.target_ver); - if (r) - goto avail_ev_failed; - } r = ar6000_configure_target(ar);