[PATCH 56/71] staging: unisys: my_device_create camel cases

Jeffrey Brown Jeffrey.Brown at unisys.com
Wed Nov 12 17:42:41 UTC 2014


From: Jeffrey <Jeffrey.Brown at unisys.com>

Removed the camel cases in the static void of my_device_create
busNo -> busno
devNo -> devno
pDevInfo -> pdevinfo
pBusInfo -> pbusinfo
Away -> cleanups

Signed-off-by: Jeffrey Brown <Jeffrey.Brown at unisys.com>
---
 .../unisys/visorchipset/visorchipset_main.c        | 86 +++++++++++-----------
 1 file changed, 43 insertions(+), 43 deletions(-)

diff --git a/drivers/staging/unisys/visorchipset/visorchipset_main.c b/drivers/staging/unisys/visorchipset/visorchipset_main.c
index 54ee543..2aa98f7 100644
--- a/drivers/staging/unisys/visorchipset/visorchipset_main.c
+++ b/drivers/staging/unisys/visorchipset/visorchipset_main.c
@@ -1240,80 +1240,80 @@ static void
 my_device_create(struct controlvm_message *inmsg)
 {
 	struct controlvm_message_packet *cmd = &inmsg->cmd;
-	ulong busNo = cmd->create_device.bus_no;
-	ulong devNo = cmd->create_device.dev_no;
-	struct visorchipset_device_info *pDevInfo = NULL;
-	struct visorchipset_bus_info *pBusInfo = NULL;
+	ulong busno = cmd->create_device.bus_no;
+	ulong devno = cmd->create_device.dev_no;
+	struct visorchipset_device_info *pdevinfo = NULL;
+	struct visorchipset_bus_info *pbusinfo = NULL;
 	int rc = CONTROLVM_RESP_SUCCESS;
 
-	pDevInfo = finddevice(&devinfolist, busNo, devNo);
-	if (pDevInfo && (pDevInfo->state.created == 1)) {
+	pdevinfo = finddevice(&devinfolist, busno, devno);
+	if (pdevinfo && (pdevinfo->state.created == 1)) {
 		LOGERR("CONTROLVM_DEVICE_CREATE Failed: busNo=%lu, devNo=%lu already exists",
-		       busNo, devNo);
-		POSTCODE_LINUX_4(DEVICE_CREATE_FAILURE_PC, devNo, busNo,
+		       busno, devno);
+		POSTCODE_LINUX_4(DEVICE_CREATE_FAILURE_PC, devno, busno,
 				 POSTCODE_SEVERITY_ERR);
 		rc = -CONTROLVM_RESP_ERROR_ALREADY_DONE;
-		goto Away;
+		goto cleanups;
 	}
-	pBusInfo = findbus(&businfolist, busNo);
-	if (!pBusInfo) {
+	pbusinfo = findbus(&businfolist, busno);
+	if (!pbusinfo) {
 		LOGERR("CONTROLVM_DEVICE_CREATE Failed: Invalid bus %lu - out of range",
-		       busNo);
-		POSTCODE_LINUX_4(DEVICE_CREATE_FAILURE_PC, devNo, busNo,
+		       busno);
+		POSTCODE_LINUX_4(DEVICE_CREATE_FAILURE_PC, devno, busno,
 				 POSTCODE_SEVERITY_ERR);
 		rc = -CONTROLVM_RESP_ERROR_BUS_INVALID;
-		goto Away;
+		goto cleanups;
 	}
-	if (pBusInfo->state.created == 0) {
+	if (pbusinfo->state.created == 0) {
 		LOGERR("CONTROLVM_DEVICE_CREATE Failed: Invalid bus %lu - not created yet",
-		       busNo);
-		POSTCODE_LINUX_4(DEVICE_CREATE_FAILURE_PC, devNo, busNo,
+		       busno);
+		POSTCODE_LINUX_4(DEVICE_CREATE_FAILURE_PC, devno, busno,
 				 POSTCODE_SEVERITY_ERR);
 		rc = -CONTROLVM_RESP_ERROR_BUS_INVALID;
-		goto Away;
+		goto cleanups;
 	}
-	pDevInfo = kzalloc(sizeof(*pDevInfo), GFP_KERNEL);
-	if (pDevInfo == NULL) {
+	pdevinfo = kzalloc(sizeof(*pdevinfo), GFP_KERNEL);
+	if (pdevinfo == NULL) {
 		LOGERR("CONTROLVM_DEVICE_CREATE Failed: busNo=%lu, devNo=%lu kmaloc failed",
-		       busNo, devNo);
-		POSTCODE_LINUX_4(DEVICE_CREATE_FAILURE_PC, devNo, busNo,
+		       busno, devno);
+		POSTCODE_LINUX_4(DEVICE_CREATE_FAILURE_PC, devno, busno,
 				 POSTCODE_SEVERITY_ERR);
 		rc = -CONTROLVM_RESP_ERROR_KMALLOC_FAILED;
-		goto Away;
+		goto cleanups;
 	}
 
-	INIT_LIST_HEAD(&pDevInfo->entry);
-	pDevInfo->bus_no = busNo;
-	pDevInfo->dev_no = devNo;
-	pDevInfo->dev_inst_uuid = cmd->create_device.dev_inst_uuid;
-	POSTCODE_LINUX_4(DEVICE_CREATE_ENTRY_PC, devNo, busNo,
+	INIT_LIST_HEAD(&pdevinfo->entry);
+	pdevinfo->bus_no = busno;
+	pdevinfo->dev_no = devno;
+	pdevinfo->dev_inst_uuid = cmd->create_device.dev_inst_uuid;
+	POSTCODE_LINUX_4(DEVICE_CREATE_ENTRY_PC, devno, busno,
 			 POSTCODE_SEVERITY_INFO);
 
 	if (inmsg->hdr.flags.test_message == 1)
-		pDevInfo->chan_info.addr_type = ADDRTYPE_LOCALTEST;
+		pdevinfo->chan_info.addr_type = ADDRTYPE_LOCALTEST;
 	else
-		pDevInfo->chan_info.addr_type = ADDRTYPE_LOCALPHYSICAL;
-	pDevInfo->chan_info.channel_addr = cmd->create_device.channel_addr;
-	pDevInfo->chan_info.n_channel_bytes = cmd->create_device.channel_bytes;
-	pDevInfo->chan_info.channel_type_uuid =
+		pdevinfo->chan_info.addr_type = ADDRTYPE_LOCALPHYSICAL;
+	pdevinfo->chan_info.channel_addr = cmd->create_device.channel_addr;
+	pdevinfo->chan_info.n_channel_bytes = cmd->create_device.channel_bytes;
+	pdevinfo->chan_info.channel_type_uuid =
 			cmd->create_device.data_type_uuid;
-	pDevInfo->chan_info.intr = cmd->create_device.intr;
-	list_add(&pDevInfo->entry, &devinfolist);
-	POSTCODE_LINUX_4(DEVICE_CREATE_EXIT_PC, devNo, busNo,
+	pdevinfo->chan_info.intr = cmd->create_device.intr;
+	list_add(&pdevinfo->entry, &devinfolist);
+	POSTCODE_LINUX_4(DEVICE_CREATE_EXIT_PC, devno, busno,
 			 POSTCODE_SEVERITY_INFO);
-Away:
+cleanups:
 	/* get the bus and devNo for DiagPool channel */
-	if (pDevInfo &&
-	    is_diagpool_channel(pDevInfo->chan_info.channel_type_uuid)) {
-		g_diagpoolbusno = busNo;
-		g_diagpooldevno = devNo;
+	if (pdevinfo &&
+	    is_diagpool_channel(pdevinfo->chan_info.channel_type_uuid)) {
+		g_diagpoolbusno = busno;
+		g_diagpooldevno = devno;
 		LOGINF("CONTROLVM_DEVICE_CREATE for DiagPool channel: busNo=%lu, devNo=%lu",
 		       g_diagpoolbusno, g_diagpooldevno);
 	}
-	device_epilog(busNo, devNo, segment_state_running,
+	device_epilog(busno, devno, segment_state_running,
 		      CONTROLVM_DEVICE_CREATE, &inmsg->hdr, rc,
 		      inmsg->hdr.flags.response_expected == 1,
-		      FOR_VISORBUS(pDevInfo->chan_info.channel_type_uuid));
+		      FOR_VISORBUS(pdevinfo->chan_info.channel_type_uuid));
 }
 
 static void
-- 
1.8.4



More information about the devel mailing list