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

Commit f621a968 authored by David Binder's avatar David Binder Committed by Greg Kroah-Hartman
Browse files

staging: unisys: visorbus: Convert visorchannel_signalremove() return val 



Per Documentation/CodingStyle, function names that convey an action or an
imperative command should return an integer. This commit converts the
visorbus API function, visorchannel_signalremove(), to returning integer
values. All uses of this function are updated accordingly.

Signed-off-by: default avatarDavid Binder <david.binder@unisys.com>
Signed-off-by: default avatarDavid Kershner <david.kershner@unisys.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 1306c429

drivers/staging/unisys/include/visorbus.h

+2 −2
Original line number Diff line number Diff line
@@ -200,7 +200,7 @@ enum diag_severity { 
	DIAG_SEVERITY_PRINT = 4,

};



bool visorchannel_signalremove(struct visorchannel *channel, u32 queue,

int visorchannel_signalremove(struct visorchannel *channel, u32 queue,

			      void *msg);

bool visorchannel_signalinsert(struct visorchannel *channel, u32 queue,

			       void *msg);

drivers/staging/unisys/visorbus/visorchannel.c

+4 −4
Original line number Diff line number Diff line
@@ -270,12 +270,12 @@ signalremove_inner(struct visorchannel *channel, u32 queue, void *msg) 
 * @queue:   the queue the message will be removed from

 * @msg:     the message to remove

 *

 * Return: boolean indicating whether the removal succeeded or failed

 * Return: integer error code indicating the status of the removal

 */

bool

int

visorchannel_signalremove(struct visorchannel *channel, u32 queue, void *msg)

{

	bool rc;

	int rc;

	unsigned long flags;



	if (channel->needs_lock) {
@@ -286,7 +286,7 @@ visorchannel_signalremove(struct visorchannel *channel, u32 queue, void *msg) 
		rc = signalremove_inner(channel, queue, msg);

	}



	return !rc;

	return rc;

}

EXPORT_SYMBOL_GPL(visorchannel_signalremove);

drivers/staging/unisys/visorbus/visorchipset.c

+5 −5
Original line number Diff line number Diff line
@@ -2000,7 +2000,7 @@ handle_command(struct controlvm_message inmsg, u64 channel_addr) 
static bool

read_controlvm_event(struct controlvm_message *msg)

{

	if (visorchannel_signalremove(controlvm_channel,

	if (!visorchannel_signalremove(controlvm_channel,

				       CONTROLVM_QUEUE_EVENT, msg)) {

		/* got a message */

		if (msg->hdr.flags.test_message == 1)
@@ -2048,7 +2048,7 @@ controlvm_periodic_work(struct work_struct *work) 
	bool got_command = false;

	bool handle_command_failed = false;



	while (visorchannel_signalremove(controlvm_channel,

	while (!visorchannel_signalremove(controlvm_channel,

					  CONTROLVM_QUEUE_RESPONSE,

					  &inmsg))

		;

drivers/staging/unisys/visorhba/visorhba_main.c

+3 −3
Original line number Diff line number Diff line
@@ -927,7 +927,7 @@ drain_queue(struct uiscmdrsp *cmdrsp, struct visorhba_devdata *devdata) 
	struct scsi_cmnd *scsicmd;



	while (1) {

		if (!visorchannel_signalremove(devdata->dev->visorchannel,

		if (visorchannel_signalremove(devdata->dev->visorchannel,

					      IOCHAN_FROM_IOPART,

					      cmdrsp))

			break; /* queue empty */

drivers/staging/unisys/visorinput/visorinput.c

+1 −1
Original line number Diff line number Diff line
@@ -581,7 +581,7 @@ visorinput_channel_interrupt(struct visor_device *dev) 


	visorinput_dev = devdata->visorinput_dev;



	while (visorchannel_signalremove(dev->visorchannel, 0, &r)) {

	while (!visorchannel_signalremove(dev->visorchannel, 0, &r)) {

		scancode = r.activity.arg1;

		keycode = scancode_to_keycode(scancode);

		switch (r.activity.action) {