From: "João Paulo Rechi Vita" <jprvita@gmail.com>
To: Corentin Chary <corentin.chary@gmail.com>,
Darren Hart <dvhart@infradead.org>
Cc: platform-driver-x86@vger.kernel.org,
acpi4asus-user@lists.sourceforge.net,
linux-kernel@vger.kernel.org, linux@endlessm.com,
"João Paulo Rechi Vita" <jprvita@endlessm.com>
Subject: [PATCH 7/8] asus-wireless: Export ids list
Date: Thu, 26 Jan 2017 10:30:12 -0500 [thread overview]
Message-ID: <20170126153013.12753-8-jprvita@endlessm.com> (raw)
In-Reply-To: <20170126153013.12753-1-jprvita@endlessm.com>
Signed-off-by: João Paulo Rechi Vita <jprvita@endlessm.com>
---
drivers/platform/x86/asus-wireless.c | 15 ++++++---------
drivers/platform/x86/asus-wireless.h | 10 ++++++++++
2 files changed, 16 insertions(+), 9 deletions(-)
create mode 100644 drivers/platform/x86/asus-wireless.h
diff --git a/drivers/platform/x86/asus-wireless.c b/drivers/platform/x86/asus-wireless.c
index 5a238fad35fb..fa28613688b4 100644
--- a/drivers/platform/x86/asus-wireless.c
+++ b/drivers/platform/x86/asus-wireless.c
@@ -17,6 +17,8 @@
#include <linux/pci_ids.h>
#include <linux/leds.h>
+#include "asus-wireless.h"
+
#define ASUS_WIRELESS_LED_STATUS 0x2
struct hswc_params {
@@ -40,12 +42,7 @@ static const struct hswc_params id_params[] = {
{ 0x5, 0x4 },
};
-static const struct acpi_device_id device_ids[] = {
- {"ATK4001", 0},
- {"ATK4002", 0},
- {"", 0},
-};
-MODULE_DEVICE_TABLE(acpi, device_ids);
+MODULE_DEVICE_TABLE(acpi, asus_wireless_ids);
static u64 asus_wireless_method(acpi_handle handle, const char *method,
int param)
@@ -130,8 +127,8 @@ static int asus_wireless_add(struct acpi_device *adev)
adev->driver_data = data;
hid = acpi_device_hid(adev);
- for (i = 0; strcmp(device_ids[i].id, ""); i++) {
- if (!strcmp(device_ids[i].id, hid)) {
+ for (i = 0; strcmp(asus_wireless_ids[i].id, ""); i++) {
+ if (!strcmp(asus_wireless_ids[i].id, hid)) {
data->hswc_params = &id_params[i];
break;
}
@@ -179,7 +176,7 @@ static int asus_wireless_remove(struct acpi_device *adev)
static struct acpi_driver asus_wireless_driver = {
.name = "Asus Wireless Radio Control Driver",
.class = "hotkey",
- .ids = device_ids,
+ .ids = asus_wireless_ids,
.ops = {
.add = asus_wireless_add,
.remove = asus_wireless_remove,
diff --git a/drivers/platform/x86/asus-wireless.h b/drivers/platform/x86/asus-wireless.h
new file mode 100644
index 000000000000..10a345863da6
--- /dev/null
+++ b/drivers/platform/x86/asus-wireless.h
@@ -0,0 +1,10 @@
+#ifndef _ASUS_WIRELESS_H_
+#define _ASUS_WIRELESS_H_
+
+const struct acpi_device_id asus_wireless_ids[] = {
+ {"ATK4001", 0},
+ {"ATK4002", 0},
+ {"", 0},
+};
+
+#endif /* !_ASUS_WIRELESS_H_ */
--
2.11.0
next prev parent reply other threads:[~2017-01-26 15:31 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-01-26 15:30 [PATCH 0/8] asus-wmi: Get rid of quirk_no_rfkill{,_wapf4} João Paulo Rechi Vita
2017-01-26 15:30 ` [PATCH 1/8] Revert "asus-wmi: Add quirk_no_rfkill_wapf4 for the Asus X456UA" João Paulo Rechi Vita
2017-01-26 15:30 ` [PATCH 2/8] Revert "asus-wmi: Add quirk_no_rfkill_wapf4 for the Asus X456UF" João Paulo Rechi Vita
2017-01-26 15:30 ` [PATCH 3/8] Revert "asus-wmi: Add quirk_no_rfkill for the Asus Z550MA" João Paulo Rechi Vita
2017-01-26 15:30 ` [PATCH 4/8] Revert "asus-wmi: Add quirk_no_rfkill for the Asus U303LB" João Paulo Rechi Vita
2017-01-26 15:30 ` [PATCH 5/8] Revert "asus-wmi: Add quirk_no_rfkill for the Asus N552VW" João Paulo Rechi Vita
2017-01-26 15:30 ` [PATCH 6/8] Revert "asus-wmi: Create quirk for airplane_mode LED" João Paulo Rechi Vita
2017-01-26 15:30 ` João Paulo Rechi Vita [this message]
2017-01-27 15:36 ` [PATCH 7/8] asus-wireless: Export ids list Andy Shevchenko
2017-02-01 12:23 ` João Paulo Rechi Vita
2017-02-04 15:35 ` Andy Shevchenko
2017-02-06 19:18 ` João Paulo Rechi Vita
2017-01-26 15:30 ` [PATCH 8/8] asus-wmi: Don't register rfkill if ASHS and user bit are present João Paulo Rechi Vita
2017-01-26 22:45 ` Joe Perches
2017-02-01 12:18 ` João Paulo Rechi Vita
2017-01-27 15:37 ` [PATCH 0/8] asus-wmi: Get rid of quirk_no_rfkill{,_wapf4} Andy Shevchenko
2017-02-01 12:21 ` João Paulo Rechi Vita
2017-02-04 15:05 ` Andy Shevchenko
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=20170126153013.12753-8-jprvita@endlessm.com \
--to=jprvita@gmail.com \
--cc=acpi4asus-user@lists.sourceforge.net \
--cc=corentin.chary@gmail.com \
--cc=dvhart@infradead.org \
--cc=jprvita@endlessm.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux@endlessm.com \
--cc=platform-driver-x86@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