Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit eb8895241dfb6c26114928b186cc1810cbd57f1b

Authored by Joe Perches
Committed by Matthew Garrett
1 parent b4a4bc0bd1
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

dell: Convert printks to pr_<level> 

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>

Showing 3 changed files with 16 additions and 16 deletions Side-by-side Diff

drivers/platform/x86/dell-laptop.c
Diff comments   View file @ eb88952
... ... @@ -11,6 +11,8 @@
11 11 * published by the Free Software Foundation.
12 12 */
13 13  
  14 +#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
  15 +
14 16 #include <linux/module.h>
15 17 #include <linux/kernel.h>
16 18 #include <linux/init.h>
... ... @@ -434,8 +436,7 @@
434 436 int ret;
435 437  
436 438 if (dmi_check_system(dell_blacklist)) {
437   - printk(KERN_INFO "dell-laptop: Blacklisted hardware detected - "
438   - "not enabling rfkill\n");
  439 + pr_info("Blacklisted hardware detected - not enabling rfkill\n");
439 440 return 0;
440 441 }
441 442  
... ... @@ -606,7 +607,7 @@
606 607 dmi_walk(find_tokens, NULL);
607 608  
608 609 if (!da_tokens) {
609   - printk(KERN_INFO "dell-laptop: Unable to find dmi tokens\n");
  610 + pr_info("Unable to find dmi tokens\n");
610 611 return -ENODEV;
611 612 }
612 613  
613 614  
... ... @@ -636,14 +637,13 @@
636 637 ret = dell_setup_rfkill();
637 638  
638 639 if (ret) {
639   - printk(KERN_WARNING "dell-laptop: Unable to setup rfkill\n");
  640 + pr_warn("Unable to setup rfkill\n");
640 641 goto fail_rfkill;
641 642 }
642 643  
643 644 ret = i8042_install_filter(dell_laptop_i8042_filter);
644 645 if (ret) {
645   - printk(KERN_WARNING
646   - "dell-laptop: Unable to install key filter\n");
  646 + pr_warn("Unable to install key filter\n");
647 647 goto fail_filter;
648 648 }
649 649  
drivers/platform/x86/dell-wmi-aio.c
Diff comments   View file @ eb88952
... ... @@ -15,6 +15,7 @@
15 15 * along with this program; if not, write to the Free Software
16 16 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
17 17 */
  18 +
18 19 #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
19 20  
20 21 #include <linux/kernel.h>
... ... @@ -138,7 +139,7 @@
138 139  
139 140 guid = dell_wmi_aio_find();
140 141 if (!guid) {
141   - pr_warning("No known WMI GUID found\n");
  142 + pr_warn("No known WMI GUID found\n");
142 143 return -ENXIO;
143 144 }
144 145  
drivers/platform/x86/dell-wmi.c
Diff comments   View file @ eb88952
... ... @@ -23,6 +23,8 @@
23 23 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
24 24 */
25 25  
  26 +#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
  27 +
26 28 #include <linux/kernel.h>
27 29 #include <linux/module.h>
28 30 #include <linux/init.h>
... ... @@ -141,7 +143,7 @@
141 143  
142 144 status = wmi_get_event_data(value, &response);
143 145 if (status != AE_OK) {
144   - printk(KERN_INFO "dell-wmi: bad event status 0x%x\n", status);
  146 + pr_info("bad event status 0x%x\n", status);
145 147 return;
146 148 }
147 149  
... ... @@ -153,8 +155,8 @@
153 155 u16 *buffer_entry = (u16 *)obj->buffer.pointer;
154 156  
155 157 if (dell_new_hk_type && (buffer_entry[1] != 0x10)) {
156   - printk(KERN_INFO "dell-wmi: Received unknown WMI event"
157   - " (0x%x)\n", buffer_entry[1]);
  158 + pr_info("Received unknown WMI event (0x%x)\n",
  159 + buffer_entry[1]);
158 160 kfree(obj);
159 161 return;
160 162 }
... ... @@ -167,8 +169,7 @@
167 169 key = sparse_keymap_entry_from_scancode(dell_wmi_input_dev,
168 170 reported_key);
169 171 if (!key) {
170   - printk(KERN_INFO "dell-wmi: Unknown key %x pressed\n",
171   - reported_key);
  172 + pr_info("Unknown key %x pressed\n", reported_key);
172 173 } else if ((key->keycode == KEY_BRIGHTNESSUP ||
173 174 key->keycode == KEY_BRIGHTNESSDOWN) && acpi_video) {
174 175 /* Don't report brightness notifications that will also
... ... @@ -275,7 +276,7 @@
275 276 acpi_status status;
276 277  
277 278 if (!wmi_has_guid(DELL_EVENT_GUID)) {
278   - printk(KERN_WARNING "dell-wmi: No known WMI GUID found\n");
  279 + pr_warn("No known WMI GUID found\n");
279 280 return -ENODEV;
280 281 }
281 282  
... ... @@ -290,9 +291,7 @@
290 291 dell_wmi_notify, NULL);
291 292 if (ACPI_FAILURE(status)) {
292 293 dell_wmi_input_destroy();
293   - printk(KERN_ERR
294   - "dell-wmi: Unable to register notify handler - %d\n",
295   - status);
  294 + pr_err("Unable to register notify handler - %d\n", status);
296 295 return -ENODEV;
297 296 }
298 297