leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

dell: Convert printks to pr_<level>

Browse Source 
Add pr_fmt.
Remove hard coded prefixes and use pr_<level>.

Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Matthew Garrett <mjg@redhat.com>
This commit is contained in:
Joe Perches 2011-03-29 15:21:37 -07:00 committed by Matthew Garrett
parent b4a4bc0bd1
commit eb8895241d
3 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/platform/x86/dell-laptop.c
View File

@ -11,6 +11,8 @@
* published by the Free Software Foundation. * published by the Free Software Foundation.
*/ */
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
#include <linux/module.h> #include <linux/module.h>
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/init.h> #include <linux/init.h>
@ -434,8 +436,7 @@ static int __init dell_setup_rfkill(void)
int ret; int ret;
if (dmi_check_system(dell_blacklist)) { if (dmi_check_system(dell_blacklist)) {
printk(KERN_INFO "dell-laptop: Blacklisted hardware detected - " pr_info("Blacklisted hardware detected - not enabling rfkill\n");
"not enabling rfkill\n");
return 0; return 0;
} }
@ -606,7 +607,7 @@ static int __init dell_init(void)
dmi_walk(find_tokens, NULL); dmi_walk(find_tokens, NULL);
if (!da_tokens) { if (!da_tokens) {
printk(KERN_INFO "dell-laptop: Unable to find dmi tokens\n"); pr_info("Unable to find dmi tokens\n");
return -ENODEV; return -ENODEV;
} }
@ -636,14 +637,13 @@ static int __init dell_init(void)
ret = dell_setup_rfkill(); ret = dell_setup_rfkill();
if (ret) { if (ret) {
printk(KERN_WARNING "dell-laptop: Unable to setup rfkill\n"); pr_warn("Unable to setup rfkill\n");
goto fail_rfkill; goto fail_rfkill;
} }
ret = i8042_install_filter(dell_laptop_i8042_filter); ret = i8042_install_filter(dell_laptop_i8042_filter);
if (ret) { if (ret) {
printk(KERN_WARNING pr_warn("Unable to install key filter\n");
"dell-laptop: Unable to install key filter\n");
goto fail_filter; goto fail_filter;
} }

3
drivers/platform/x86/dell-wmi-aio.c
View File

@ -15,6 +15,7 @@
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/ */
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
#include <linux/kernel.h> #include <linux/kernel.h>
@ -138,7 +139,7 @@ static int __init dell_wmi_aio_init(void)
guid = dell_wmi_aio_find(); guid = dell_wmi_aio_find();
if (!guid) { if (!guid) {
pr_warning("No known WMI GUID found\n"); pr_warn("No known WMI GUID found\n");
return -ENXIO; return -ENXIO;
} }

17
drivers/platform/x86/dell-wmi.c
View File

@ -23,6 +23,8 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/ */
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/module.h> #include <linux/module.h>
#include <linux/init.h> #include <linux/init.h>
@ -141,7 +143,7 @@ static void dell_wmi_notify(u32 value, void *context)
status = wmi_get_event_data(value, &response); status = wmi_get_event_data(value, &response);
if (status != AE_OK) { if (status != AE_OK) {
printk(KERN_INFO "dell-wmi: bad event status 0x%x\n", status); pr_info("bad event status 0x%x\n", status);
return; return;
} }
@ -153,8 +155,8 @@ static void dell_wmi_notify(u32 value, void *context)
u16 *buffer_entry = (u16 *)obj->buffer.pointer; u16 *buffer_entry = (u16 *)obj->buffer.pointer;
if (dell_new_hk_type && (buffer_entry[1] != 0x10)) { if (dell_new_hk_type && (buffer_entry[1] != 0x10)) {
printk(KERN_INFO "dell-wmi: Received unknown WMI event" pr_info("Received unknown WMI event (0x%x)\n",
" (0x%x)\n", buffer_entry[1]); buffer_entry[1]);
kfree(obj); kfree(obj);
return; return;
} }
@ -167,8 +169,7 @@ static void dell_wmi_notify(u32 value, void *context)
key = sparse_keymap_entry_from_scancode(dell_wmi_input_dev, key = sparse_keymap_entry_from_scancode(dell_wmi_input_dev,
reported_key); reported_key);
if (!key) { if (!key) {
printk(KERN_INFO "dell-wmi: Unknown key %x pressed\n", pr_info("Unknown key %x pressed\n", reported_key);
reported_key);
} else if ((key->keycode == KEY_BRIGHTNESSUP || } else if ((key->keycode == KEY_BRIGHTNESSUP ||
key->keycode == KEY_BRIGHTNESSDOWN) && acpi_video) { key->keycode == KEY_BRIGHTNESSDOWN) && acpi_video) {
/* Don't report brightness notifications that will also /* Don't report brightness notifications that will also
@ -275,7 +276,7 @@ static int __init dell_wmi_init(void)
acpi_status status; acpi_status status;
if (!wmi_has_guid(DELL_EVENT_GUID)) { if (!wmi_has_guid(DELL_EVENT_GUID)) {
printk(KERN_WARNING "dell-wmi: No known WMI GUID found\n"); pr_warn("No known WMI GUID found\n");
return -ENODEV; return -ENODEV;
} }
@ -290,9 +291,7 @@ static int __init dell_wmi_init(void)
dell_wmi_notify, NULL); dell_wmi_notify, NULL);
if (ACPI_FAILURE(status)) { if (ACPI_FAILURE(status)) {
dell_wmi_input_destroy(); dell_wmi_input_destroy();
printk(KERN_ERR pr_err("Unable to register notify handler - %d\n", status);
"dell-wmi: Unable to register notify handler - %d\n",
status);
return -ENODEV; return -ENODEV;
} }