eeepc-laptop: define rfkill notifier nodes only once

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>
Signed-off-by: Darren Hart <dvhart@linux.intel.com>

diff --git a/drivers/platform/x86/eeepc-laptop.c b/drivers/platform/x86/eeepc-laptop.c
index 6e3be01ca011d90fcdf06a44d1932d383ead23ce..e92ea4187cdff247742411604e8e7f28b545581f 100644 (file)
--- 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)