From patchwork Mon Feb 15 15:11:45 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Larry Finger X-Patchwork-Id: 79415 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 o1FFCdIG000629 for ; Mon, 15 Feb 2010 15:12:39 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755529Ab0BOPLs (ORCPT ); Mon, 15 Feb 2010 10:11:48 -0500 Received: from hrndva-omtalb.mail.rr.com ([71.74.56.122]:52847 "EHLO hrndva-omtalb.mail.rr.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755675Ab0BOPLr (ORCPT ); Mon, 15 Feb 2010 10:11:47 -0500 X-Authority-Analysis: v=1.0 c=1 a=x0N3M4q954wA:10 a=yQdBAQUQAAAA:8 a=RfKb1_cBFdfGvZTL7vIA:9 a=lXwaWWiKwsiem6W2KWMA:7 a=hbs-gbPNjdnsqSwCE-36k8Gq3W0A:4 a=IcxpeKGZWnEA:10 X-Cloudmark-Score: 0 X-Originating-IP: 65.28.92.235 Received: from [65.28.92.235] ([65.28.92.235:43113] helo=larrylap.site) by hrndva-oedge04.mail.rr.com (envelope-from ) (ecelerity 2.2.2.39 r()) with ESMTP id 63/69-04308-134697B4; Mon, 15 Feb 2010 15:11:46 +0000 Date: Mon, 15 Feb 2010 09:11:45 -0600 From: Larry Finger To: Greg Kroah-Hartman Cc: Bernhard Schiffner , linux-kernel@vger.kernel.org, linux-wireless@vger.kernel.org Subject: [PATCH 1/3 V2] staging: r8187se: Remove write_phy routine Message-ID: <4b796431.q2VeV+yAMJiEjqm7%Larry.Finger@lwfinger.net> User-Agent: Heirloom mailx 12.2 01/07/07 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.3 (demeter.kernel.org [140.211.167.41]); Mon, 15 Feb 2010 15:12:39 +0000 (UTC) Index: linux-2.6/drivers/staging/rtl8187se/r8180_core.c =================================================================== --- linux-2.6.orig/drivers/staging/rtl8187se/r8180_core.c +++ linux-2.6/drivers/staging/rtl8187se/r8180_core.c @@ -3207,43 +3207,6 @@ void write_phy_cck (struct net_device *d rtl8185_write_phy(dev, adr, data | 0x10000); } -/* 70*3 = 210 ms - * I hope this is enougth - */ -#define MAX_PHY 70 -void write_phy(struct net_device *dev, u8 adr, u8 data) -{ - u32 phy; - int i; - - phy = 0xff0000; - phy |= adr; - phy |= 0x80; /* this should enable writing */ - phy |= (data<<8); - - //PHY_ADR, PHY_R and PHY_W are contig and treated as one dword - write_nic_dword(dev,PHY_ADR, phy); - - phy= 0xffff00; - phy |= adr; - - write_nic_dword(dev,PHY_ADR, phy); - for(i=0;i> 16; - if(phy == data){ //SUCCESS! - force_pci_posting(dev); - mdelay(3); //random value - return; - }else{ - force_pci_posting(dev); - mdelay(3); //random value - } - } - DMESGW ("Phy writing %x %x failed!", adr,data); -} - void rtl8185_set_rate(struct net_device *dev) { int i;