[PATCH 8/9] staging: unisys: cleanup vbushelper.h

Benjamin Romer benjamin.romer at unisys.com
Wed Sep 24 15:56:26 UTC 2014


Fix as many checkpatch.pl strict checks and warnings as possible, and fix
references to the renamed bus_device_info_init() function. The remaining
checks in this file are due to the names of members of structures defined in
another file. These will be corrected by subsequent patches.

Signed-off-by: Benjamin Romer <benjamin.romer at unisys.com>
---
 drivers/staging/unisys/include/vbushelper.h        | 24 +++++++++++-----------
 drivers/staging/unisys/uislib/uisutils.c           |  8 ++++----
 drivers/staging/unisys/virtpci/virtpci.c           | 12 +++++------
 .../unisys/visorchipset/visorchipset_main.c        |  8 ++++----
 4 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/drivers/staging/unisys/include/vbushelper.h b/drivers/staging/unisys/include/vbushelper.h
index ed94375..9f80c22 100644
--- a/drivers/staging/unisys/include/vbushelper.h
+++ b/drivers/staging/unisys/include/vbushelper.h
@@ -1,6 +1,6 @@
 /* vbushelper.h
  *
- * Copyright © 2011 - 2013 UNISYS CORPORATION
+ * Copyright (C) 2011 - 2013 UNISYS CORPORATION
  * All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify
@@ -26,19 +26,19 @@
 #define TARGET_HOSTNAME "linuxguest"
 
 static inline void
-BusDeviceInfo_Init(ULTRA_VBUS_DEVICEINFO *pBusDeviceInfo,
-		   const char *deviceType, const char *driverName,
-		   const char *ver, const char *verTag)
+bus_device_info_init(ULTRA_VBUS_DEVICEINFO *bus_device_info,
+		     const char *device_type, const char *driver_name,
+		     const char *ver, const char *ver_tag)
 {
-	memset(pBusDeviceInfo, 0, sizeof(ULTRA_VBUS_DEVICEINFO));
-	snprintf(pBusDeviceInfo->devType, sizeof(pBusDeviceInfo->devType),
-		 "%s", (deviceType) ? deviceType : "unknownType");
-	snprintf(pBusDeviceInfo->drvName, sizeof(pBusDeviceInfo->drvName),
-		 "%s", (driverName) ? driverName : "unknownDriver");
-	snprintf(pBusDeviceInfo->infoStrings,
-		 sizeof(pBusDeviceInfo->infoStrings), "%s\t%s\t%s",
+	memset(bus_device_info, 0, sizeof(ULTRA_VBUS_DEVICEINFO));
+	snprintf(bus_device_info->devType, sizeof(bus_device_info->devType),
+		 "%s", (device_type) ? device_type : "unknownType");
+	snprintf(bus_device_info->drvName, sizeof(bus_device_info->drvName),
+		 "%s", (driver_name) ? driver_name : "unknownDriver");
+	snprintf(bus_device_info->infoStrings,
+		 sizeof(bus_device_info->infoStrings), "%s\t%s\t%s",
 		 (ver) ? ver : "unknownVer",
-		 (verTag) ? verTag : "unknownVerTag",
+		 (ver_tag) ? ver_tag : "unknownVerTag",
 		 TARGET_HOSTNAME);
 }
 
diff --git a/drivers/staging/unisys/uislib/uisutils.c b/drivers/staging/unisys/uislib/uisutils.c
index bf97ae9..25b6234 100644
--- a/drivers/staging/unisys/uislib/uisutils.c
+++ b/drivers/staging/unisys/uislib/uisutils.c
@@ -97,8 +97,8 @@ uisctrl_register_req_handler(int type, void *fptr,
 		return 0;
 	}
 	if (chipset_driver_info)
-		BusDeviceInfo_Init(chipset_driver_info, "chipset", "uislib",
-				   VERSION, NULL);
+		bus_device_info_init(chipset_driver_info, "chipset", "uislib",
+				     VERSION, NULL);
 
 	return 1;
 }
@@ -152,8 +152,8 @@ uisctrl_register_req_handler_ex(uuid_le switch_type_guid,
 Away:
 	if (rc) {
 		if (chipset_driver_info)
-			BusDeviceInfo_Init(chipset_driver_info, "chipset",
-					   "uislib", VERSION, NULL);
+			bus_device_info_init(chipset_driver_info, "chipset",
+					     "uislib", VERSION, NULL);
 	} else
 		LOGERR("failed to register type %pUL.\n", &switch_type_guid);
 
diff --git a/drivers/staging/unisys/virtpci/virtpci.c b/drivers/staging/unisys/virtpci/virtpci.c
index 5c56ae9..6c86cc4 100644
--- a/drivers/staging/unisys/virtpci/virtpci.c
+++ b/drivers/staging/unisys/virtpci/virtpci.c
@@ -787,10 +787,10 @@ static void fix_vbus_devInfo(struct device *dev, int devNo, int devType,
 		stype = "unknown";
 		break;
 	}
-	BusDeviceInfo_Init(&devInfo, stype,
-			   virtpcidrv->name,
-			   virtpcidrv->version,
-			   virtpcidrv->vertag);
+	bus_device_info_init(&devInfo, stype,
+			     virtpcidrv->name,
+			     virtpcidrv->version,
+			     virtpcidrv->vertag);
 	write_vbus_devInfo(pChan, &devInfo, devNo);
 
 	/* Re-write bus+chipset info, because it is possible that this
@@ -1506,8 +1506,8 @@ static int __init virtpci_mod_init(void)
 		return ret;
 	}
 	DBGINF("bus_register successful\n");
-	BusDeviceInfo_Init(&Bus_DriverInfo, "clientbus", "virtpci",
-			   VERSION, NULL);
+	bus_device_info_init(&Bus_DriverInfo, "clientbus", "virtpci",
+			     VERSION, NULL);
 
 	/* create a root bus used to parent all the virtpci buses. */
 	ret = device_register(&virtpci_rootbus_device);
diff --git a/drivers/staging/unisys/visorchipset/visorchipset_main.c b/drivers/staging/unisys/visorchipset/visorchipset_main.c
index 1c3a8cd..eb99137 100644
--- a/drivers/staging/unisys/visorchipset/visorchipset_main.c
+++ b/drivers/staging/unisys/visorchipset/visorchipset_main.c
@@ -601,8 +601,8 @@ visorchipset_register_busdev_server(VISORCHIPSET_BUSDEV_NOTIFIERS *notifiers,
 	if (responders)
 		*responders = BusDev_Responders;
 	if (driverInfo)
-		BusDeviceInfo_Init(driverInfo, "chipset", "visorchipset",
-				   VERSION, NULL);
+		bus_device_info_init(driverInfo, "chipset", "visorchipset",
+				     VERSION, NULL);
 
 	up(&NotifierLock);
 }
@@ -625,8 +625,8 @@ visorchipset_register_busdev_client(VISORCHIPSET_BUSDEV_NOTIFIERS *notifiers,
 	if (responders)
 		*responders = BusDev_Responders;
 	if (driverInfo)
-		BusDeviceInfo_Init(driverInfo, "chipset(bolts)", "visorchipset",
-				   VERSION, NULL);
+		bus_device_info_init(driverInfo, "chipset(bolts)",
+				     "visorchipset", VERSION, NULL);
 	up(&NotifierLock);
 }
 EXPORT_SYMBOL_GPL(visorchipset_register_busdev_client);
-- 
1.9.1



More information about the devel mailing list