From: "John W. Linville" <linville@tuxdriver.com>
To: linux-wireless@vger.kernel.org
Cc: ath9k-devel@atheros.com, "John W. Linville" <linville@tuxdriver.com>
Subject: [PATCH v2] ath9k: declare MODULE_FIRMWARE for ath9k_htc
Date: Wed, 23 Jun 2010 14:50:39 -0400 [thread overview]
Message-ID: <1277319039-20837-1-git-send-email-linville@tuxdriver.com> (raw)
In-Reply-To: <1277317393-20245-1-git-send-email-linville@tuxdriver.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
---
v2 -> avoid duplicate strings for firmware names and simultaneously
attract attention to MODULE_FIRMWARE section in the even of
any updates
drivers/net/wireless/ath/ath9k/hif_usb.c | 15 ++++++++++++---
1 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/drivers/net/wireless/ath/ath9k/hif_usb.c b/drivers/net/wireless/ath/ath9k/hif_usb.c
index 74bc80f..ad9134b 100644
--- a/drivers/net/wireless/ath/ath9k/hif_usb.c
+++ b/drivers/net/wireless/ath/ath9k/hif_usb.c
@@ -16,6 +16,15 @@
#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);
+
static struct usb_device_id ath9k_hif_usb_ids[] = {
{ USB_DEVICE(0x0cf3, 0x9271) }, /* Atheros */
{ USB_DEVICE(0x0cf3, 0x1006) }, /* Atheros */
@@ -890,12 +899,12 @@ static int ath9k_hif_usb_probe(struct usb_interface *interface,
case 0x7010:
case 0x9018:
if (le16_to_cpu(udev->descriptor.bcdDevice) == 0x0202)
- hif_dev->fw_name = "ar7010_1_1.fw";
+ hif_dev->fw_name = FIRMWARE_AR7010_1_1;
else
- hif_dev->fw_name = "ar7010.fw";
+ hif_dev->fw_name = FIRMWARE_AR7010;
break;
default:
- hif_dev->fw_name = "ar9271.fw";
+ hif_dev->fw_name = FIRMWARE_AR9271;
break;
}
--
1.7.0.1
next prev parent reply other threads:[~2010-06-23 19:00 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-06-23 18:23 [PATCH] ath9k: declare MODULE_FIRMWARE for ath9k_htc John W. Linville
2010-06-23 18:50 ` John W. Linville [this message]
2010-06-25 8:40 ` [internal-ath9k-devel] [PATCH v2] " Sujith
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1277319039-20837-1-git-send-email-linville@tuxdriver.com \
--to=linville@tuxdriver.com \
--cc=ath9k-devel@atheros.com \
--cc=linux-wireless@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox