eeepc: Use pr_warn

Just a trivial pr_warning to pr_warn conversion
while adding a few missing newlines.

Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Matthew Garrett <mjg@redhat.com>

diff --git a/drivers/platform/x86/eeepc-laptop.c b/drivers/platform/x86/eeepc-laptop.c
index 2c1abf63957f23d0353c209af843f8e8bcf3c50c..1c45d92e21638230728a1f2919b1cc776360c937 100644 (file)
--- a/drivers/platform/x86/eeepc-laptop.c
+++ b/drivers/platform/x86/eeepc-laptop.c
@@ -228,7 +228,7 @@ static int set_acpi(struct eeepc_laptop *eeepc, int cm, int value)
                return -ENODEV;
 
        if (write_acpi_int(eeepc->handle, method, value))
-               pr_warning("Error writing %s\n", method);
+               pr_warn("Error writing %s\n", method);
        return 0;
 }
 
@@ -243,7 +243,7 @@ static int get_acpi(struct eeepc_laptop *eeepc, int cm)
                return -ENODEV;
 
        if (read_acpi_int(eeepc->handle, method, &value))
-               pr_warning("Error reading %s\n", method);
+               pr_warn("Error reading %s\n", method);
        return value;
 }
 
@@ -261,7 +261,7 @@ static int acpi_setter_handle(struct eeepc_laptop *eeepc, int cm,
        status = acpi_get_handle(eeepc->handle, (char *)method,
                                 handle);
        if (status != AE_OK) {
-               pr_warning("Error finding %s\n", method);
+               pr_warn("Error finding %s\n", method);
                return -ENODEV;
        }
        return 0;
@@ -417,7 +417,7 @@ static ssize_t store_cpufv_disabled(struct device *dev,
        switch (value) {
        case 0:
                if (eeepc->cpufv_disabled)
-                       pr_warning("cpufv enabled (not officially supported "
+                       pr_warn("cpufv enabled (not officially supported "
                                "on this model)\n");
                eeepc->cpufv_disabled = false;
                return rv;
@@ -609,7 +609,7 @@ static void eeepc_rfkill_hotplug(struct eeepc_laptop *eeepc, acpi_handle handle)
                bus = port->subordinate;
 
                if (!bus) {
-                       pr_warning("Unable to find PCI bus?\n");
+                       pr_warn("Unable to find PCI bus 1?\n");
                        goto out_unlock;
                }
 
@@ -621,12 +621,12 @@ static void eeepc_rfkill_hotplug(struct eeepc_laptop *eeepc, acpi_handle handle)
                absent = (l == 0xffffffff);
 
                if (blocked != absent) {
-                       pr_warning("BIOS says wireless lan is %s, "
-                                       "but the pci device is %s\n",
+                       pr_warn("BIOS says wireless lan is %s, "
+                               "but the pci device is %s\n",
                                blocked ? "blocked" : "unblocked",
                                absent ? "absent" : "present");
-                       pr_warning("skipped wireless hotplug as probably "
-                                       "inappropriate for this model\n");
+                       pr_warn("skipped wireless hotplug as probably "
+                               "inappropriate for this model\n");
                        goto out_unlock;
                }
 
@@ -691,7 +691,8 @@ static int eeepc_register_rfkill_notifier(struct eeepc_laptop *eeepc,
                                                     eeepc_rfkill_notify,
                                                     eeepc);
                if (ACPI_FAILURE(status))
-                       pr_warning("Failed to register notify on %s\n", node);
+                       pr_warn("Failed to register notify on %s\n", node);
+
                /*
                 * Refresh pci hotplug in case the rfkill state was
                 * changed during setup.

diff --git a/drivers/platform/x86/eeepc-wmi.c b/drivers/platform/x86/eeepc-wmi.c
index 649dcadd8ea372973cd45db1b5b8274847baff36..4aa867a9b88b8411f5231e9ac7a4298ffc9b8860 100644 (file)
--- a/drivers/platform/x86/eeepc-wmi.c
+++ b/drivers/platform/x86/eeepc-wmi.c
@@ -84,7 +84,7 @@ static const struct key_entry eeepc_wmi_keymap[] = {
 static acpi_status eeepc_wmi_parse_device(acpi_handle handle, u32 level,
                                                 void *context, void **retval)
 {
-       pr_warning("Found legacy ATKD device (%s)", EEEPC_ACPI_HID);
+       pr_warn("Found legacy ATKD device (%s)\n", EEEPC_ACPI_HID);
        *(bool *)context = true;
        return AE_CTRL_TERMINATE;
 }
@@ -105,12 +105,12 @@ static int eeepc_wmi_check_atkd(void)
 static int eeepc_wmi_probe(struct platform_device *pdev)
 {
        if (eeepc_wmi_check_atkd()) {
-               pr_warning("WMI device present, but legacy ATKD device is also "
-                          "present and enabled.");
-               pr_warning("You probably booted with acpi_osi=\"Linux\" or "
-                          "acpi_osi=\"!Windows 2009\"");
-               pr_warning("Can't load eeepc-wmi, use default acpi_osi "
-                          "(preferred) or eeepc-laptop");
+               pr_warn("WMI device present, but legacy ATKD device is also "
+                       "present and enabled\n");
+               pr_warn("You probably booted with acpi_osi=\"Linux\" or "
+                       "acpi_osi=\"!Windows 2009\"\n");
+               pr_warn("Can't load eeepc-wmi, use default acpi_osi "
+                       "(preferred) or eeepc-laptop\n");
                return -EBUSY;
        }
        return 0;