From patchwork Sun Dec 27 09:50:18 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Torokhov X-Patchwork-Id: 69826 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.3/8.14.2) with ESMTP id nBR9oNn0024147 for ; Sun, 27 Dec 2009 09:50:23 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751214AbZL0JuW (ORCPT ); Sun, 27 Dec 2009 04:50:22 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751302AbZL0JuW (ORCPT ); Sun, 27 Dec 2009 04:50:22 -0500 Received: from mail-pz0-f171.google.com ([209.85.222.171]:36783 "EHLO mail-pz0-f171.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751214AbZL0JuV (ORCPT ); Sun, 27 Dec 2009 04:50:21 -0500 Received: by mail-pz0-f171.google.com with SMTP id 1so2364334pzk.33 for ; Sun, 27 Dec 2009 01:50:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:from:subject:to:cc:date :message-id:in-reply-to:references:user-agent:mime-version :content-type:content-transfer-encoding; bh=7uILKPlKaryLimDT+kaLD7BE1kl8tUWGfIZvn3PxBCM=; b=N2DxWSlXWEkUw7Jk92tcyzLRzG/ZBfxjDC6tjV2W7yqhJ+JYa/MiAt3fEWKdajdliR AUzwa6LFDuu1JagNk1qoxOskThumj16mh6h1ga35xuhy0ZsoffZC7JZGXkELu68bSsap AB5M8Xz9wqHRkqfVzPzL2ROk+qWSB8EJnh5G4= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:subject:to:cc:date:message-id:in-reply-to:references :user-agent:mime-version:content-type:content-transfer-encoding; b=h47BdXRlkh3YduYOPqJSZL2NkGy9LTl/6TomMJm5vS0pfzGgr00IgKsXB0IzPc5Px6 aBkEmrMGJu/tXBOkllZay7/BvACThjv4C+LgH3fv4EExenZhqtdvDKpXLUuYyQ+3t1da jsHJLU7F7k2y4+Mohc3z3WLcqOmoTh11TKY3s= Received: by 10.142.55.14 with SMTP id d14mr9592867wfa.45.1261907420449; Sun, 27 Dec 2009 01:50:20 -0800 (PST) Received: from mailhub.coreip.homeip.net (c-24-6-153-137.hsd1.ca.comcast.net [24.6.153.137]) by mx.google.com with ESMTPS id 20sm10623637pzk.9.2009.12.27.01.50.19 (version=TLSv1/SSLv3 cipher=RC4-MD5); Sun, 27 Dec 2009 01:50:19 -0800 (PST) From: Dmitry Torokhov Subject: [PATCH 2/2] dell-wmi - use pr_xxx() for printing messages To: Matthew Garrett Cc: Len Brown , linux-acpi@vger.kernel.org Date: Sun, 27 Dec 2009 01:50:18 -0800 Message-ID: <20091227095005.14542.67746.stgit@localhost.localdomain> In-Reply-To: <20091227094754.14542.22118.stgit@localhost.localdomain> References: <20091227094754.14542.22118.stgit@localhost.localdomain> User-Agent: StGIT/0.14.3 MIME-Version: 1.0 Sender: linux-acpi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-acpi@vger.kernel.org diff --git a/drivers/platform/x86/dell-wmi.c b/drivers/platform/x86/dell-wmi.c index e0a0716..ff67a78 100644 --- a/drivers/platform/x86/dell-wmi.c +++ b/drivers/platform/x86/dell-wmi.c @@ -23,6 +23,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt + #include #include #include @@ -147,8 +149,7 @@ static void dell_wmi_notify(u32 value, void *context) u16 *buffer_entry = (u16 *)obj->buffer.pointer; if (dell_new_hk_type && buffer_entry[1] != 0x10) { - printk(KERN_INFO - "dell-wmi: Received unknown WMI event (0x%x)\n", + pr_info("Received unknown WMI event (0x%x)\n", buffer_entry[1]); return; } @@ -161,8 +162,7 @@ static void dell_wmi_notify(u32 value, void *context) key = sparse_keymap_entry_from_scancode(dell_wmi_input_dev, reported_key); if (!key) { - printk(KERN_INFO "dell-wmi: Unknown key %x pressed\n", - reported_key); + pr_info("Unknown key %x pressed\n", reported_key); } else if ((key->keycode == KEY_BRIGHTNESSUP || key->keycode == KEY_BRIGHTNESSDOWN) && acpi_video) { /* Don't report brightness notifications that will also @@ -268,7 +268,7 @@ static int __init dell_wmi_init(void) int err; if (!wmi_has_guid(DELL_EVENT_GUID)) { - printk(KERN_WARNING "dell-wmi: No known WMI GUID found\n"); + pr_warning("No known WMI GUID found\n"); return -ENODEV; } @@ -283,9 +283,7 @@ static int __init dell_wmi_init(void) dell_wmi_notify, NULL); if (err) { dell_wmi_input_destroy(); - printk(KERN_ERR - "dell-wmi: Unable to register notify handler - %d\n", - err); + pr_err("Unable to register notify handler - %d\n", err); return err; }