1 files changed, 19 insertions, 21 deletions

diff --git a/drivers/misc/sony-laptop.c b/drivers/misc/sony-laptop.c
index 3e8f3aaa0923..9042184d543a 100644
--- a/drivers/misc/sony-laptop.c
+++ b/drivers/misc/sony-laptop.c
@@ -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 handle, char *name, int *result)
                 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 handle, char *name, int value,
         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 handle, char *name, int value,
                 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(acpi_handle handle, u32 level,
         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_device *device)
         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_device *device)
                 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_device *device)
                                              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_device *device)
                                                                   &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_device *device)
                 }
         }
 
-        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_device *device)
                                             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_device *device, int type)
                                             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_device *device, int type)
 
         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_device *device, int type)
         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_device *device)
         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");