Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 534429db authored by Benjamin Romer's avatar Benjamin Romer Committed by Greg Kroah-Hartman
Browse files

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: default avatarBenjamin Romer <benjamin.romer@unisys.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent a56db94c

drivers/staging/unisys/include/vbushelper.h

+14 −12
Original line number Diff line number Diff line
@@ -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);

}

drivers/staging/unisys/uislib/uisutils.c

+2 −2
Original line number Diff line number Diff line
@@ -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);

drivers/staging/unisys/virtpci/virtpci.c

+2 −2
Original line number Diff line number Diff line
@@ -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. */

drivers/staging/unisys/visorchipset/visorchipset_main.c

+2 −2
Original line number Diff line number Diff line
@@ -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);

}