From patchwork Sun Nov 8 19:25:48 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ivo van Doorn X-Patchwork-Id: 58584 Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id nA8JPtnK014608 for ; Sun, 8 Nov 2009 19:25:55 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754983AbZKHTZs (ORCPT ); Sun, 8 Nov 2009 14:25:48 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1754809AbZKHTZs (ORCPT ); Sun, 8 Nov 2009 14:25:48 -0500 Received: from mail-ew0-f207.google.com ([209.85.219.207]:57079 "EHLO mail-ew0-f207.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754486AbZKHTZr (ORCPT ); Sun, 8 Nov 2009 14:25:47 -0500 Received: by ewy3 with SMTP id 3so2540013ewy.37 for ; Sun, 08 Nov 2009 11:25:52 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:from:to:subject:date :user-agent:cc:references:in-reply-to:mime-version:content-type :content-transfer-encoding:content-disposition:message-id; bh=jdcAnU31LQDzK4alOAfgMGKeNuQQJX42Mozc/22QeC4=; b=PEh2clJfwKD19X9VPCVEgN3hlmLKkJUSNJ3GXQAucdW+z8A+ozgGoa3YsuQjARauy9 p3nOKlklANu0iDkPlfAYxMlgUoKi4SuPe6JZvy+YsXYT1wNA5VggQ1ucJBIlTC1+qPah XO2MD6Wct74hKwxnUElPSHqGJMYCJ3r6LryDI= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:subject:date:user-agent:cc:references:in-reply-to :mime-version:content-type:content-transfer-encoding :content-disposition:message-id; b=YKfiHPtMcsW0X2IlecKT+Eoa+ouJ20RWJ+1Dooa43lXs6rE4z8esSIFQqfjwphnLiS j5XkFTF2uVIbkMAYxKBx2RkGM/dKuSgDDFVhfir5wEyu8+lP62R2qlE8M6vpJx81QrIg x+gxzBsQH4h8wBbypqbW3A6u878VKajjCVrjE= Received: by 10.213.24.2 with SMTP id t2mr2265973ebb.23.1257708352157; Sun, 08 Nov 2009 11:25:52 -0800 (PST) Received: from ?192.168.8.43? (a0236.upc-a.chello.nl [62.163.0.236]) by mx.google.com with ESMTPS id 24sm4225403eyx.37.2009.11.08.11.25.50 (version=SSLv3 cipher=RC4-MD5); Sun, 08 Nov 2009 11:25:50 -0800 (PST) From: Ivo van Doorn To: Bartlomiej Zolnierkiewicz Subject: Re: [PATCH 8/9] rt2800: add eFuse EEPROM support code to rt2800lib Date: Sun, 8 Nov 2009 20:25:48 +0100 User-Agent: KMail/1.9.10 Cc: linux-wireless@vger.kernel.org, Gertjan van Wingerde References: <20091108133854.23584.86842.sendpatchset@localhost.localdomain> <200911081940.27534.IvDoorn@gmail.com> <200911081947.53754.bzolnier@gmail.com> In-Reply-To: <200911081947.53754.bzolnier@gmail.com> MIME-Version: 1.0 Content-Disposition: inline Message-Id: <200911082025.48707.IvDoorn@gmail.com> Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org diff --git a/drivers/net/wireless/rt2x00/rt2800pci.c b/drivers/net/wireless/rt2x00/rt2800pci.c index 6f151d0..b33204d 100644 --- a/drivers/net/wireless/rt2x00/rt2800pci.c +++ b/drivers/net/wireless/rt2x00/rt2800pci.c @@ -80,20 +80,13 @@ static void rt2800pci_mcu_status(struct rt2x00_dev *rt2x00dev, const u8 token) rt2800_register_write(rt2x00dev, H2M_MAILBOX_CID, ~0); } -#ifdef CONFIG_RT2800PCI_WISOC static void rt2800pci_read_eeprom_soc(struct rt2x00_dev *rt2x00dev) { u32 *base_addr = (u32 *) KSEG1ADDR(0x1F040000); /* XXX for RT3052 */ memcpy_fromio(rt2x00dev->eeprom, base_addr, EEPROM_SIZE); } -#else -static inline void rt2800pci_read_eeprom_soc(struct rt2x00_dev *rt2x00dev) -{ -} -#endif /* CONFIG_RT2800PCI_WISOC */ -#ifdef CONFIG_RT2800PCI_PCI static void rt2800pci_eepromregister_read(struct eeprom_93cx6 *eeprom) { struct rt2x00_dev *rt2x00dev = eeprom->data; @@ -145,30 +138,6 @@ static void rt2800pci_read_eeprom_pci(struct rt2x00_dev *rt2x00dev) EEPROM_SIZE / sizeof(u16)); } -static int rt2800pci_efuse_detect(struct rt2x00_dev *rt2x00dev) -{ - return rt2800_efuse_detect(rt2x00dev); -} - -static inline void rt2800pci_read_eeprom_efuse(struct rt2x00_dev *rt2x00dev) -{ - rt2800_read_eeprom_efuse(rt2x00dev); -} -#else -static inline void rt2800pci_read_eeprom_pci(struct rt2x00_dev *rt2x00dev) -{ -} - -static inline int rt2800pci_efuse_detect(struct rt2x00_dev *rt2x00dev) -{ - return 0; -} - -static inline void rt2800pci_read_eeprom_efuse(struct rt2x00_dev *rt2x00dev) -{ -} -#endif /* CONFIG_RT2800PCI_PCI */ - /* * Firmware functions */ @@ -1070,8 +1039,8 @@ static int rt2800pci_validate_eeprom(struct rt2x00_dev *rt2x00dev) rt2800pci_read_eeprom_soc(rt2x00dev); break; default: - if (rt2800pci_efuse_detect(rt2x00dev)) - rt2800pci_read_eeprom_efuse(rt2x00dev); + if (rt2800_efuse_detect(rt2x00dev)) + rt2800_read_eeprom_efuse(rt2x00dev); else rt2800pci_read_eeprom_pci(rt2x00dev); break;