Skip to content

Commit

Permalink
compal-laptop: Convert printks to pr_<level>
Browse files Browse the repository at this point in the history
Add pr_fmt.
Convert printks to pr_<level> removing DRIVER_NAME prefix.

Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Matthew Garrett <mjg@redhat.com>
  • Loading branch information
Joe Perches authored and Matthew Garrett committed May 27, 2011
1 parent 5ad77dc commit b4a4bc0
Showing 1 changed file with 9 additions and 13 deletions.
22 changes: 9 additions & 13 deletions drivers/platform/x86/compal-laptop.c
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,8 @@
* only enabled on a JHL90 board until it is verified that they work on the
* other boards too. See the extra_features variable. */

#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt

#include <linux/module.h>
#include <linux/kernel.h>
#include <linux/init.h>
Expand Down Expand Up @@ -760,16 +762,14 @@ static struct rfkill *bt_rfkill;

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

static int dmi_check_cb_extra(const struct dmi_system_id *id)
{
printk(KERN_INFO DRIVER_NAME": Identified laptop model '%s', "
"enabling extra features\n",
pr_info("Identified laptop model '%s', enabling extra features\n",
id->ident);
extra_features = true;
return 1;
Expand Down Expand Up @@ -956,14 +956,12 @@ static int __init compal_init(void)
int ret;

if (acpi_disabled) {
printk(KERN_ERR DRIVER_NAME": ACPI needs to be enabled for "
"this driver to work!\n");
pr_err("ACPI needs to be enabled for this driver to work!\n");
return -ENODEV;
}

if (!force && !dmi_check_system(compal_dmi_table)) {
printk(KERN_ERR DRIVER_NAME": Motherboard not recognized (You "
"could try the module's force-parameter)");
pr_err("Motherboard not recognized (You could try the module's force-parameter)\n");
return -ENODEV;
}

Expand Down Expand Up @@ -998,8 +996,7 @@ static int __init compal_init(void)
if (ret)
goto err_rfkill;

printk(KERN_INFO DRIVER_NAME": Driver "DRIVER_VERSION
" successfully loaded\n");
pr_info("Driver " DRIVER_VERSION " successfully loaded\n");
return 0;

err_rfkill:
Expand Down Expand Up @@ -1064,7 +1061,7 @@ static void __exit compal_cleanup(void)
rfkill_destroy(wifi_rfkill);
rfkill_destroy(bt_rfkill);

printk(KERN_INFO DRIVER_NAME": Driver unloaded\n");
pr_info("Driver unloaded\n");
}

static int __devexit compal_remove(struct platform_device *pdev)
Expand All @@ -1074,8 +1071,7 @@ static int __devexit compal_remove(struct platform_device *pdev)
if (!extra_features)
return 0;

printk(KERN_INFO DRIVER_NAME": Unloading: resetting fan control "
"to motherboard\n");
pr_info("Unloading: resetting fan control to motherboard\n");
pwm_disable_control();

data = platform_get_drvdata(pdev);
Expand Down

0 comments on commit b4a4bc0

Please sign in to comment.