From: malattia@linux.it
To: lenb@kernel.org
Cc: linux-acpi@vger.kernel.org, akpm@linux-foundation.org,
stelian@popies.net
Subject: [patch 7/9] sanitize printks
Date: Mon, 9 Apr 2007 19:31:06 +0200 [thread overview]
Message-ID: <20070409173106.GH10646@inferi.kami.home> (raw)
In-Reply-To: 20070409081903.057292676@linux.it
[-- Attachment #1: 0007-sanitize-printk-logs.patch --]
[-- Type: text/plain, Size: 5582 bytes --]
Unify printks to resemble a unique driver.
Signed-off-by: Mattia Dongili <malattia@linux.it>
---
drivers/misc/sony-laptop.c | 40 +++++++++++++++++++---------------------
1 file changed, 19 insertions(+), 21 deletions(-)
Index: linux-2.6/drivers/misc/sony-laptop.c
===================================================================
--- linux-2.6.orig/drivers/misc/sony-laptop.c 2007-04-05 15:33:32.785751095 +0200
+++ linux-2.6/drivers/misc/sony-laptop.c 2007-04-05 15:33:37.786035924 +0200
@@ -64,20 +64,19 @@
#include <linux/sonypi.h>
#define DRV_PFX "sony-laptop: "
-#define LOG_PFX KERN_WARNING DRV_PFX
#define dprintk(msg...) do { \
- if (debug) printk(LOG_PFX msg); \
+ if (debug) printk(KERN_WARNING DRV_PFX msg); \
} while (0)
#define SONY_LAPTOP_DRIVER_VERSION "0.5"
#define SONY_NC_CLASS "sony-nc"
#define SONY_NC_HID "SNY5001"
-#define SONY_NC_DRIVER_NAME "Sony Notebook Control"
+#define SONY_NC_DRIVER_NAME "Sony Notebook Control Driver"
#define SONY_PIC_CLASS "sony-pic"
#define SONY_PIC_HID "SNY6001"
-#define SONY_PIC_DRIVER_NAME "Sony Programmable IO Control"
+#define SONY_PIC_DRIVER_NAME "Sony Programmable IO Control Driver"
MODULE_AUTHOR("Stelian Pop, Mattia Dongili");
MODULE_DESCRIPTION("Sony laptop extras driver (SPIC and SNC ACPI device)");
@@ -518,7 +517,7 @@ static int acpi_callgetfunc(acpi_handle
return 0;
}
- printk(LOG_PFX "acpi_callreadfunc failed\n");
+ printk(KERN_WARNING DRV_PFX "acpi_callreadfunc failed\n");
return -1;
}
@@ -544,7 +543,7 @@ static int acpi_callsetfunc(acpi_handle
if (status == AE_OK) {
if (result != NULL) {
if (out_obj.type != ACPI_TYPE_INTEGER) {
- printk(LOG_PFX "acpi_evaluate_object bad "
+ printk(KERN_WARNING DRV_PFX "acpi_evaluate_object bad "
"return type\n");
return -1;
}
@@ -553,7 +552,7 @@ static int acpi_callsetfunc(acpi_handle
return 0;
}
- printk(LOG_PFX "acpi_evaluate_object failed\n");
+ printk(KERN_WARNING DRV_PFX "acpi_evaluate_object failed\n");
return -1;
}
@@ -689,7 +688,7 @@ static acpi_status sony_walk_callback(ac
node = (struct acpi_namespace_node *)handle;
operand = (union acpi_operand_object *)node->object;
- printk(LOG_PFX "method: name: %4.4s, args %X\n", node->name.ascii,
+ printk(KERN_WARNING DRV_PFX "method: name: %4.4s, args %X\n", node->name.ascii,
(u32) operand->method.param_count);
return AE_OK;
@@ -724,6 +723,9 @@ static int sony_nc_add(struct acpi_devic
acpi_handle handle;
struct sony_nc_value *item;
+ printk(KERN_INFO DRV_PFX "%s v%s.\n",
+ SONY_NC_DRIVER_NAME, SONY_LAPTOP_DRIVER_VERSION);
+
sony_nc_acpi_device = device;
strcpy(acpi_device_class(device), "sony/hotkey");
@@ -733,7 +735,7 @@ static int sony_nc_add(struct acpi_devic
status = acpi_walk_namespace(ACPI_TYPE_METHOD, sony_nc_acpi_handle,
1, sony_walk_callback, NULL, NULL);
if (ACPI_FAILURE(status)) {
- printk(LOG_PFX "unable to walk acpi resources\n");
+ printk(KERN_WARNING DRV_PFX "unable to walk acpi resources\n");
result = -ENODEV;
goto outwalk;
}
@@ -751,7 +753,7 @@ static int sony_nc_add(struct acpi_devic
ACPI_DEVICE_NOTIFY,
sony_acpi_notify, NULL);
if (ACPI_FAILURE(status)) {
- printk(LOG_PFX "unable to install notify handler\n");
+ printk(KERN_WARNING DRV_PFX "unable to install notify handler\n");
result = -ENODEV;
goto outinput;
}
@@ -762,7 +764,7 @@ static int sony_nc_add(struct acpi_devic
&sony_backlight_ops);
if (IS_ERR(sony_backlight_device)) {
- printk(LOG_PFX "unable to register backlight device\n");
+ printk(KERN_WARNING DRV_PFX "unable to register backlight device\n");
sony_backlight_device = NULL;
} else {
sony_backlight_device->props.brightness =
@@ -817,8 +819,6 @@ static int sony_nc_add(struct acpi_devic
}
}
- printk(KERN_INFO SONY_NC_DRIVER_NAME " successfully installed\n");
-
return 0;
out_sysfs:
@@ -835,7 +835,7 @@ static int sony_nc_add(struct acpi_devic
ACPI_DEVICE_NOTIFY,
sony_acpi_notify);
if (ACPI_FAILURE(status))
- printk(LOG_PFX "unable to remove notify handler\n");
+ printk(KERN_WARNING DRV_PFX "unable to remove notify handler\n");
outinput:
sony_laptop_remove_input();
@@ -858,7 +858,7 @@ static int sony_nc_remove(struct acpi_de
ACPI_DEVICE_NOTIFY,
sony_acpi_notify);
if (ACPI_FAILURE(status))
- printk(LOG_PFX "unable to remove notify handler\n");
+ printk(KERN_WARNING DRV_PFX "unable to remove notify handler\n");
for (item = sony_nc_values; item->name; ++item) {
device_remove_file(&sony_pf_device->dev, &item->devattr);
@@ -866,8 +866,7 @@ static int sony_nc_remove(struct acpi_de
sony_pf_remove();
sony_laptop_remove_input();
-
- printk(KERN_INFO SONY_NC_DRIVER_NAME " successfully removed\n");
+ dprintk(SONY_NC_DRIVER_NAME " removed.\n");
return 0;
}
@@ -1645,7 +1644,7 @@ static int sony_pic_remove(struct acpi_d
spic_dev.cur_ioport = NULL;
spic_dev.cur_irq = NULL;
- dprintk("removed.\n");
+ dprintk(SONY_PIC_DRIVER_NAME " removed.\n");
return 0;
}
@@ -1655,9 +1654,8 @@ static int sony_pic_add(struct acpi_devi
struct sony_pic_ioport *io, *tmp_io;
struct sony_pic_irq *irq, *tmp_irq;
- printk(KERN_INFO DRV_PFX
- "Sony Programmable I/O Controller Driver v%s.\n",
- SONY_LAPTOP_DRIVER_VERSION);
+ printk(KERN_INFO DRV_PFX "%s v%s.\n",
+ SONY_PIC_DRIVER_NAME, SONY_LAPTOP_DRIVER_VERSION);
spic_dev.acpi_dev = device;
strcpy(acpi_device_class(device), "sony/hotkey");
--
--
mattia
:wq!
next prev parent reply other threads:[~2007-04-09 17:32 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20070409081903.057292676@linux.it>
2007-04-09 17:18 ` [patch 1/9] Remove ACPI references from variable and function names malattia
2007-04-09 17:20 ` [patch 2/9] Prepare the platform driver for multiple users malattia
2007-04-09 17:22 ` [patch 3/9] Add debug macros also used by the sonypi reimplementation malattia
2007-04-09 17:26 ` [patch 4/9] Add SNY6001 device handling (sonypi reimplementation) malattia
2007-04-09 17:28 ` [patch 5/9] Unify the input subsystem event forwarding malattia
2007-04-09 17:28 ` [patch 6/9] additional platform attributes coming from SNY6001 malattia
2007-04-09 17:31 ` malattia [this message]
2007-04-09 17:31 ` [patch 8/9] update documentation and Kconfig help malattia
2007-04-09 17:31 ` [patch 9/9] sonypi backward compatibility code malattia
2007-04-10 20:13 ` [patch 0/9] [RFC] sonypi ACPI reimplementation (resend 3) Len Brown
2007-04-10 22:04 ` Mattia Dongili
2007-04-12 9:20 ` Stelian Pop
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20070409173106.GH10646@inferi.kami.home \
--to=malattia@linux.it \
--cc=akpm@linux-foundation.org \
--cc=lenb@kernel.org \
--cc=linux-acpi@vger.kernel.org \
--cc=stelian@popies.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox