staging: unisys: visorbus: Remove POSTCODE_SEVERITY levels

Use the already defined DIAG_SEVERITY values directly instead of special
postcode macro names.
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>

drivers/staging/unisys/visorbus/visorbus_main.c

@@ -608,7 +608,7 @@ create_visor_device(struct visor_device *dev)
 	u32 chipset_dev_no = dev->chipset_dev_no;
 
 	POSTCODE_LINUX(DEVICE_CREATE_ENTRY_PC, chipset_dev_no, chipset_bus_no,
-		       POSTCODE_SEVERITY_INFO);
+		       DIAG_SEVERITY_PRINT);
 
 	mutex_init(&dev->visordriver_callback_lock);
 	dev->device.bus = &visorbus_type;
@@ -966,7 +966,7 @@ create_bus_instance(struct visor_device *dev)
 	int err;
 	struct spar_vbus_headerinfo *hdr_info;
 
-	POSTCODE_LINUX(BUS_CREATE_ENTRY_PC, 0, 0, POSTCODE_SEVERITY_INFO);
+	POSTCODE_LINUX(BUS_CREATE_ENTRY_PC, 0, 0, DIAG_SEVERITY_PRINT);
 
 	hdr_info = kzalloc(sizeof(*hdr_info), GFP_KERNEL);
 	if (!hdr_info)
@@ -994,7 +994,7 @@ create_bus_instance(struct visor_device *dev)
 
 	if (device_register(&dev->device) < 0) {
 		POSTCODE_LINUX(DEVICE_CREATE_FAILURE_PC, 0, id,
-			       POSTCODE_SEVERITY_ERR);
+			       DIAG_SEVERITY_ERR);
 		err = -ENODEV;
 		goto err_debugfs_created;
 	}
@@ -1092,16 +1092,16 @@ chipset_bus_create(struct visor_device *dev)
 	int rc;
 	u32 bus_no = dev->chipset_bus_no;
 
-	POSTCODE_LINUX(BUS_CREATE_ENTRY_PC, 0, bus_no, POSTCODE_SEVERITY_INFO);
+	POSTCODE_LINUX(BUS_CREATE_ENTRY_PC, 0, bus_no, DIAG_SEVERITY_PRINT);
 	rc = create_bus_instance(dev);
-	POSTCODE_LINUX(BUS_CREATE_EXIT_PC, 0, bus_no, POSTCODE_SEVERITY_INFO);
+	POSTCODE_LINUX(BUS_CREATE_EXIT_PC, 0, bus_no, DIAG_SEVERITY_PRINT);
 
 	if (rc < 0)
 		POSTCODE_LINUX(BUS_CREATE_FAILURE_PC, 0, bus_no,
-			       POSTCODE_SEVERITY_ERR);
+			       DIAG_SEVERITY_ERR);
 	else
 		POSTCODE_LINUX(CHIPSET_INIT_SUCCESS_PC, 0, bus_no,
-			       POSTCODE_SEVERITY_INFO);
+			       DIAG_SEVERITY_PRINT);
 
 	bus_create_response(dev, rc);
 }
@@ -1121,17 +1121,17 @@ chipset_device_create(struct visor_device *dev_info)
 	u32 dev_no = dev_info->chipset_dev_no;
 
 	POSTCODE_LINUX(DEVICE_CREATE_ENTRY_PC, dev_no, bus_no,
-		       POSTCODE_SEVERITY_INFO);
+		       DIAG_SEVERITY_PRINT);
 
 	rc = create_visor_device(dev_info);
 	device_create_response(dev_info, rc);
 
 	if (rc < 0)
 		POSTCODE_LINUX(DEVICE_CREATE_FAILURE_PC, dev_no, bus_no,
-			       POSTCODE_SEVERITY_ERR);
+			       DIAG_SEVERITY_ERR);
 	else
 		POSTCODE_LINUX(DEVICE_CREATE_SUCCESS_PC, dev_no, bus_no,
-			       POSTCODE_SEVERITY_INFO);
+			       DIAG_SEVERITY_PRINT);
 }
 
 void
@@ -1297,7 +1297,7 @@ visorbus_init(void)
 {
 	int err;
 
-	POSTCODE_LINUX(DRIVER_ENTRY_PC, 0, 0, POSTCODE_SEVERITY_INFO);
+	POSTCODE_LINUX(DRIVER_ENTRY_PC, 0, 0, DIAG_SEVERITY_PRINT);
 
 	visorbus_debugfs_dir = debugfs_create_dir("visorbus", NULL);
 	if (!visorbus_debugfs_dir)
@@ -1316,7 +1316,7 @@ visorbus_init(void)
 	return 0;
 
 error:
-	POSTCODE_LINUX(CHIPSET_INIT_FAILURE_PC, 0, err, POSTCODE_SEVERITY_ERR);
+	POSTCODE_LINUX(CHIPSET_INIT_FAILURE_PC, 0, err, DIAG_SEVERITY_ERR);
 	return err;
 }
 

drivers/staging/unisys/visorbus/vmcallinterface.h

@@ -157,10 +157,6 @@ enum event_pc {			/* POSTCODE event identifier tuples */
 	SAVE_MSG_DEV_FAILURE_PC = 0x01F,
 };
 
-#define POSTCODE_SEVERITY_ERR DIAG_SEVERITY_ERR
-/* TODO-> Info currently doesn't show, so we set info=warning */
-#define POSTCODE_SEVERITY_INFO DIAG_SEVERITY_PRINT
-
 /* Write a 64-bit value to the hypervisor's log file
  * POSTCODE_LINUX generates a value in the form 0xAABBBCCCDDDDEEEE where
  *	A is an identifier for the file logging the postcode