From patchwork Mon Feb 15 04:07:57 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Larry Finger X-Patchwork-Id: 79351 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.3/8.14.3) with ESMTP id o1F48XHP002065 for ; Mon, 15 Feb 2010 04:08:33 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755111Ab0BOEIF (ORCPT ); Sun, 14 Feb 2010 23:08:05 -0500 Received: from mail-iw0-f201.google.com ([209.85.223.201]:37335 "EHLO mail-iw0-f201.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755072Ab0BOEIB (ORCPT ); Sun, 14 Feb 2010 23:08:01 -0500 Received: by iwn39 with SMTP id 39so1819075iwn.1 for ; Sun, 14 Feb 2010 20:08:00 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:sender:message-id:date:from :user-agent:mime-version:to:cc:subject:content-type :content-transfer-encoding; bh=CG1//16YcSZ/MGB/zIw92piz9IF8C5D5WW7v5KLohUk=; b=wcVzZzz43ifhIO8YT0Y5k2CPbH54ODIhEMmUO8O0o91qPOW88OaW3G5whnyfBwxEpA q+FZPyDDV2nmsx0cwGrxWVRYK2k8sWbcO+dNvzkLTMXoK/OXiqOwrbkyOMrgw5jSnKUA iM2roNau9rJLDtO2/OlWtHdWymftOwup8f3vE= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=sender:message-id:date:from:user-agent:mime-version:to:cc:subject :content-type:content-transfer-encoding; b=p8VvelJHhcaIwmFtc4IZ+0tC0FBQ09rZpOqyVCQ7XKUi9D3igu+GjN6BRTUSWx/js6 TSjvRLn1bGT+qnxfSvyBLR8yY5o63EuV1D0JeaBzmCyCxbQMviGCCP2vltwk77DbljzZ CUZhhmdqrMaD6dnC9J2Vqp0K/S2s4/P/Om5ng= Received: by 10.231.151.207 with SMTP id d15mr4822358ibw.44.1266206880127; Sun, 14 Feb 2010 20:08:00 -0800 (PST) Received: from ?192.168.1.141? ([65.28.92.235]) by mx.google.com with ESMTPS id 21sm5964967iwn.2.2010.02.14.20.07.58 (version=SSLv3 cipher=RC4-MD5); Sun, 14 Feb 2010 20:07:59 -0800 (PST) Message-ID: <4B78C89D.3040108@lwfinger.net> Date: Sun, 14 Feb 2010 22:07:57 -0600 From: Larry Finger User-Agent: Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.1.7) Gecko/20100111 SUSE/3.0.1-1.1 Thunderbird/3.0.1 MIME-Version: 1.0 To: Greg Kroah-Hartman CC: Bernhard Schiffner , wireless , LKML Subject: [PATCH 3/3] Staging: r8187se: Remove dead code from r8185b_init.c 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.3 (demeter.kernel.org [140.211.167.41]); Mon, 15 Feb 2010 04:08:34 +0000 (UTC) Index: linux-2.6/drivers/staging/rtl8187se/r8185b_init.c =================================================================== --- linux-2.6.orig/drivers/staging/rtl8187se/r8185b_init.c +++ linux-2.6/drivers/staging/rtl8187se/r8185b_init.c @@ -243,82 +243,7 @@ void SetOutputEnableOfRfPins(struct net_ write_nic_word(dev, RFPinsEnable, 0x1bff); } -void -ZEBRA_RFSerialWrite( - struct net_device *dev, - u32 data2Write, - u8 totalLength, - u8 low2high - ) -{ - ThreeWireReg twreg; - int i; - u16 oval,oval2,oval3; - u32 mask; - u16 UshortBuffer; - - u8 u1bTmp; - // RTL8187S HSSI Read/Write Function - u1bTmp = read_nic_byte(dev, RF_SW_CONFIG); - u1bTmp |= RF_SW_CFG_SI; //reg08[1]=1 Serial Interface(SI) - write_nic_byte(dev, RF_SW_CONFIG, u1bTmp); - UshortBuffer = read_nic_word(dev, RFPinsOutput); - oval = UshortBuffer & 0xfff8; // We shall clear bit0, 1, 2 first, 2005.10.28, by rcnjko. - - oval2 = read_nic_word(dev, RFPinsEnable); - oval3 = read_nic_word(dev, RFPinsSelect); - - // 3-wire should be controled by HW when we finish SW 3-wire programming. 2005.08.10, by rcnjko. - oval3 &= 0xfff8; - - write_nic_word(dev, RFPinsEnable, (oval2|0x0007)); // Set To Output Enable - write_nic_word(dev, RFPinsSelect, (oval3|0x0007)); // Set To SW Switch - udelay(10); - - // Add this to avoid hardware and software 3-wire conflict. - // 2005.03.01, by rcnjko. - twreg.longData = 0; - twreg.struc.enableB = 1; - write_nic_word(dev, RFPinsOutput, (twreg.longData|oval)); // Set SI_EN (RFLE) - udelay(2); - twreg.struc.enableB = 0; - write_nic_word(dev, RFPinsOutput, (twreg.longData|oval)); // Clear SI_EN (RFLE) - udelay(10); - - mask = (low2high)?0x01:((u32)0x01<<(totalLength-1)); - - for(i=0; i>1); - twreg.struc.data = ((data2Write&mask)!=0) ? 1 : 0; - write_nic_word(dev, RFPinsOutput, (twreg.longData|oval)); - write_nic_word(dev, RFPinsOutput, (twreg.longData|oval)); - twreg.struc.clk = 0; - write_nic_word(dev, RFPinsOutput, (twreg.longData|oval)); - mask = (low2high)?(mask<<1):(mask>>1); - } - - twreg.struc.enableB = 1; - twreg.struc.clk = 0; - twreg.struc.data = 0; - write_nic_word(dev, RFPinsOutput, twreg.longData|oval); - udelay(10); - - write_nic_word(dev, RFPinsOutput, oval|0x0004); - write_nic_word(dev, RFPinsSelect, oval3|0x0000); - - SetOutputEnableOfRfPins(dev); -} -//by amy - - -int +static int HwHSSIThreeWire(