Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit eb889524 authored by Joe Perches's avatar Joe Perches Committed by Matthew Garrett
Browse files

dell: Convert printks to pr_<level> 



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

Signed-off-by: default avatarJoe Perches <joe@perches.com>
Signed-off-by: default avatarMatthew Garrett <mjg@redhat.com>
parent b4a4bc0b

drivers/platform/x86/dell-laptop.c

+6 −6
Original line number Diff line number Diff line
@@ -11,6 +11,8 @@ 
 *  published by the Free Software Foundation.

 */



#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt



#include <linux/module.h>

#include <linux/kernel.h>

#include <linux/init.h>
@@ -434,8 +436,7 @@ static int __init dell_setup_rfkill(void) 
	int ret;



	if (dmi_check_system(dell_blacklist)) {

		printk(KERN_INFO "dell-laptop: Blacklisted hardware detected - "

				"not enabling rfkill\n");

		pr_info("Blacklisted hardware detected - not enabling rfkill\n");

		return 0;

	}
@@ -606,7 +607,7 @@ static int __init dell_init(void) 
	dmi_walk(find_tokens, NULL);



	if (!da_tokens)  {

		printk(KERN_INFO "dell-laptop: Unable to find dmi tokens\n");

		pr_info("Unable to find dmi tokens\n");

		return -ENODEV;

	}
@@ -636,14 +637,13 @@ static int __init dell_init(void) 
	ret = dell_setup_rfkill();



	if (ret) {

		printk(KERN_WARNING "dell-laptop: Unable to setup rfkill\n");

		pr_warn("Unable to setup rfkill\n");

		goto fail_rfkill;

	}



	ret = i8042_install_filter(dell_laptop_i8042_filter);

	if (ret) {

		printk(KERN_WARNING

		       "dell-laptop: Unable to install key filter\n");

		pr_warn("Unable to install key filter\n");

		goto fail_filter;

	}

drivers/platform/x86/dell-wmi-aio.c

+2 −1
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 
 *  along with this program; if not, write to the Free Software

 *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

 */



#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt



#include <linux/kernel.h>
@@ -138,7 +139,7 @@ static int __init dell_wmi_aio_init(void) 


	guid = dell_wmi_aio_find();

	if (!guid) {

		pr_warning("No known WMI GUID found\n");

		pr_warn("No known WMI GUID found\n");

		return -ENXIO;

	}

drivers/platform/x86/dell-wmi.c

+8 −9
Original line number Diff line number Diff line
@@ -23,6 +23,8 @@ 
 *  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/module.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);

	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;

	}
@@ -153,8 +155,8 @@ static void dell_wmi_notify(u32 value, void *context) 
		u16 *buffer_entry = (u16 *)obj->buffer.pointer;



		if (dell_new_hk_type && (buffer_entry[1] != 0x10)) {

			printk(KERN_INFO "dell-wmi: Received unknown WMI event"

					 " (0x%x)\n", buffer_entry[1]);

			pr_info("Received unknown WMI event (0x%x)\n",

				buffer_entry[1]);

			kfree(obj);

			return;

		}
@@ -167,8 +169,7 @@ static void dell_wmi_notify(u32 value, void *context) 
		key = sparse_keymap_entry_from_scancode(dell_wmi_input_dev,

							reported_key);

		if (!key) {

			printk(KERN_INFO "dell-wmi: Unknown key %x pressed\n",

				reported_key);

			pr_info("Unknown key %x pressed\n", reported_key);

		} else if ((key->keycode == KEY_BRIGHTNESSUP ||

			    key->keycode == KEY_BRIGHTNESSDOWN) && acpi_video) {

			/* Don't report brightness notifications that will also
@@ -275,7 +276,7 @@ static int __init dell_wmi_init(void) 
	acpi_status status;



	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;

	}
@@ -290,9 +291,7 @@ static int __init dell_wmi_init(void) 
					 dell_wmi_notify, NULL);

	if (ACPI_FAILURE(status)) {

		dell_wmi_input_destroy();

		printk(KERN_ERR

			"dell-wmi: Unable to register notify handler - %d\n",

			status);

		pr_err("Unable to register notify handler - %d\n", status);

		return -ENODEV;

	}