Skip to content

Commit

Permalink
staging: unisys: visorbus: Remove POSTCODE_LINUX_2 macro
Browse files Browse the repository at this point in the history 
Call POSTCODE_LINUX directly instead of passing through POSTCODE_LINUX_2.

Signed-off-by: Bryan Thompson <bryan.thompson@unisys.com>
Signed-off-by: David Kershner <david.kershner@unisys.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
Bryan Thompson authored and Greg Kroah-Hartman committed Dec 1, 2016
1 parent c0e87ae commit 3840b77
Show file tree
Hide file tree
Showing 3 changed files with 35 additions and 37 deletions.
4 changes: 2 additions & 2 deletions drivers/staging/unisys/visorbus/visorbus_main.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -966,7 +966,7 @@ create_bus_instance(struct visor_device *dev)
int err;
struct spar_vbus_headerinfo *hdr_info;

POSTCODE_LINUX_2(BUS_CREATE_ENTRY_PC, POSTCODE_SEVERITY_INFO);
POSTCODE_LINUX(BUS_CREATE_ENTRY_PC, 0, 0, POSTCODE_SEVERITY_INFO);

hdr_info = kzalloc(sizeof(*hdr_info), GFP_KERNEL);
if (!hdr_info)
Expand Down Expand Up @@ -1307,7 +1307,7 @@ visorbus_init(void)

err = create_bus_type();
if (err < 0) {
POSTCODE_LINUX_2(BUS_CREATE_ENTRY_PC, DIAG_SEVERITY_ERR);
POSTCODE_LINUX(BUS_CREATE_ENTRY_PC, 0, 0, DIAG_SEVERITY_ERR);
goto error;
}

Expand Down
65 changes: 33 additions & 32 deletions drivers/staging/unisys/visorbus/visorchipset.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -519,14 +519,14 @@ chipset_init(struct controlvm_message *inmsg)
int rc = CONTROLVM_RESP_SUCCESS;
int res = 0;

POSTCODE_LINUX_2(CHIPSET_INIT_ENTRY_PC, POSTCODE_SEVERITY_INFO);
POSTCODE_LINUX(CHIPSET_INIT_ENTRY_PC, 0, 0, POSTCODE_SEVERITY_INFO);
if (chipset_inited) {
rc = -CONTROLVM_RESP_ERROR_ALREADY_DONE;
res = -EIO;
goto out_respond;
}
chipset_inited = 1;
POSTCODE_LINUX_2(CHIPSET_INIT_EXIT_PC, POSTCODE_SEVERITY_INFO);
POSTCODE_LINUX(CHIPSET_INIT_EXIT_PC, 0, 0, POSTCODE_SEVERITY_INFO);

/*
* Set features to indicate we support parahotplug (if Command
Expand Down Expand Up @@ -591,8 +591,8 @@ save_crash_message(struct controlvm_message *msg, enum crash_obj_type typ)
saved_crash_message_count),
&local_crash_msg_count, sizeof(u16));
if (err) {
POSTCODE_LINUX_2(CRASH_DEV_CTRL_RD_FAILURE_PC,
POSTCODE_SEVERITY_ERR);
POSTCODE_LINUX(CRASH_DEV_CTRL_RD_FAILURE_PC, 0, 0,
POSTCODE_SEVERITY_ERR);
return err;
}

Expand All @@ -608,8 +608,8 @@ save_crash_message(struct controlvm_message *msg, enum crash_obj_type typ)
saved_crash_message_offset),
&local_crash_msg_offset, sizeof(u32));
if (err) {
POSTCODE_LINUX_2(CRASH_DEV_CTRL_RD_FAILURE_PC,
POSTCODE_SEVERITY_ERR);
POSTCODE_LINUX(CRASH_DEV_CTRL_RD_FAILURE_PC, 0, 0,
POSTCODE_SEVERITY_ERR);
return err;
}

Expand All @@ -619,8 +619,8 @@ save_crash_message(struct controlvm_message *msg, enum crash_obj_type typ)
msg,
sizeof(struct controlvm_message));
if (err) {
POSTCODE_LINUX_2(SAVE_MSG_BUS_FAILURE_PC,
POSTCODE_SEVERITY_ERR);
POSTCODE_LINUX(SAVE_MSG_BUS_FAILURE_PC, 0, 0,
POSTCODE_SEVERITY_ERR);
return err;
}
} else {
Expand All @@ -630,8 +630,8 @@ save_crash_message(struct controlvm_message *msg, enum crash_obj_type typ)
msg,
sizeof(struct controlvm_message));
if (err) {
POSTCODE_LINUX_2(SAVE_MSG_DEV_FAILURE_PC,
POSTCODE_SEVERITY_ERR);
POSTCODE_LINUX(SAVE_MSG_DEV_FAILURE_PC, 0, 0,
POSTCODE_SEVERITY_ERR);
return err;
}
}
Expand Down Expand Up @@ -1135,16 +1135,16 @@ initialize_controlvm_payload(void)
offsetof(struct spar_controlvm_channel_protocol,
request_payload_offset),
&payload_offset, sizeof(payload_offset)) < 0) {
POSTCODE_LINUX_2(CONTROLVM_INIT_FAILURE_PC,
POSTCODE_SEVERITY_ERR);
POSTCODE_LINUX(CONTROLVM_INIT_FAILURE_PC, 0, 0,
POSTCODE_SEVERITY_ERR);
return;
}
if (visorchannel_read(controlvm_channel,
offsetof(struct spar_controlvm_channel_protocol,
request_payload_bytes),
&payload_bytes, sizeof(payload_bytes)) < 0) {
POSTCODE_LINUX_2(CONTROLVM_INIT_FAILURE_PC,
POSTCODE_SEVERITY_ERR);
POSTCODE_LINUX(CONTROLVM_INIT_FAILURE_PC, 0, 0,
POSTCODE_SEVERITY_ERR);
return;
}
initialize_controlvm_payload_info(phys_addr,
Expand Down Expand Up @@ -1564,7 +1564,7 @@ setup_crash_devices_work_queue(struct work_struct *work)
u32 local_crash_msg_offset;
u16 local_crash_msg_count;

POSTCODE_LINUX_2(CRASH_DEV_ENTRY_PC, POSTCODE_SEVERITY_INFO);
POSTCODE_LINUX(CRASH_DEV_ENTRY_PC, 0, 0, POSTCODE_SEVERITY_INFO);

/* send init chipset msg */
msg.hdr.id = CONTROLVM_CHIPSET_INIT;
Expand All @@ -1578,8 +1578,8 @@ setup_crash_devices_work_queue(struct work_struct *work)
offsetof(struct spar_controlvm_channel_protocol,
saved_crash_message_count),
&local_crash_msg_count, sizeof(u16)) < 0) {
POSTCODE_LINUX_2(CRASH_DEV_CTRL_RD_FAILURE_PC,
POSTCODE_SEVERITY_ERR);
POSTCODE_LINUX(CRASH_DEV_CTRL_RD_FAILURE_PC, 0, 0,
POSTCODE_SEVERITY_ERR);
return;
}

Expand All @@ -1595,8 +1595,8 @@ setup_crash_devices_work_queue(struct work_struct *work)
offsetof(struct spar_controlvm_channel_protocol,
saved_crash_message_offset),
&local_crash_msg_offset, sizeof(u32)) < 0) {
POSTCODE_LINUX_2(CRASH_DEV_CTRL_RD_FAILURE_PC,
POSTCODE_SEVERITY_ERR);
POSTCODE_LINUX(CRASH_DEV_CTRL_RD_FAILURE_PC, 0, 0,
POSTCODE_SEVERITY_ERR);
return;
}

Expand All @@ -1605,8 +1605,8 @@ setup_crash_devices_work_queue(struct work_struct *work)
local_crash_msg_offset,
&local_crash_bus_msg,
sizeof(struct controlvm_message)) < 0) {
POSTCODE_LINUX_2(CRASH_DEV_RD_BUS_FAIULRE_PC,
POSTCODE_SEVERITY_ERR);
POSTCODE_LINUX(CRASH_DEV_RD_BUS_FAIULRE_PC, 0, 0,
POSTCODE_SEVERITY_ERR);
return;
}

Expand All @@ -1616,29 +1616,29 @@ setup_crash_devices_work_queue(struct work_struct *work)
sizeof(struct controlvm_message),
&local_crash_dev_msg,
sizeof(struct controlvm_message)) < 0) {
POSTCODE_LINUX_2(CRASH_DEV_RD_DEV_FAIULRE_PC,
POSTCODE_SEVERITY_ERR);
POSTCODE_LINUX(CRASH_DEV_RD_DEV_FAIULRE_PC, 0, 0,
POSTCODE_SEVERITY_ERR);
return;
}

/* reuse IOVM create bus message */
if (local_crash_bus_msg.cmd.create_bus.channel_addr) {
bus_create(&local_crash_bus_msg);
} else {
POSTCODE_LINUX_2(CRASH_DEV_BUS_NULL_FAILURE_PC,
POSTCODE_SEVERITY_ERR);
POSTCODE_LINUX(CRASH_DEV_BUS_NULL_FAILURE_PC, 0, 0,
POSTCODE_SEVERITY_ERR);
return;
}

/* reuse create device message for storage device */
if (local_crash_dev_msg.cmd.create_device.channel_addr) {
my_device_create(&local_crash_dev_msg);
} else {
POSTCODE_LINUX_2(CRASH_DEV_DEV_NULL_FAILURE_PC,
POSTCODE_SEVERITY_ERR);
POSTCODE_LINUX(CRASH_DEV_DEV_NULL_FAILURE_PC, 0, 0,
POSTCODE_SEVERITY_ERR);
return;
}
POSTCODE_LINUX_2(CRASH_DEV_EXIT_PC, POSTCODE_SEVERITY_INFO);
POSTCODE_LINUX(CRASH_DEV_EXIT_PC, 0, 0, POSTCODE_SEVERITY_INFO);
}

void
Expand Down Expand Up @@ -2174,11 +2174,12 @@ visorchipset_init(struct acpi_device *acpi_device)

visorchipset_platform_device.dev.devt = major_dev;
if (platform_device_register(&visorchipset_platform_device) < 0) {
POSTCODE_LINUX_2(DEVICE_REGISTER_FAILURE_PC, DIAG_SEVERITY_ERR);
POSTCODE_LINUX(DEVICE_REGISTER_FAILURE_PC, 0, 0,
DIAG_SEVERITY_ERR);
err = -ENODEV;
goto error_cancel_work;
}
POSTCODE_LINUX_2(CHIPSET_INIT_SUCCESS_PC, POSTCODE_SEVERITY_INFO);
POSTCODE_LINUX(CHIPSET_INIT_SUCCESS_PC, 0, 0, POSTCODE_SEVERITY_INFO);

err = visorbus_init();
if (err < 0)
Expand Down Expand Up @@ -2207,7 +2208,7 @@ visorchipset_init(struct acpi_device *acpi_device)
static int
visorchipset_exit(struct acpi_device *acpi_device)
{
POSTCODE_LINUX_2(DRIVER_EXIT_PC, POSTCODE_SEVERITY_INFO);
POSTCODE_LINUX(DRIVER_EXIT_PC, 0, 0, POSTCODE_SEVERITY_INFO);

visorbus_exit();

Expand All @@ -2218,7 +2219,7 @@ visorchipset_exit(struct acpi_device *acpi_device)

visorchipset_file_cleanup(visorchipset_platform_device.dev.devt);
platform_device_unregister(&visorchipset_platform_device);
POSTCODE_LINUX_2(DRIVER_EXIT_PC, POSTCODE_SEVERITY_INFO);
POSTCODE_LINUX(DRIVER_EXIT_PC, 0, 0, POSTCODE_SEVERITY_INFO);

return 0;
}
Expand Down
3 changes: 0 additions & 3 deletions drivers/staging/unisys/visorbus/vmcallinterface.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -254,9 +254,6 @@ do { \
} while (0)

/* MOST COMMON */
#define POSTCODE_LINUX_2(EVENT_PC, severity) \
POSTCODE_LINUX(EVENT_PC, 0, 0, severity)

#define POSTCODE_LINUX_3(EVENT_PC, pc32bit, severity) \
POSTCODE_LINUX(EVENT_PC, (pc32bit >> 16), (pc32bit & 0xFFFF), \
severity)
Expand Down

0 comments on commit 3840b77

Please sign in to comment.