From 534429dbb9a4d0ff4fad2617dda2a19ee71365a8 Mon Sep 17 00:00:00 2001 From: Benjamin Romer Date: Tue, 30 Sep 2014 12:08:14 -0400 Subject: [PATCH] staging: unisys: fix CamelCase in bus_device_info_init() Fix CamelCase names: BusDeviceInfo_Init => bus_device_info_init pBusDeviceInfo => bus_device_info_ptr deviceType => dev_type driverName => driver_name verTag => ver_tag Signed-off-by: Benjamin Romer Signed-off-by: Greg Kroah-Hartman --- drivers/staging/unisys/include/vbushelper.h | 26 ++++++++++++---------- drivers/staging/unisys/uislib/uisutils.c | 4 ++-- drivers/staging/unisys/virtpci/virtpci.c | 4 ++-- .../unisys/visorchipset/visorchipset_main.c | 4 ++-- 4 files changed, 20 insertions(+), 18 deletions(-) diff --git a/drivers/staging/unisys/include/vbushelper.h b/drivers/staging/unisys/include/vbushelper.h index 60fc2b3..1bde549 100644 --- a/drivers/staging/unisys/include/vbushelper.h +++ b/drivers/staging/unisys/include/vbushelper.h @@ -25,20 +25,22 @@ #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); } diff --git a/drivers/staging/unisys/uislib/uisutils.c b/drivers/staging/unisys/uislib/uisutils.c index d175d03..260df27 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, return 0; } if (chipset_DriverInfo) - BusDeviceInfo_Init(chipset_DriverInfo, "chipset", "uislib", + bus_device_info_init(chipset_DriverInfo, "chipset", "uislib", VERSION, NULL); return 1; @@ -150,7 +150,7 @@ uisctrl_register_req_handler_ex(uuid_le switchTypeGuid, 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); diff --git a/drivers/staging/unisys/virtpci/virtpci.c b/drivers/staging/unisys/virtpci/virtpci.c index 5a5f9d0..ee9f826 100644 --- a/drivers/staging/unisys/virtpci/virtpci.c +++ b/drivers/staging/unisys/virtpci/virtpci.c @@ -792,7 +792,7 @@ static void fix_vbus_devInfo(struct device *dev, int devNo, int devType, stype = "unknown"; break; } - BusDeviceInfo_Init(&devInfo, stype, + bus_device_info_init(&devInfo, stype, virtpcidrv->name, virtpcidrv->version, virtpcidrv->vertag); @@ -1515,7 +1515,7 @@ static int __init virtpci_mod_init(void) 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. */ diff --git a/drivers/staging/unisys/visorchipset/visorchipset_main.c b/drivers/staging/unisys/visorchipset/visorchipset_main.c index 1eeeef8..c299a0d 100644 --- a/drivers/staging/unisys/visorchipset/visorchipset_main.c +++ b/drivers/staging/unisys/visorchipset/visorchipset_main.c @@ -601,7 +601,7 @@ visorchipset_register_busdev_server(VISORCHIPSET_BUSDEV_NOTIFIERS *notifiers, if (responders) *responders = BusDev_Responders; if (driverInfo) - BusDeviceInfo_Init(driverInfo, "chipset", "visorchipset", + bus_device_info_init(driverInfo, "chipset", "visorchipset", VERSION, NULL); up(&NotifierLock); @@ -625,7 +625,7 @@ visorchipset_register_busdev_client(VISORCHIPSET_BUSDEV_NOTIFIERS *notifiers, 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); } -- 2.7.4