Commit 34e6230b authored by Benjamin Romer's avatar Benjamin Romer Committed by Greg Kroah-Hartman
Browse files

staging: unisys: fix CamelCase in struct add_vbus_guestpart 



Clean up CamelCase names:
busNo => bus_no
deviceCount => dev_count
busTypeGuid => bus_uuid
busInstGuid => instance_guid

Signed-off-by: default avatarBenjamin Romer <benjamin.romer@unisys.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 43ecb9fe

drivers/staging/unisys/include/uisqueue.h

+4 −4
Original line number Diff line number Diff line
@@ -346,10 +346,10 @@ enum guestpart_msg_type { 
struct add_vbus_guestpart {

	void __iomem *chanptr;		/* pointer to data channel for bus -

					 * NOT YET USED */

	u32 busNo;		/* bus number to be created/deleted */

	u32 deviceCount;	/* max num of devices on bus */

	uuid_le busTypeGuid;	/* indicates type of bus */

	uuid_le busInstGuid;	/* instance guid for device */

	u32 bus_no;		/* bus number to be created/deleted */

	u32 dev_count;	/* max num of devices on bus */

	uuid_le bus_uuid;	/* indicates type of bus */

	uuid_le instance_uuid;	/* instance guid for device */

};



struct del_vbus_guestpart {

drivers/staging/unisys/uislib/uislib.c

+4 −4
Original line number Diff line number Diff line
@@ -233,11 +233,11 @@ create_bus(CONTROLVM_MESSAGE *msg, char *buf) 
		struct guest_msgs cmd;



		cmd.msgtype = GUEST_ADD_VBUS;

		cmd.add_vbus.busNo = busNo;

		cmd.add_vbus.bus_no = busNo;

		cmd.add_vbus.chanptr = bus->bus_channel;

		cmd.add_vbus.deviceCount = deviceCount;

		cmd.add_vbus.busTypeGuid = msg->cmd.createBus.busDataTypeGuid;

		cmd.add_vbus.busInstGuid = msg->cmd.createBus.busInstGuid;

		cmd.add_vbus.dev_count = deviceCount;

		cmd.add_vbus.bus_uuid = msg->cmd.createBus.busDataTypeGuid;

		cmd.add_vbus.instance_uuid = msg->cmd.createBus.busInstGuid;

		if (!VirtControlChanFunc) {

			LOGERR("CONTROLVM_BUS_CREATE Failed: virtpci callback not registered.");

			POSTCODE_LINUX_3(BUS_CREATE_FAILURE_PC, bus->bus_no,

drivers/staging/unisys/virtpci/virtpci.c

+2 −2
Original line number Diff line number Diff line
@@ -262,7 +262,7 @@ static int add_vbus(struct add_vbus_guestpart *addparams) 
	if (!vbus)

		return 0;



	dev_set_name(vbus, "vbus%d", addparams->busNo);

	dev_set_name(vbus, "vbus%d", addparams->bus_no);

	vbus->release = virtpci_bus_release;

	vbus->parent = &virtpci_rootbus_device;	/* root bus is parent */

	vbus->bus = &virtpci_bus_type;	/* bus type */
@@ -283,7 +283,7 @@ static int add_vbus(struct add_vbus_guestpart *addparams) 
			   &Chipset_DriverInfo);

	write_vbus_busInfo(vbus->platform_data /* chanptr */ , &Bus_DriverInfo);

	LOGINF("Added vbus %d; device %s created successfully\n",

	       addparams->busNo, BUS_ID(vbus));

	       addparams->bus_no, BUS_ID(vbus));

	POSTCODE_LINUX_2(VPCI_CREATE_EXIT_PC, POSTCODE_SEVERITY_INFO);

	return 1;

}