Re: [PATCH 07/23] eeepc: Use pr_warn

[Corentin Chary <corentin.chary@xxxxxxxxx>]

On Wed, Mar 30, 2011 at 12:21 AM, Joe Perches <joe@xxxxxxxxxxx> wrote:
> Just a trivial pr_warning to pr_warn conversion
> while adding a few missing newlines.
>
> Signed-off-by: Joe Perches <joe@xxxxxxxxxxx>

Acked-by: Corentin Chary <corentincj@xxxxxxxxxx>

> ---
> Âdrivers/platform/x86/eeepc-laptop.c | Â 20 ++++++++++----------
> Âdrivers/platform/x86/eeepc-wmi.c  Â|  14 +++++++-------
> Â2 files changed, 17 insertions(+), 17 deletions(-)
>
> diff --git a/drivers/platform/x86/eeepc-laptop.c b/drivers/platform/x86/eeepc-laptop.c
> index 5f2dd38..e5feadd 100644
> --- 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;
> @@ -601,7 +601,7 @@ static void eeepc_rfkill_hotplug(struct eeepc_laptop *eeepc)
> Â Â Â Âif (eeepc->hotplug_slot) {
> Â Â Â Â Â Â Â Âbus = pci_find_bus(0, 1);
> Â Â Â Â Â Â Â Âif (!bus) {
> - Â Â Â Â Â Â Â Â Â Â Â pr_warning("Unable to find PCI bus 1?\n");
> + Â Â Â Â Â Â Â Â Â Â Â pr_warn("Unable to find PCI bus 1?\n");
> Â Â Â Â Â Â Â Â Â Â Â Âgoto out_unlock;
> Â Â Â Â Â Â Â Â}
>
> @@ -612,12 +612,12 @@ static void eeepc_rfkill_hotplug(struct eeepc_laptop *eeepc)
> Â Â Â Â Â Â Â Â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;
> Â Â Â Â Â Â Â Â}
>
> @@ -671,7 +671,7 @@ 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);
> Â Â Â Â} else
> Â Â Â Â Â Â Â Âreturn -ENODEV;
>
> diff --git a/drivers/platform/x86/eeepc-wmi.c b/drivers/platform/x86/eeepc-wmi.c
> index 0ddc434..4155884 100644
> --- a/drivers/platform/x86/eeepc-wmi.c
> +++ b/drivers/platform/x86/eeepc-wmi.c
> @@ -82,7 +82,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;
> Â}
> @@ -103,12 +103,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;
> --
> 1.7.4.2.g597a6.dirty
>
>



-- 
Corentin Chary
http://xf.iksaif.net
ÿô.nlj·Ÿ®‰­†+%ŠË±é¥Šwÿº{.nlj·©•«_¢¹ÿv¸¯z¿ñžØn‡r¡öë¨è&£ûz¹Þúzf£¢·hšˆ§~†­†Ûÿÿïÿ‘ê_èæ+v‰¨þ)ßø