From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932117AbZHPTao (ORCPT ); Sun, 16 Aug 2009 15:30:44 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1755939AbZHPTam (ORCPT ); Sun, 16 Aug 2009 15:30:42 -0400 Received: from mail-bw0-f222.google.com ([209.85.218.222]:45385 "EHLO mail-bw0-f222.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755925AbZHPTai (ORCPT ); Sun, 16 Aug 2009 15:30:38 -0400 DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:date:message-id:in-reply-to:references:subject; b=lgCv9BIbkwBH494KSLV1LTY6sOSH96F3tNkNM4YB+akBdyOR+bSBSVltLY2M8TMYGz BE9ZMhxy1oWV0P9Q4J+5OuwcJ4yveZvFP3Yaj0Xa5e282lIRl+/QP6pfhi8pDk21eoun PueU32i9MNl/9cFDaw9+q5n3/L5WG6Lz544vI= From: Bartlomiej Zolnierkiewicz To: "Greg Kroah-Hartman" Cc: devel@driverdev.osuosl.org, Bartlomiej Zolnierkiewicz , linux-kernel@vger.kernel.org Date: Sun, 16 Aug 2009 21:30:38 +0200 Message-Id: <20090816193038.3789.90073.sendpatchset@localhost.localdomain> In-Reply-To: <20090816192934.3789.3648.sendpatchset@localhost.localdomain> References: <20090816192934.3789.3648.sendpatchset@localhost.localdomain> Subject: [PATCH 10/22] Staging: rtxxx0: unify different RT30xx{Read,Write}RFRegister() flavors Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Bartlomiej Zolnierkiewicz Subject: [PATCH] Staging: rtxxx0: unify different RT30xx{Read,Write}RFRegister() flavors RTMP_IO_{READ,WRITE}32 equals RTUSB{Read,Write}MACRegister in case of USB chipsets so unify RT30xx and !RT30xx code. Signed-off-by: Bartlomiej Zolnierkiewicz --- drivers/staging/rt2860/common/mlme.c | 111 ------------------------------- drivers/staging/rt2860/rt28xx.h | 3 drivers/staging/rt2860/rtmp.h | 14 --- drivers/staging/rt2870/common/rtusb_io.c | 25 +++--- drivers/staging/rt2870/rt2870.h | 3 5 files changed, 15 insertions(+), 141 deletions(-) Index: b/drivers/staging/rt2860/common/mlme.c =================================================================== --- a/drivers/staging/rt2860/common/mlme.c +++ b/drivers/staging/rt2860/common/mlme.c @@ -5636,117 +5636,6 @@ VOID AsicUpdateProtect( } #ifdef RT30xx -/* - ======================================================================== - - Routine Description: Write RT30xx RF register through MAC - - Arguments: - - Return Value: - - IRQL = - - Note: - - ======================================================================== -*/ -NTSTATUS RT30xxWriteRFRegister( - IN PRTMP_ADAPTER pAd, - IN UCHAR RegID, - IN UCHAR Value) -{ - RF_CSR_CFG_STRUC rfcsr; - UINT i = 0; - - do - { - RTMP_IO_READ32(pAd, RF_CSR_CFG, &rfcsr.word); - - if (!rfcsr.field.RF_CSR_KICK) - break; - i++; - } - while ((i < RETRY_LIMIT) && (!RTMP_TEST_FLAG(pAd, fRTMP_ADAPTER_NIC_NOT_EXIST))); - - if ((i == RETRY_LIMIT) || (RTMP_TEST_FLAG(pAd, fRTMP_ADAPTER_NIC_NOT_EXIST))) - { - DBGPRINT_RAW(RT_DEBUG_ERROR, ("Retry count exhausted or device removed!!!\n")); - return STATUS_UNSUCCESSFUL; - } - - rfcsr.field.RF_CSR_WR = 1; - rfcsr.field.RF_CSR_KICK = 1; - rfcsr.field.TESTCSR_RFACC_REGNUM = RegID; - rfcsr.field.RF_CSR_DATA = Value; - - RTMP_IO_WRITE32(pAd, RF_CSR_CFG, rfcsr.word); - - return STATUS_SUCCESS; -} - - -/* - ======================================================================== - - Routine Description: Read RT30xx RF register through MAC - - Arguments: - - Return Value: - - IRQL = - - Note: - - ======================================================================== -*/ -NTSTATUS RT30xxReadRFRegister( - IN PRTMP_ADAPTER pAd, - IN UCHAR RegID, - IN PUCHAR pValue) -{ - RF_CSR_CFG_STRUC rfcsr; - UINT i=0, k=0; - - for (i=0; i