Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 243127
b: refs/heads/master
c: bbe24fe
h: refs/heads/master
i:
  243125: 9af39e8
  243123: b1510c1
  243119: 02bfc0d
v: v3
  • Loading branch information
Joey Lee authored and Matthew Garrett committed Mar 28, 2011
1 parent 1285d76 commit b0cbc74
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 2d70b73ae5b85c9d13f5dfbb8fc4fd5edae633dc
refs/heads/master: bbe24fee22fa045a07ff7e926589ac722c7ee78d
14 changes: 7 additions & 7 deletions trunk/drivers/platform/x86/msi-laptop.c
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,8 @@
* laptop as MSI S270. YMMV.
*/

#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt

#include <linux/module.h>
#include <linux/kernel.h>
#include <linux/init.h>
Expand Down Expand Up @@ -445,8 +447,7 @@ static struct platform_device *msipf_device;

static int dmi_check_cb(const struct dmi_system_id *id)
{
printk(KERN_INFO "msi-laptop: Identified laptop model '%s'.\n",
id->ident);
pr_info("Identified laptop model '%s'.\n", id->ident);
return 1;
}

Expand Down Expand Up @@ -834,8 +835,7 @@ static int load_scm_model_init(struct platform_device *sdev)

result = i8042_install_filter(msi_laptop_i8042_filter);
if (result) {
printk(KERN_ERR
"msi-laptop: Unable to install key filter\n");
pr_err("Unable to install key filter\n");
goto fail_filter;
}

Expand Down Expand Up @@ -875,7 +875,7 @@ static int __init msi_init(void)
/* Register backlight stuff */

if (acpi_video_backlight_support()) {
printk(KERN_INFO "MSI: Brightness ignored, must be controlled "
pr_info("Brightness ignored, must be controlled "
"by ACPI video driver\n");
} else {
struct backlight_properties props;
Expand Down Expand Up @@ -930,7 +930,7 @@ static int __init msi_init(void)
if (auto_brightness != 2)
set_auto_brightness(auto_brightness);

printk(KERN_INFO "msi-laptop: driver "MSI_DRIVER_VERSION" successfully loaded.\n");
pr_info("driver "MSI_DRIVER_VERSION" successfully loaded.\n");

return 0;

Expand Down Expand Up @@ -978,7 +978,7 @@ static void __exit msi_cleanup(void)
if (auto_brightness != 2)
set_auto_brightness(1);

printk(KERN_INFO "msi-laptop: driver unloaded.\n");
pr_info("driver unloaded.\n");
}

module_init(msi_init);
Expand Down

0 comments on commit b0cbc74

Please sign in to comment.