[PATCH 2/4] Staging: unisys: remove buildDate and buildTime arguments from BusDeviceInfo_Init

["Ken Cox" <jkc@xxxxxxxxxx>]

The unisys drivers no longer need to record the build date and time since the
same info is already in the kernel elsewhere.

Signed-off-by: Ken Cox <jkc@xxxxxxxxxx>
---
 drivers/staging/unisys/include/vbushelper.h             | 8 +++-----
 drivers/staging/unisys/uislib/uisutils.c                | 7 +++----
 drivers/staging/unisys/virtpci/virtpci.c                | 5 ++---
 drivers/staging/unisys/visorchipset/visorchipset_main.c | 4 ++--
 4 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/drivers/staging/unisys/include/vbushelper.h b/drivers/staging/unisys/include/vbushelper.h
index 93e35f0..ed94375 100644
--- a/drivers/staging/unisys/include/vbushelper.h
+++ b/drivers/staging/unisys/include/vbushelper.h
@@ -28,8 +28,7 @@
 static inline void
 BusDeviceInfo_Init(ULTRA_VBUS_DEVICEINFO *pBusDeviceInfo,
 		   const char *deviceType, const char *driverName,
-		   const char *ver, const char *verTag,
-		   const char *buildDate, const char *buildTime)
+		   const char *ver, const char *verTag)
 {
 	memset(pBusDeviceInfo, 0, sizeof(ULTRA_VBUS_DEVICEINFO));
 	snprintf(pBusDeviceInfo->devType, sizeof(pBusDeviceInfo->devType),
@@ -37,11 +36,10 @@ BusDeviceInfo_Init(ULTRA_VBUS_DEVICEINFO *pBusDeviceInfo,
 	snprintf(pBusDeviceInfo->drvName, sizeof(pBusDeviceInfo->drvName),
 		 "%s", (driverName) ? driverName : "unknownDriver");
 	snprintf(pBusDeviceInfo->infoStrings,
-		 sizeof(pBusDeviceInfo->infoStrings), "%s\t%s\t%s %s\t%s",
+		 sizeof(pBusDeviceInfo->infoStrings), "%s\t%s\t%s",
 		 (ver) ? ver : "unknownVer",
 		 (verTag) ? verTag : "unknownVerTag",
-		 (buildDate) ? buildDate : "noBuildDate",
-		 (buildTime) ? buildTime : "nobuildTime", TARGET_HOSTNAME);
+		 TARGET_HOSTNAME);
 }
 
 #endif
diff --git a/drivers/staging/unisys/uislib/uisutils.c b/drivers/staging/unisys/uislib/uisutils.c
index 6c58637..07e5535 100644
--- a/drivers/staging/unisys/uislib/uisutils.c
+++ b/drivers/staging/unisys/uislib/uisutils.c
@@ -97,7 +97,7 @@ uisctrl_register_req_handler(int type, void *fptr,
 	}
 	if (chipset_DriverInfo)
 		BusDeviceInfo_Init(chipset_DriverInfo, "chipset", "uislib",
-				   VERSION, NULL, NULL, NULL);
+				   VERSION, NULL);
 
 	return 1;
 }
@@ -148,9 +148,8 @@ uisctrl_register_req_handler_ex(uuid_le switchTypeGuid,
 Away:
 	if (rc) {
 		if (chipset_DriverInfo)
-			BusDeviceInfo_Init(chipset_DriverInfo,
-					   "chipset", "uislib",
-					   VERSION, NULL, NULL, NULL);
+			BusDeviceInfo_Init(chipset_DriverInfo, "chipset",
+					   "uislib", VERSION, NULL);
 	} else
 		LOGERR("failed to register type %pUL.\n", &switchTypeGuid);
 
diff --git a/drivers/staging/unisys/virtpci/virtpci.c b/drivers/staging/unisys/virtpci/virtpci.c
index 35df6cd..5ab17e7 100644
--- a/drivers/staging/unisys/virtpci/virtpci.c
+++ b/drivers/staging/unisys/virtpci/virtpci.c
@@ -794,8 +794,7 @@ static void fix_vbus_devInfo(struct device *dev, int devNo, int devType,
 	BusDeviceInfo_Init(&devInfo, stype,
 			   virtpcidrv->name,
 			   virtpcidrv->version,
-			   virtpcidrv->vertag,
-			   virtpcidrv->build_date, virtpcidrv->build_time);
+			   virtpcidrv->vertag);
 	write_vbus_devInfo(pChan, &devInfo, devNo);
 
 	/* Re-write bus+chipset info, because it is possible that this
@@ -1696,7 +1695,7 @@ static int __init virtpci_mod_init(void)
 	}
 	DBGINF("bus_register successful\n");
 	BusDeviceInfo_Init(&Bus_DriverInfo, "clientbus", "virtpci",
-			   VERSION, NULL, NULL, NULL);
+			   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 689e7d1..f897128 100644
--- a/drivers/staging/unisys/visorchipset/visorchipset_main.c
+++ b/drivers/staging/unisys/visorchipset/visorchipset_main.c
@@ -569,7 +569,7 @@ visorchipset_register_busdev_server(VISORCHIPSET_BUSDEV_NOTIFIERS *notifiers,
 		*responders = BusDev_Responders;
 	if (driverInfo)
 		BusDeviceInfo_Init(driverInfo, "chipset", "visorchipset",
-				   VERSION, NULL, NULL, NULL);
+				   VERSION, NULL);
 
 	UNLOCKSEM(&NotifierLock);
 }
@@ -593,7 +593,7 @@ visorchipset_register_busdev_client(VISORCHIPSET_BUSDEV_NOTIFIERS *notifiers,
 		*responders = BusDev_Responders;
 	if (driverInfo)
 		BusDeviceInfo_Init(driverInfo, "chipset(bolts)", "visorchipset",
-				   VERSION, NULL, NULL, NULL);
+				   VERSION, NULL);
 	UNLOCKSEM(&NotifierLock);
 }
 EXPORT_SYMBOL_GPL(visorchipset_register_busdev_client);
-- 
1.9.3

_______________________________________________
devel mailing list
devel@xxxxxxxxxxxxxxxxxxxxxx
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel