USB: whiteheat: Convert to generic boolean
Signed-off-by: Richard Knutsson <ricknu-0@student.ltu.se> Acked-by: Stuart MacDonald <stuartm@connecttech.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
parent
5ec1862e7b
commit
38c3cb5b67
@ -1109,7 +1109,7 @@ static int firm_send_command (struct usb_serial_port *port, __u8 command, __u8 *
|
|||||||
command_port = port->serial->port[COMMAND_PORT];
|
command_port = port->serial->port[COMMAND_PORT];
|
||||||
command_info = usb_get_serial_port_data(command_port);
|
command_info = usb_get_serial_port_data(command_port);
|
||||||
spin_lock_irqsave(&command_info->lock, flags);
|
spin_lock_irqsave(&command_info->lock, flags);
|
||||||
command_info->command_finished = FALSE;
|
command_info->command_finished = false;
|
||||||
|
|
||||||
transfer_buffer = (__u8 *)command_port->write_urb->transfer_buffer;
|
transfer_buffer = (__u8 *)command_port->write_urb->transfer_buffer;
|
||||||
transfer_buffer[0] = command;
|
transfer_buffer[0] = command;
|
||||||
@ -1124,12 +1124,12 @@ static int firm_send_command (struct usb_serial_port *port, __u8 command, __u8 *
|
|||||||
spin_unlock_irqrestore(&command_info->lock, flags);
|
spin_unlock_irqrestore(&command_info->lock, flags);
|
||||||
|
|
||||||
/* wait for the command to complete */
|
/* wait for the command to complete */
|
||||||
wait_event_interruptible_timeout(command_info->wait_command,
|
wait_event_interruptible_timeout(command_info->wait_command,
|
||||||
(command_info->command_finished != FALSE), COMMAND_TIMEOUT);
|
(bool)command_info->command_finished, COMMAND_TIMEOUT);
|
||||||
|
|
||||||
spin_lock_irqsave(&command_info->lock, flags);
|
spin_lock_irqsave(&command_info->lock, flags);
|
||||||
|
|
||||||
if (command_info->command_finished == FALSE) {
|
if (command_info->command_finished == false) {
|
||||||
dbg("%s - command timed out.", __FUNCTION__);
|
dbg("%s - command timed out.", __FUNCTION__);
|
||||||
retval = -ETIMEDOUT;
|
retval = -ETIMEDOUT;
|
||||||
goto exit;
|
goto exit;
|
||||||
|
@ -20,10 +20,6 @@
|
|||||||
#define __LINUX_USB_SERIAL_WHITEHEAT_H
|
#define __LINUX_USB_SERIAL_WHITEHEAT_H
|
||||||
|
|
||||||
|
|
||||||
#define FALSE 0
|
|
||||||
#define TRUE 1
|
|
||||||
|
|
||||||
|
|
||||||
/* WhiteHEAT commands */
|
/* WhiteHEAT commands */
|
||||||
#define WHITEHEAT_OPEN 1 /* open the port */
|
#define WHITEHEAT_OPEN 1 /* open the port */
|
||||||
#define WHITEHEAT_CLOSE 2 /* close the port */
|
#define WHITEHEAT_CLOSE 2 /* close the port */
|
||||||
|
Loading…
Reference in New Issue
Block a user