|
@@ -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>
|
|
@@ -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;
|
|
@@ -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;
|
|
|
}
|
|
|
|
|
@@ -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:
|
|
@@ -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)
|
|
@@ -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);
|