Skip to content

Commit

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

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 3840b77 commit 6daa820
Show file tree
Hide file tree
Showing 3 changed files with 37 additions and 41 deletions.
24 changes: 12 additions & 12 deletions drivers/staging/unisys/visorbus/visorbus_main.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -648,8 +648,8 @@ create_visor_device(struct visor_device *dev)
*/
err = device_add(&dev->device);
if (err < 0) {
POSTCODE_LINUX_3(DEVICE_ADD_PC, chipset_bus_no,
DIAG_SEVERITY_ERR);
POSTCODE_LINUX(DEVICE_ADD_PC, 0, chipset_bus_no,
DIAG_SEVERITY_ERR);
goto err_put;
}

Expand Down Expand Up @@ -993,8 +993,8 @@ create_bus_instance(struct visor_device *dev)
}

if (device_register(&dev->device) < 0) {
POSTCODE_LINUX_3(DEVICE_CREATE_FAILURE_PC, id,
POSTCODE_SEVERITY_ERR);
POSTCODE_LINUX(DEVICE_CREATE_FAILURE_PC, 0, id,
POSTCODE_SEVERITY_ERR);
err = -ENODEV;
goto err_debugfs_created;
}
Expand Down Expand Up @@ -1092,16 +1092,16 @@ chipset_bus_create(struct visor_device *dev)
int rc;
u32 bus_no = dev->chipset_bus_no;

POSTCODE_LINUX_3(BUS_CREATE_ENTRY_PC, bus_no, POSTCODE_SEVERITY_INFO);
POSTCODE_LINUX(BUS_CREATE_ENTRY_PC, 0, bus_no, POSTCODE_SEVERITY_INFO);
rc = create_bus_instance(dev);
POSTCODE_LINUX_3(BUS_CREATE_EXIT_PC, bus_no, POSTCODE_SEVERITY_INFO);
POSTCODE_LINUX(BUS_CREATE_EXIT_PC, 0, bus_no, POSTCODE_SEVERITY_INFO);

if (rc < 0)
POSTCODE_LINUX_3(BUS_CREATE_FAILURE_PC, bus_no,
POSTCODE_SEVERITY_ERR);
POSTCODE_LINUX(BUS_CREATE_FAILURE_PC, 0, bus_no,
POSTCODE_SEVERITY_ERR);
else
POSTCODE_LINUX_3(CHIPSET_INIT_SUCCESS_PC, bus_no,
POSTCODE_SEVERITY_INFO);
POSTCODE_LINUX(CHIPSET_INIT_SUCCESS_PC, 0, bus_no,
POSTCODE_SEVERITY_INFO);

bus_create_response(dev, rc);
}
Expand Down Expand Up @@ -1297,7 +1297,7 @@ visorbus_init(void)
{
int err;

POSTCODE_LINUX_3(DRIVER_ENTRY_PC, 0, POSTCODE_SEVERITY_INFO);
POSTCODE_LINUX(DRIVER_ENTRY_PC, 0, 0, POSTCODE_SEVERITY_INFO);

visorbus_debugfs_dir = debugfs_create_dir("visorbus", NULL);
if (!visorbus_debugfs_dir)
Expand All @@ -1316,7 +1316,7 @@ visorbus_init(void)
return 0;

error:
POSTCODE_LINUX_3(CHIPSET_INIT_FAILURE_PC, err, POSTCODE_SEVERITY_ERR);
POSTCODE_LINUX(CHIPSET_INIT_FAILURE_PC, 0, err, POSTCODE_SEVERITY_ERR);
return err;
}

Expand Down
50 changes: 25 additions & 25 deletions drivers/staging/unisys/visorbus/visorchipset.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -597,9 +597,9 @@ save_crash_message(struct controlvm_message *msg, enum crash_obj_type typ)
}

if (local_crash_msg_count != CONTROLVM_CRASHMSG_MAX) {
POSTCODE_LINUX_3(CRASH_DEV_COUNT_FAILURE_PC,
local_crash_msg_count,
POSTCODE_SEVERITY_ERR);
POSTCODE_LINUX(CRASH_DEV_COUNT_FAILURE_PC, 0,
local_crash_msg_count,
POSTCODE_SEVERITY_ERR);
return -EIO;
}

Expand Down Expand Up @@ -702,16 +702,16 @@ bus_create(struct controlvm_message *inmsg)

bus_info = visorbus_get_device_by_id(bus_no, BUS_ROOT_DEVICE, NULL);
if (bus_info && (bus_info->state.created == 1)) {
POSTCODE_LINUX_3(BUS_CREATE_FAILURE_PC, bus_no,
POSTCODE_SEVERITY_ERR);
POSTCODE_LINUX(BUS_CREATE_FAILURE_PC, 0, bus_no,
POSTCODE_SEVERITY_ERR);
err = -EEXIST;
goto err_respond;
}

bus_info = kzalloc(sizeof(*bus_info), GFP_KERNEL);
if (!bus_info) {
POSTCODE_LINUX_3(BUS_CREATE_FAILURE_PC, bus_no,
POSTCODE_SEVERITY_ERR);
POSTCODE_LINUX(BUS_CREATE_FAILURE_PC, 0, bus_no,
POSTCODE_SEVERITY_ERR);
err = -ENOMEM;
goto err_respond;
}
Expand All @@ -720,7 +720,7 @@ bus_create(struct controlvm_message *inmsg)
bus_info->chipset_bus_no = bus_no;
bus_info->chipset_dev_no = BUS_ROOT_DEVICE;

POSTCODE_LINUX_3(BUS_CREATE_ENTRY_PC, bus_no, POSTCODE_SEVERITY_INFO);
POSTCODE_LINUX(BUS_CREATE_ENTRY_PC, 0, bus_no, POSTCODE_SEVERITY_INFO);

if (uuid_le_cmp(cmd->create_bus.bus_inst_uuid, spar_siovm_uuid) == 0)
save_crash_message(inmsg, CRASH_BUS);
Expand All @@ -747,8 +747,8 @@ bus_create(struct controlvm_message *inmsg)
cmd->create_bus.bus_data_type_uuid);

if (!visorchannel) {
POSTCODE_LINUX_3(BUS_CREATE_FAILURE_PC, bus_no,
POSTCODE_SEVERITY_ERR);
POSTCODE_LINUX(BUS_CREATE_FAILURE_PC, 0, bus_no,
POSTCODE_SEVERITY_ERR);
err = -ENOMEM;
goto err_free_pending_msg;
}
Expand All @@ -757,7 +757,7 @@ bus_create(struct controlvm_message *inmsg)
/* Response will be handled by chipset_bus_create */
chipset_bus_create(bus_info);

POSTCODE_LINUX_3(BUS_CREATE_EXIT_PC, bus_no, POSTCODE_SEVERITY_INFO);
POSTCODE_LINUX(BUS_CREATE_EXIT_PC, 0, bus_no, POSTCODE_SEVERITY_INFO);
return 0;

err_free_pending_msg:
Expand Down Expand Up @@ -830,23 +830,23 @@ bus_configure(struct controlvm_message *inmsg,
int err = 0;

bus_no = cmd->configure_bus.bus_no;
POSTCODE_LINUX_3(BUS_CONFIGURE_ENTRY_PC, bus_no,
POSTCODE_SEVERITY_INFO);
POSTCODE_LINUX(BUS_CONFIGURE_ENTRY_PC, 0, bus_no,
POSTCODE_SEVERITY_INFO);

bus_info = visorbus_get_device_by_id(bus_no, BUS_ROOT_DEVICE, NULL);
if (!bus_info) {
POSTCODE_LINUX_3(BUS_CONFIGURE_FAILURE_PC, bus_no,
POSTCODE_SEVERITY_ERR);
POSTCODE_LINUX(BUS_CONFIGURE_FAILURE_PC, 0, bus_no,
POSTCODE_SEVERITY_ERR);
err = -EINVAL;
goto err_respond;
} else if (bus_info->state.created == 0) {
POSTCODE_LINUX_3(BUS_CONFIGURE_FAILURE_PC, bus_no,
POSTCODE_SEVERITY_ERR);
POSTCODE_LINUX(BUS_CONFIGURE_FAILURE_PC, 0, bus_no,
POSTCODE_SEVERITY_ERR);
err = -EINVAL;
goto err_respond;
} else if (bus_info->pending_msg_hdr) {
POSTCODE_LINUX_3(BUS_CONFIGURE_FAILURE_PC, bus_no,
POSTCODE_SEVERITY_ERR);
POSTCODE_LINUX(BUS_CONFIGURE_FAILURE_PC, 0, bus_no,
POSTCODE_SEVERITY_ERR);
err = -EIO;
goto err_respond;
}
Expand All @@ -861,8 +861,8 @@ bus_configure(struct controlvm_message *inmsg,
parser_param_start(parser_ctx, PARSERSTRING_NAME);
bus_info->name = parser_string_get(parser_ctx);

POSTCODE_LINUX_3(BUS_CONFIGURE_EXIT_PC, bus_no,
POSTCODE_SEVERITY_INFO);
POSTCODE_LINUX(BUS_CONFIGURE_EXIT_PC, 0, bus_no,
POSTCODE_SEVERITY_INFO);

if (inmsg->hdr.flags.response_expected == 1)
bus_responder(inmsg->hdr.id, &inmsg->hdr, err);
Expand Down Expand Up @@ -1584,9 +1584,9 @@ setup_crash_devices_work_queue(struct work_struct *work)
}

if (local_crash_msg_count != CONTROLVM_CRASHMSG_MAX) {
POSTCODE_LINUX_3(CRASH_DEV_COUNT_FAILURE_PC,
local_crash_msg_count,
POSTCODE_SEVERITY_ERR);
POSTCODE_LINUX(CRASH_DEV_COUNT_FAILURE_PC, 0,
local_crash_msg_count,
POSTCODE_SEVERITY_ERR);
return;
}

Expand Down Expand Up @@ -2201,7 +2201,7 @@ visorchipset_init(struct acpi_device *acpi_device)
visorchannel_destroy(controlvm_channel);

error:
POSTCODE_LINUX_3(CHIPSET_INIT_FAILURE_PC, err, POSTCODE_SEVERITY_ERR);
POSTCODE_LINUX(CHIPSET_INIT_FAILURE_PC, 0, err, POSTCODE_SEVERITY_ERR);
return err;
}

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

/* MOST COMMON */
#define POSTCODE_LINUX_3(EVENT_PC, pc32bit, severity) \
POSTCODE_LINUX(EVENT_PC, (pc32bit >> 16), (pc32bit & 0xFFFF), \
severity)

#define POSTCODE_LINUX_4(EVENT_PC, pc16bit1, pc16bit2, severity) \
POSTCODE_LINUX(EVENT_PC, pc16bit1, pc16bit2, severity)

Expand Down

0 comments on commit 6daa820

Please sign in to comment.