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

Commit 8bd352ef authored by Benjamin Romer's avatar Benjamin Romer Committed by Greg Kroah-Hartman
Browse files

staging: unisys: clean up CamelCase names in struct add_virt_guestpart 



Clean up CamelCase names:
busNo => bus_no
deviceNo => device_no
devInstGuid => instance_uuid

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

drivers/staging/unisys/include/uisqueue.h

+3 −3
Original line number Diff line number Diff line
@@ -364,9 +364,9 @@ struct del_vbus_guestpart { 


struct add_virt_guestpart {

	void __iomem *chanptr;		/* pointer to data channel */

	u32 busNo;		/* bus number for the operation */

	u32 deviceNo;		/* number of device on the bus */

	uuid_le devInstGuid;	/* instance guid for device */

	u32 bus_no;		/* bus number for the operation */

	u32 device_no;		/* number of device on the bus */

	uuid_le instance_uuid;	/* instance guid for device */

	struct InterruptInfo intr;	/* recv/send interrupt info */

	/* recvInterruptHandle contains info needed in order to

	 * register to receive interrupts on the data channel.

drivers/staging/unisys/uislib/uislib.c

+6 −6
Original line number Diff line number Diff line
@@ -461,9 +461,9 @@ create_device(CONTROLVM_MESSAGE *msg, char *buf) 
					}

					cmd.msgtype = GUEST_ADD_VHBA;

					cmd.add_vhba.chanptr = dev->chanptr;

					cmd.add_vhba.busNo = busNo;

					cmd.add_vhba.deviceNo = devNo;

					cmd.add_vhba.devInstGuid =

					cmd.add_vhba.bus_no = busNo;

					cmd.add_vhba.device_no = devNo;

					cmd.add_vhba.instance_uuid =

					    dev->instance_uuid;

					cmd.add_vhba.intr = dev->intr;

				} else
@@ -486,9 +486,9 @@ create_device(CONTROLVM_MESSAGE *msg, char *buf) 
					}

					cmd.msgtype = GUEST_ADD_VNIC;

					cmd.add_vnic.chanptr = dev->chanptr;

					cmd.add_vnic.busNo = busNo;

					cmd.add_vnic.deviceNo = devNo;

					cmd.add_vnic.devInstGuid =

					cmd.add_vnic.bus_no = busNo;

					cmd.add_vnic.device_no = devNo;

					cmd.add_vnic.instance_uuid =

					    dev->instance_uuid;

					cmd.add_vhba.intr = dev->intr;

				} else {

drivers/staging/unisys/virtpci/virtpci.c

+7 −6
Original line number Diff line number Diff line
@@ -333,7 +333,7 @@ static int add_vhba(struct add_virt_guestpart *addparams) 


	GET_SCSIADAPINFO_FROM_CHANPTR(addparams->chanptr);



	GET_BUS_DEV(addparams->busNo);

	GET_BUS_DEV(addparams->bus_no);



	LOGINF("Adding vhba wwnn:%x:%x config:%d-%d-%d-%d chanptr:%p\n",

	       scsi.wwnn.wwnn1, scsi.wwnn.wwnn2,
@@ -390,7 +390,7 @@ add_vnic(struct add_virt_guestpart *addparams) 


	GET_NETADAPINFO_FROM_CHANPTR(addparams->chanptr);



	GET_BUS_DEV(addparams->busNo);

	GET_BUS_DEV(addparams->bus_no);



	LOGINF("Adding vnic macaddr:%02x:%02x:%02x:%02x:%02x:%02x rcvbufs:%d mtu:%d chanptr:%p%pUL\n",

	     net.mac_addr[0], net.mac_addr[1], net.mac_addr[2], net.mac_addr[3],
@@ -939,8 +939,8 @@ static int virtpci_device_add(struct device *parentbus, int devtype, 
		virtpcidev->net = *net;

	}

	virtpcidev->vendor = PCI_VENDOR_ID_UNISYS;

	virtpcidev->busNo = addparams->busNo;

	virtpcidev->deviceNo = addparams->deviceNo;

	virtpcidev->busNo = addparams->bus_no;

	virtpcidev->deviceNo = addparams->device_no;



	virtpcidev->queueinfo.chan = addparams->chanptr;

	virtpcidev->queueinfo.send_int_if_needed = NULL;
@@ -957,7 +957,7 @@ static int virtpci_device_add(struct device *parentbus, int devtype, 
	virtpcidev->generic_dev.release = virtpci_device_release;



	dev_set_name(&virtpcidev->generic_dev, "%x:%x",

		     addparams->busNo, addparams->deviceNo);

		     addparams->bus_no, addparams->device_no);



	/* add the vhba/vnic to virtpci device list - but check for

	 * duplicate wwnn/macaddr first
@@ -1055,7 +1055,8 @@ static int virtpci_device_add(struct device *parentbus, int devtype, 


	LOGINF("Added %s:%d:%d &virtpcidev->generic_dev:%p\n",

	       (devtype == VIRTHBA_TYPE) ? "virthba" : "virtnic",

	       addparams->busNo, addparams->deviceNo, &virtpcidev->generic_dev);

	       addparams->bus_no, addparams->device_no,

	       &virtpcidev->generic_dev);

	POSTCODE_LINUX_2(VPCI_CREATE_EXIT_PC, POSTCODE_SEVERITY_INFO);

	return 1;

}