Skip to content

Commit

Permalink
sony-laptop: Add and use #define pr_fmt
Browse files Browse the repository at this point in the history 
Add pr_fmt.
Remove now unused #define DRV_PRX.
Neaten dprintk macro.

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 dd3c7f2 commit 50f581a
Showing 1 changed file with 49 additions and 55 deletions.
104 changes: 49 additions & 55 deletions drivers/platform/x86/sony-laptop.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,8 @@
*
*/

#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt

#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/moduleparam.h>
Expand Down Expand Up @@ -70,10 +72,10 @@
#include <linux/miscdevice.h>
#endif

#define DRV_PFX "sony-laptop: "
#define dprintk(msg...) do { \
if (debug) \
pr_warn(DRV_PFX msg); \
#define dprintk(fmt, ...) \
do { \
if (debug) \
pr_warn(fmt, ##__VA_ARGS__); \
} while (0)

#define SONY_LAPTOP_DRIVER_VERSION "0.6"
Expand Down Expand Up @@ -418,7 +420,7 @@ static int sony_laptop_setup_input(struct acpi_device *acpi_device)
error = kfifo_alloc(&sony_laptop_input.fifo,
SONY_LAPTOP_BUF_SIZE, GFP_KERNEL);
if (error) {
pr_err(DRV_PFX "kfifo_alloc failed\n");
pr_err("kfifo_alloc failed\n");
goto err_dec_users;
}

Expand Down Expand Up @@ -702,7 +704,7 @@ static int acpi_callgetfunc(acpi_handle handle, char *name, int *result)
return 0;
}

pr_warn(DRV_PFX "acpi_callreadfunc failed\n");
pr_warn("acpi_callreadfunc failed\n");

return -1;
}
Expand All @@ -728,16 +730,15 @@ 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) {
pr_warn(DRV_PFX "acpi_evaluate_object bad "
"return type\n");
pr_warn("acpi_evaluate_object bad return type\n");
return -1;
}
*result = out_obj.integer.value;
}
return 0;
}

pr_warn(DRV_PFX "acpi_evaluate_object failed\n");
pr_warn("acpi_evaluate_object failed\n");

return -1;
}
Expand Down Expand Up @@ -1104,10 +1105,8 @@ static void sony_nc_notify(struct acpi_device *device, u32 event)
}

if (!key_event->data)
pr_info(DRV_PFX
"Unknown event: 0x%x 0x%x\n",
key_handle,
ev);
pr_info("Unknown event: 0x%x 0x%x\n",
key_handle, ev);
else
sony_laptop_report_input_event(ev);
}
Expand All @@ -1128,7 +1127,7 @@ static acpi_status sony_walk_callback(acpi_handle handle, u32 level,
struct acpi_device_info *info;

if (ACPI_SUCCESS(acpi_get_object_info(handle, &info))) {
pr_warn(DRV_PFX "method: name: %4.4s, args %X\n",
pr_warn("method: name: %4.4s, args %X\n",
(char *)&info->name, info->param_count);

kfree(info);
Expand Down Expand Up @@ -1169,7 +1168,7 @@ static int sony_nc_resume(struct acpi_device *device)
ret = acpi_callsetfunc(sony_nc_acpi_handle, *item->acpiset,
item->value, NULL);
if (ret < 0) {
pr_err(DRV_PFX "%s: %d\n", __func__, ret);
pr_err("%s: %d\n", __func__, ret);
break;
}
}
Expand Down Expand Up @@ -1336,12 +1335,12 @@ static void sony_nc_rfkill_setup(struct acpi_device *device)

device_enum = (union acpi_object *) buffer.pointer;
if (!device_enum) {
pr_err(DRV_PFX "No SN06 return object.");
pr_err("No SN06 return object\n");
goto out_no_enum;
}
if (device_enum->type != ACPI_TYPE_BUFFER) {
pr_err(DRV_PFX "Invalid SN06 return object 0x%.2x\n",
device_enum->type);
pr_err("Invalid SN06 return object 0x%.2x\n",
device_enum->type);
goto out_no_enum;
}

Expand Down Expand Up @@ -1662,7 +1661,7 @@ static void sony_nc_backlight_setup(void)
ops, &props);

if (IS_ERR(sony_bl_props.dev)) {
pr_warn(DRV_PFX "unable to register backlight device\n");
pr_warn("unable to register backlight device\n");
sony_bl_props.dev = NULL;
} else
sony_bl_props.dev->props.brightness =
Expand All @@ -1682,8 +1681,7 @@ static int sony_nc_add(struct acpi_device *device)
acpi_handle handle;
struct sony_nc_value *item;

pr_info(DRV_PFX "%s v%s.\n", SONY_NC_DRIVER_NAME,
SONY_LAPTOP_DRIVER_VERSION);
pr_info("%s v%s\n", SONY_NC_DRIVER_NAME, SONY_LAPTOP_DRIVER_VERSION);

sony_nc_acpi_device = device;
strcpy(acpi_device_class(device), "sony/hotkey");
Expand All @@ -1708,7 +1706,7 @@ static int sony_nc_add(struct acpi_device *device)
sony_nc_acpi_handle, 1, sony_walk_callback,
NULL, NULL, NULL);
if (ACPI_FAILURE(status)) {
pr_warn(DRV_PFX "unable to walk acpi resources\n");
pr_warn("unable to walk acpi resources\n");
result = -ENODEV;
goto outpresent;
}
Expand Down Expand Up @@ -1736,13 +1734,12 @@ static int sony_nc_add(struct acpi_device *device)
/* setup input devices and helper fifo */
result = sony_laptop_setup_input(device);
if (result) {
pr_err(DRV_PFX "Unable to create input devices.\n");
pr_err("Unable to create input devices\n");
goto outkbdbacklight;
}

if (acpi_video_backlight_support()) {
pr_info(DRV_PFX "brightness ignored, must be "
"controlled by ACPI video driver\n");
pr_info("brightness ignored, must be controlled by ACPI video driver\n");
} else {
sony_nc_backlight_setup();
}
Expand Down Expand Up @@ -2265,9 +2262,9 @@ static void sony_pic_detect_device_type(struct sony_pic_dev *dev)
if (pcidev)
pci_dev_put(pcidev);

pr_info(DRV_PFX "detected Type%d model\n",
dev->model == SONYPI_DEVICE_TYPE1 ? 1 :
dev->model == SONYPI_DEVICE_TYPE2 ? 2 : 3);
pr_info("detected Type%d model\n",
dev->model == SONYPI_DEVICE_TYPE1 ? 1 :
dev->model == SONYPI_DEVICE_TYPE2 ? 2 : 3);
}

/* camera tests and poweron/poweroff */
Expand Down Expand Up @@ -2313,7 +2310,7 @@ static int __sony_pic_camera_ready(void)
static int __sony_pic_camera_off(void)
{
if (!camera) {
pr_warn(DRV_PFX "camera control not enabled\n");
pr_warn("camera control not enabled\n");
return -ENODEV;
}

Expand All @@ -2333,7 +2330,7 @@ static int __sony_pic_camera_on(void)
int i, j, x;

if (!camera) {
pr_warn(DRV_PFX "camera control not enabled\n");
pr_warn("camera control not enabled\n");
return -ENODEV;
}

Expand All @@ -2356,7 +2353,7 @@ static int __sony_pic_camera_on(void)
}

if (j == 0) {
pr_warn(DRV_PFX "failed to power on camera\n");
pr_warn("failed to power on camera\n");
return -ENODEV;
}

Expand Down Expand Up @@ -2412,8 +2409,7 @@ int sony_pic_camera_command(int command, u8 value)
ITERATIONS_SHORT);
break;
default:
pr_err(DRV_PFX "sony_pic_camera_command invalid: %d\n",
command);
pr_err("sony_pic_camera_command invalid: %d\n", command);
break;
}
mutex_unlock(&spic_dev.lock);
Expand Down Expand Up @@ -2819,7 +2815,7 @@ static int sonypi_compat_init(void)
error =
kfifo_alloc(&sonypi_compat.fifo, SONY_LAPTOP_BUF_SIZE, GFP_KERNEL);
if (error) {
pr_err(DRV_PFX "kfifo_alloc failed\n");
pr_err("kfifo_alloc failed\n");
return error;
}

Expand All @@ -2829,12 +2825,12 @@ static int sonypi_compat_init(void)
sonypi_misc_device.minor = minor;
error = misc_register(&sonypi_misc_device);
if (error) {
pr_err(DRV_PFX "misc_register failed\n");
pr_err("misc_register failed\n");
goto err_free_kfifo;
}
if (minor == -1)
pr_info(DRV_PFX "device allocated minor is %d\n",
sonypi_misc_device.minor);
pr_info("device allocated minor is %d\n",
sonypi_misc_device.minor);

return 0;

Expand Down Expand Up @@ -2893,8 +2889,8 @@ sony_pic_read_possible_resource(struct acpi_resource *resource, void *context)
}
for (i = 0; i < p->interrupt_count; i++) {
if (!p->interrupts[i]) {
pr_warn(DRV_PFX "Invalid IRQ %d\n",
p->interrupts[i]);
pr_warn("Invalid IRQ %d\n",
p->interrupts[i]);
continue;
}
interrupt = kzalloc(sizeof(*interrupt),
Expand Down Expand Up @@ -2932,14 +2928,14 @@ sony_pic_read_possible_resource(struct acpi_resource *resource, void *context)
ioport->io2.address_length);
}
else {
pr_err(DRV_PFX "Unknown SPIC Type, more than 2 IO Ports\n");
pr_err("Unknown SPIC Type, more than 2 IO Ports\n");
return AE_ERROR;
}
return AE_OK;
}
default:
dprintk("Resource %d isn't an IRQ nor an IO port\n",
resource->type);
resource->type);

case ACPI_RESOURCE_TYPE_END_TAG:
return AE_OK;
Expand All @@ -2960,7 +2956,7 @@ static int sony_pic_possible_resources(struct acpi_device *device)
dprintk("Evaluating _STA\n");
result = acpi_bus_get_status(device);
if (result) {
pr_warn(DRV_PFX "Unable to read status\n");
pr_warn("Unable to read status\n");
goto end;
}

Expand All @@ -2976,8 +2972,7 @@ static int sony_pic_possible_resources(struct acpi_device *device)
status = acpi_walk_resources(device->handle, METHOD_NAME__PRS,
sony_pic_read_possible_resource, &spic_dev);
if (ACPI_FAILURE(status)) {
pr_warn(DRV_PFX "Failure evaluating %s\n",
METHOD_NAME__PRS);
pr_warn("Failure evaluating %s\n", METHOD_NAME__PRS);
result = -ENODEV;
}
end:
Expand Down Expand Up @@ -3090,7 +3085,7 @@ static int sony_pic_enable(struct acpi_device *device,

/* check for total failure */
if (ACPI_FAILURE(status)) {
pr_err(DRV_PFX "Error evaluating _SRS\n");
pr_err("Error evaluating _SRS\n");
result = -ENODEV;
goto end;
}
Expand Down Expand Up @@ -3182,7 +3177,7 @@ static int sony_pic_remove(struct acpi_device *device, int type)
struct sony_pic_irq *irq, *tmp_irq;

if (sony_pic_disable(device)) {
pr_err(DRV_PFX "Couldn't disable device.\n");
pr_err("Couldn't disable device\n");
return -ENXIO;
}

Expand Down Expand Up @@ -3222,8 +3217,7 @@ static int sony_pic_add(struct acpi_device *device)
struct sony_pic_ioport *io, *tmp_io;
struct sony_pic_irq *irq, *tmp_irq;

pr_info(DRV_PFX "%s v%s.\n", SONY_PIC_DRIVER_NAME,
SONY_LAPTOP_DRIVER_VERSION);
pr_info("%s v%s\n", SONY_PIC_DRIVER_NAME, SONY_LAPTOP_DRIVER_VERSION);

spic_dev.acpi_dev = device;
strcpy(acpi_device_class(device), "sony/hotkey");
Expand All @@ -3233,14 +3227,14 @@ static int sony_pic_add(struct acpi_device *device)
/* read _PRS resources */
result = sony_pic_possible_resources(device);
if (result) {
pr_err(DRV_PFX "Unable to read possible resources.\n");
pr_err("Unable to read possible resources\n");
goto err_free_resources;
}

/* setup input devices and helper fifo */
result = sony_laptop_setup_input(device);
if (result) {
pr_err(DRV_PFX "Unable to create input devices.\n");
pr_err("Unable to create input devices\n");
goto err_free_resources;
}

Expand Down Expand Up @@ -3281,7 +3275,7 @@ static int sony_pic_add(struct acpi_device *device)
}
}
if (!spic_dev.cur_ioport) {
pr_err(DRV_PFX "Failed to request_region.\n");
pr_err("Failed to request_region\n");
result = -ENODEV;
goto err_remove_compat;
}
Expand All @@ -3301,15 +3295,15 @@ static int sony_pic_add(struct acpi_device *device)
}
}
if (!spic_dev.cur_irq) {
pr_err(DRV_PFX "Failed to request_irq.\n");
pr_err("Failed to request_irq\n");
result = -ENODEV;
goto err_release_region;
}

/* set resource status _SRS */
result = sony_pic_enable(device, spic_dev.cur_ioport, spic_dev.cur_irq);
if (result) {
pr_err(DRV_PFX "Couldn't enable device.\n");
pr_err("Couldn't enable device\n");
goto err_free_irq;
}

Expand Down Expand Up @@ -3418,15 +3412,15 @@ static int __init sony_laptop_init(void)
if (!no_spic && dmi_check_system(sonypi_dmi_table)) {
result = acpi_bus_register_driver(&sony_pic_driver);
if (result) {
pr_err(DRV_PFX "Unable to register SPIC driver.");
pr_err("Unable to register SPIC driver\n");
goto out;
}
spic_drv_registered = 1;
}

result = acpi_bus_register_driver(&sony_nc_driver);
if (result) {
pr_err(DRV_PFX "Unable to register SNC driver.");
pr_err("Unable to register SNC driver\n");
goto out_unregister_pic;
}

Expand Down

0 comments on commit 50f581a

Please sign in to comment.