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

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

staging: unisys: fix CamelCase in struct del_vbus_guestpart 



Fix up CamelCase names:
busNo => bus_no

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

drivers/staging/unisys/include/uisqueue.h

+1 −1
Original line number Diff line number Diff line
@@ -356,7 +356,7 @@ struct add_vbus_guestpart { 
};



struct del_vbus_guestpart {

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

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

	/* once we start using the bus's channel, add can dump busNo

	* into the channel header and then delete will need only one

	* parameter, chanptr. */

drivers/staging/unisys/uislib/uislib.c

+1 −1
Original line number Diff line number Diff line
@@ -315,7 +315,7 @@ destroy_bus(CONTROLVM_MESSAGE *msg, char *buf) 
	/* client messages require us to call the virtpci callback associated

	   with this bus. */

	cmd.msgtype = GUEST_DEL_VBUS;

	cmd.del_vbus.busNo = busNo;

	cmd.del_vbus.bus_no = busNo;

	if (!VirtControlChanFunc) {

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

		return CONTROLVM_RESP_ERROR_VIRTPCI_DRIVER_FAILURE;

drivers/staging/unisys/virtpci/virtpci.c

+3 −3
Original line number Diff line number Diff line
@@ -417,12 +417,12 @@ delete_vbus(struct del_vbus_guestpart *delparams) 
	struct device *vbus;

	unsigned char busid[BUS_ID_SIZE];



	GET_BUS_DEV(delparams->busNo);

	GET_BUS_DEV(delparams->bus_no);

	/* ensure that bus has no devices? -- TBD */

	LOGINF("Deleting %s\n", BUS_ID(vbus));

	if (delete_vbus_device(vbus, NULL))

		return 0;	/* failure */

	LOGINF("Deleted vbus %d\n", delparams->busNo);

	LOGINF("Deleted vbus %d\n", delparams->bus_no);

	return 1;

}
@@ -620,7 +620,7 @@ static int delete_all_virt(VIRTPCI_DEV_TYPE devtype, struct del_vbus_guestpart * 
	unsigned char busid[BUS_ID_SIZE];

	struct device *vbus;



	GET_BUS_DEV(delparams->busNo);

	GET_BUS_DEV(delparams->bus_no);



	if ((devtype != VIRTHBA_TYPE) && (devtype != VIRTNIC_TYPE)) {

		LOGERR("**** FAILED to delete all devices; devtype:%d not vhba:%d or vnic:%d\n",