#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)
+static inline void bus_device_info_init(
+               ULTRA_VBUS_DEVICEINFO * bus_device_info_ptr,
+               const char *dev_type, const char *drv_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_ptr, 0, sizeof(ULTRA_VBUS_DEVICEINFO));
+       snprintf(bus_device_info_ptr->devType,
+                sizeof(bus_device_info_ptr->devType),
+                "%s", (dev_type) ? dev_type : "unknownType");
+       snprintf(bus_device_info_ptr->drvName,
+                sizeof(bus_device_info_ptr->drvName),
+                "%s", (drv_name) ? drv_name : "unknownDriver");
+       snprintf(bus_device_info_ptr->infoStrings,
+                sizeof(bus_device_info_ptr->infoStrings), "%s\t%s\t%s",
                 (ver) ? ver : "unknownVer",
-                (verTag) ? verTag : "unknownVerTag",
+                (ver_tag) ? ver_tag : "unknownVerTag",
                 TARGET_HOSTNAME);
 }
 
 
                return 0;
        }
        if (chipset_DriverInfo)
-               BusDeviceInfo_Init(chipset_DriverInfo, "chipset", "uislib",
+               bus_device_info_init(chipset_DriverInfo, "chipset", "uislib",
                                   VERSION, NULL);
 
        return 1;
 Away:
        if (rc) {
                if (chipset_DriverInfo)
-                       BusDeviceInfo_Init(chipset_DriverInfo, "chipset",
+                       bus_device_info_init(chipset_DriverInfo, "chipset",
                                           "uislib", VERSION, NULL);
        } else
                LOGERR("failed to register type %pUL.\n", &switchTypeGuid);
 
                stype = "unknown";
                break;
        }
-       BusDeviceInfo_Init(&devInfo, stype,
+       bus_device_info_init(&devInfo, stype,
                           virtpcidrv->name,
                           virtpcidrv->version,
                           virtpcidrv->vertag);
                return ret;
        }
        DBGINF("bus_register successful\n");
-       BusDeviceInfo_Init(&Bus_DriverInfo, "clientbus", "virtpci",
+       bus_device_info_init(&Bus_DriverInfo, "clientbus", "virtpci",
                           VERSION, NULL);
 
        /* create a root bus used to parent all the virtpci buses. */
 
        if (responders)
                *responders = BusDev_Responders;
        if (driverInfo)
-               BusDeviceInfo_Init(driverInfo, "chipset", "visorchipset",
+               bus_device_info_init(driverInfo, "chipset", "visorchipset",
                                   VERSION, NULL);
 
        up(&NotifierLock);
        if (responders)
                *responders = BusDev_Responders;
        if (driverInfo)
-               BusDeviceInfo_Init(driverInfo, "chipset(bolts)", "visorchipset",
+               bus_device_info_init(driverInfo, "chipset(bolts)", "visorchipset",
                                   VERSION, NULL);
        up(&NotifierLock);
 }