From patchwork Wed Apr 13 05:52:33 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sujith Manoharan X-Patchwork-Id: 702651 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 p3D5oDiM024390 for ; Wed, 13 Apr 2011 05:50:13 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752581Ab1DMFuL (ORCPT ); Wed, 13 Apr 2011 01:50:11 -0400 Received: from mail-iw0-f174.google.com ([209.85.214.174]:45218 "EHLO mail-iw0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752455Ab1DMFuK (ORCPT ); Wed, 13 Apr 2011 01:50:10 -0400 Received: by iwn34 with SMTP id 34so275635iwn.19 for ; Tue, 12 Apr 2011 22:50:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:from:mime-version:content-type :content-transfer-encoding:message-id:date:to:x-mailer:cc:subject; bh=9talfvfswDhDk2mBAPA1ElYvyLbGIlQj8DeuzkFZvR0=; b=b/Zg8zEzGYR7KqveocmoNy3tFJVdYfK+yE9we+zy0LRQlcnDqfOOY5RWRCOIWCyMmZ OjyODDKOhC+bEpS/8aylNRFF+AyyUfosP88x0/JyAkMDNB1XwcckU5HIC1UNYqsaSMyK aDFt06AXEusKXYan43W3KPUo6FOWs82NUA4J4= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:mime-version:content-type:content-transfer-encoding:message-id :date:to:x-mailer:cc:subject; b=wuDu1P/SbTcjBRAlw9Z0zca33SXbXojkxcr0MKJ5JDunEGjPC+t9Gca5fn6hAKtPMu 1Q98G2iOg1NthnVX6TduURioOBAexo+7H91tQ0ehkiKZgVIhPR0B61T3b2rSatYkY717 kraH4gWhPYh/LFCg9BdF82fIcthUgBu3/eQRU= Received: by 10.42.97.70 with SMTP id m6mr3176792icn.104.1302673809889; Tue, 12 Apr 2011 22:50:09 -0700 (PDT) Received: from atheros-test ([182.72.177.186]) by mx.google.com with ESMTPS id i20sm182745iby.31.2011.04.12.22.50.06 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 12 Apr 2011 22:50:09 -0700 (PDT) From: Sujith MIME-Version: 1.0 Message-ID: <19877.14881.765433.837554@gargle.gargle.HOWL> Date: Wed, 13 Apr 2011 11:22:33 +0530 To: linville@tuxdriver.com X-Mailer: VM 8.1.1 under 23.3.1 (x86_64-unknown-linux-gnu) CC: linux-wireless@vger.kernel.org, ath9k-devel@venema.h4ckr.net Subject: [PATCH 01/40] ath9k_htc: Remove AR7010 v1.0 support 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, 13 Apr 2011 05:50:13 +0000 (UTC) From: Sujith Manoharan All the AR7010 devices supoprted by ath9k_htc are based on version v1.1, so remove support for v1.0. Signed-off-by: Sujith Manoharan --- drivers/net/wireless/ath/ath9k/hif_usb.c | 7 +------ 1 files changed, 1 insertions(+), 6 deletions(-) diff --git a/drivers/net/wireless/ath/ath9k/hif_usb.c b/drivers/net/wireless/ath/ath9k/hif_usb.c index 2d10239..dc05820 100644 --- a/drivers/net/wireless/ath/ath9k/hif_usb.c +++ b/drivers/net/wireless/ath/ath9k/hif_usb.c @@ -17,11 +17,9 @@ #include "htc.h" /* identify firmware images */ -#define FIRMWARE_AR7010 "ar7010.fw" #define FIRMWARE_AR7010_1_1 "ar7010_1_1.fw" #define FIRMWARE_AR9271 "ar9271.fw" -MODULE_FIRMWARE(FIRMWARE_AR7010); MODULE_FIRMWARE(FIRMWARE_AR7010_1_1); MODULE_FIRMWARE(FIRMWARE_AR9271); @@ -1026,10 +1024,7 @@ static int ath9k_hif_usb_probe(struct usb_interface *interface, /* Find out which firmware to load */ if (IS_AR7010_DEVICE(id->driver_info)) - if (le16_to_cpu(udev->descriptor.bcdDevice) == 0x0202) - hif_dev->fw_name = FIRMWARE_AR7010_1_1; - else - hif_dev->fw_name = FIRMWARE_AR7010; + hif_dev->fw_name = FIRMWARE_AR7010_1_1; else hif_dev->fw_name = FIRMWARE_AR9271;