From 3d118a421b7e81152de3770ebacbd0aee47ef79e Mon Sep 17 00:00:00 2001 From: Bryan Thompson Date: Thu, 1 Dec 2016 01:31:10 -0500 Subject: [PATCH] staging: unisys: visorbus: Update visorchipset postcode values The visorchipset.c functionality was moved into the visorbus driver previously. This patch updates the s-Par firmware postcode values to reflect this status. Signed-off-by: Bryan Thompson Signed-off-by: David Kershner Signed-off-by: Greg Kroah-Hartman --- drivers/staging/unisys/visorbus/visorchipset.c | 2 +- drivers/staging/unisys/visorbus/vmcallinterface.h | 11 +---------- 2 files changed, 2 insertions(+), 11 deletions(-) diff --git a/drivers/staging/unisys/visorbus/visorchipset.c b/drivers/staging/unisys/visorbus/visorchipset.c index 09825d519007..143db2eabf1a 100644 --- a/drivers/staging/unisys/visorbus/visorchipset.c +++ b/drivers/staging/unisys/visorbus/visorchipset.c @@ -29,7 +29,7 @@ #include "visorbus_private.h" #include "vmcallinterface.h" -#define CURRENT_FILE_PC VISOR_CHIPSET_PC_visorchipset_main_c +#define CURRENT_FILE_PC VISOR_BUS_PC_visorchipset_c #define POLLJIFFIES_CONTROLVMCHANNEL_FAST 1 #define POLLJIFFIES_CONTROLVMCHANNEL_SLOW 100 diff --git a/drivers/staging/unisys/visorbus/vmcallinterface.h b/drivers/staging/unisys/visorbus/vmcallinterface.h index 072fac3175a0..23b00f27809b 100644 --- a/drivers/staging/unisys/visorbus/vmcallinterface.h +++ b/drivers/staging/unisys/visorbus/vmcallinterface.h @@ -117,22 +117,13 @@ struct vmcall_io_controlvm_addr_params { /******* INFO ON ISSUE_POSTCODE_LINUX() BELOW *******/ enum driver_pc { /* POSTCODE driver identifier tuples */ - /* visorchipset driver files */ - VISOR_CHIPSET_PC = 0xA0, - VISOR_CHIPSET_PC_controlvm_c = 0xA1, - VISOR_CHIPSET_PC_controlvm_cm2 = 0xA2, - VISOR_CHIPSET_PC_controlvm_direct_c = 0xA3, - VISOR_CHIPSET_PC_file_c = 0xA4, - VISOR_CHIPSET_PC_parser_c = 0xA5, - VISOR_CHIPSET_PC_testing_c = 0xA6, - VISOR_CHIPSET_PC_visorchipset_main_c = 0xA7, - VISOR_CHIPSET_PC_visorswitchbus_c = 0xA8, /* visorbus driver files */ VISOR_BUS_PC = 0xB0, VISOR_BUS_PC_businst_attr_c = 0xB1, VISOR_BUS_PC_channel_attr_c = 0xB2, VISOR_BUS_PC_devmajorminor_attr_c = 0xB3, VISOR_BUS_PC_visorbus_main_c = 0xB4, + VISOR_BUS_PC_visorchipset_c = 0xB5, /* visorclientbus driver files */ VISOR_CLIENT_BUS_PC = 0xC0, VISOR_CLIENT_BUS_PC_visorclientbus_main_c = 0xC1,