From: Frans Klaver <fransklaver@gmail.com>
To: Darren Hart <dvhart@infradead.org>
Cc: Frans Klaver <fransklaver@gmail.com>,
Corentin Chary <corentin.chary@gmail.com>,
acpi4asus-user@lists.sourceforge.net,
platform-driver-x86@vger.kernel.org,
linux-kernel@vger.kernel.org
Subject: [PATCH 3/8] eeepc-laptop: define rfkill notifier nodes only once
Date: Wed, 22 Oct 2014 21:12:38 +0200 [thread overview]
Message-ID: <1414005163-3461-4-git-send-email-fransklaver@gmail.com> (raw)
In-Reply-To: <1414005163-3461-1-git-send-email-fransklaver@gmail.com>
The rfkill notifier node names are used in three different places. As a
matter of style, it is better to store them somewhere and have the
compiler warn us about typos in the function arguments.
Signed-off-by: Frans Klaver <fransklaver@gmail.com>
---
drivers/platform/x86/eeepc-laptop.c | 22 +++++++++++++---------
1 file changed, 13 insertions(+), 9 deletions(-)
diff --git a/drivers/platform/x86/eeepc-laptop.c b/drivers/platform/x86/eeepc-laptop.c
index 6e3be01..e92ea41 100644
--- a/drivers/platform/x86/eeepc-laptop.c
+++ b/drivers/platform/x86/eeepc-laptop.c
@@ -819,11 +819,15 @@ static int eeepc_new_rfkill(struct eeepc_laptop *eeepc,
return 0;
}
+static char EEEPC_RFKILL_NODE_1[] = "\\_SB.PCI0.P0P5";
+static char EEEPC_RFKILL_NODE_2[] = "\\_SB.PCI0.P0P6";
+static char EEEPC_RFKILL_NODE_3[] = "\\_SB.PCI0.P0P7";
+
static void eeepc_rfkill_exit(struct eeepc_laptop *eeepc)
{
- eeepc_unregister_rfkill_notifier(eeepc, "\\_SB.PCI0.P0P5");
- eeepc_unregister_rfkill_notifier(eeepc, "\\_SB.PCI0.P0P6");
- eeepc_unregister_rfkill_notifier(eeepc, "\\_SB.PCI0.P0P7");
+ eeepc_unregister_rfkill_notifier(eeepc, EEEPC_RFKILL_NODE_1);
+ eeepc_unregister_rfkill_notifier(eeepc, EEEPC_RFKILL_NODE_2);
+ eeepc_unregister_rfkill_notifier(eeepc, EEEPC_RFKILL_NODE_3);
if (eeepc->wlan_rfkill) {
rfkill_unregister(eeepc->wlan_rfkill);
rfkill_destroy(eeepc->wlan_rfkill);
@@ -895,9 +899,9 @@ static int eeepc_rfkill_init(struct eeepc_laptop *eeepc)
if (result == -EBUSY)
result = 0;
- eeepc_register_rfkill_notifier(eeepc, "\\_SB.PCI0.P0P5");
- eeepc_register_rfkill_notifier(eeepc, "\\_SB.PCI0.P0P6");
- eeepc_register_rfkill_notifier(eeepc, "\\_SB.PCI0.P0P7");
+ eeepc_register_rfkill_notifier(eeepc, EEEPC_RFKILL_NODE_1);
+ eeepc_register_rfkill_notifier(eeepc, EEEPC_RFKILL_NODE_2);
+ eeepc_register_rfkill_notifier(eeepc, EEEPC_RFKILL_NODE_3);
exit:
if (result && result != -ENODEV)
@@ -933,9 +937,9 @@ static int eeepc_hotk_restore(struct device *device)
/* Refresh both wlan rfkill state and pci hotplug */
if (eeepc->wlan_rfkill) {
- eeepc_rfkill_hotplug_update(eeepc, "\\_SB.PCI0.P0P5");
- eeepc_rfkill_hotplug_update(eeepc, "\\_SB.PCI0.P0P6");
- eeepc_rfkill_hotplug_update(eeepc, "\\_SB.PCI0.P0P7");
+ eeepc_rfkill_hotplug_update(eeepc, EEEPC_RFKILL_NODE_1);
+ eeepc_rfkill_hotplug_update(eeepc, EEEPC_RFKILL_NODE_2);
+ eeepc_rfkill_hotplug_update(eeepc, EEEPC_RFKILL_NODE_3);
}
if (eeepc->bluetooth_rfkill)
--
2.1.0
next prev parent reply other threads:[~2014-10-22 19:13 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-10-22 19:12 [PATCH 0/8] More eeepc-laptop cleanup Frans Klaver
2014-10-22 19:12 ` [PATCH 1/8] eeepc-laptop: flatten control flow Frans Klaver
2014-10-28 4:56 ` Darren Hart
2014-10-22 19:12 ` [PATCH 2/8] eeepc-laptop: don't break user visible strings Frans Klaver
2014-10-22 19:12 ` Frans Klaver [this message]
2014-10-28 5:12 ` [PATCH 3/8] eeepc-laptop: define rfkill notifier nodes only once Darren Hart
2014-10-28 8:28 ` Frans Klaver
2014-10-22 19:12 ` [PATCH 4/8] eeepc-laptop: pull out eeepc_destroy_rfkill Frans Klaver
2014-10-28 5:19 ` Darren Hart
2014-10-28 8:16 ` Frans Klaver
2014-10-22 19:12 ` [PATCH 5/8] eeepc-laptop: clean up control flow in eeepc_acpi_notify Frans Klaver
2014-10-28 5:25 ` Darren Hart
2014-11-02 21:14 ` [PATCH v2] " Frans Klaver
2014-11-04 6:01 ` Darren Hart
2014-10-22 19:12 ` [PATCH 6/8] eeepc-laptop: replace magic numbers with defines Frans Klaver
2014-10-22 19:12 ` [PATCH 7/8] eeepc-laptop: document fan_pwm conversions Frans Klaver
2014-10-28 5:31 ` Darren Hart
2014-10-28 8:21 ` Frans Klaver
2014-10-22 19:12 ` [PATCH 8/8] eeepc-laptop: don't assume get_acpi succeeds Frans Klaver
2014-10-28 5:34 ` Darren Hart
2014-10-28 8:09 ` Frans Klaver
2014-10-30 0:54 ` Darren Hart
2014-10-28 5:35 ` [PATCH 0/8] More eeepc-laptop cleanup Darren Hart
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=1414005163-3461-4-git-send-email-fransklaver@gmail.com \
--to=fransklaver@gmail.com \
--cc=acpi4asus-user@lists.sourceforge.net \
--cc=corentin.chary@gmail.com \
--cc=dvhart@infradead.org \
--cc=linux-kernel@vger.kernel.org \
--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
all inboxes | Powered by JetHome®