diff options
author | Richard Knutsson <ricknu-0@student.ltu.se> | 2007-03-27 02:00:28 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2007-04-27 16:28:39 -0400 |
commit | 38c3cb5b677cf551cd93a494dc5c551271d90ac1 (patch) | |
tree | b45bbc0653b3819dab7bfff1066b114aa2b52b8b /drivers/usb/serial | |
parent | 5ec1862e7b612d804ca10a0475dccf98c857efec (diff) |
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>
Diffstat (limited to 'drivers/usb/serial')
-rw-r--r-- | drivers/usb/serial/whiteheat.c | 8 | ||||
-rw-r--r-- | drivers/usb/serial/whiteheat.h | 4 |
2 files changed, 4 insertions, 8 deletions
diff --git a/drivers/usb/serial/whiteheat.c b/drivers/usb/serial/whiteheat.c index bf16e9e1d84e..27c5f8f9a2d5 100644 --- a/drivers/usb/serial/whiteheat.c +++ b/drivers/usb/serial/whiteheat.c | |||
@@ -1109,7 +1109,7 @@ static int firm_send_command (struct usb_serial_port *port, __u8 command, __u8 * | |||
1109 | command_port = port->serial->port[COMMAND_PORT]; | 1109 | command_port = port->serial->port[COMMAND_PORT]; |
1110 | command_info = usb_get_serial_port_data(command_port); | 1110 | command_info = usb_get_serial_port_data(command_port); |
1111 | spin_lock_irqsave(&command_info->lock, flags); | 1111 | spin_lock_irqsave(&command_info->lock, flags); |
1112 | command_info->command_finished = FALSE; | 1112 | command_info->command_finished = false; |
1113 | 1113 | ||
1114 | transfer_buffer = (__u8 *)command_port->write_urb->transfer_buffer; | 1114 | transfer_buffer = (__u8 *)command_port->write_urb->transfer_buffer; |
1115 | transfer_buffer[0] = command; | 1115 | transfer_buffer[0] = command; |
@@ -1124,12 +1124,12 @@ static int firm_send_command (struct usb_serial_port *port, __u8 command, __u8 * | |||
1124 | spin_unlock_irqrestore(&command_info->lock, flags); | 1124 | spin_unlock_irqrestore(&command_info->lock, flags); |
1125 | 1125 | ||
1126 | /* wait for the command to complete */ | 1126 | /* wait for the command to complete */ |
1127 | wait_event_interruptible_timeout(command_info->wait_command, | 1127 | wait_event_interruptible_timeout(command_info->wait_command, |
1128 | (command_info->command_finished != FALSE), COMMAND_TIMEOUT); | 1128 | (bool)command_info->command_finished, COMMAND_TIMEOUT); |
1129 | 1129 | ||
1130 | spin_lock_irqsave(&command_info->lock, flags); | 1130 | spin_lock_irqsave(&command_info->lock, flags); |
1131 | 1131 | ||
1132 | if (command_info->command_finished == FALSE) { | 1132 | if (command_info->command_finished == false) { |
1133 | dbg("%s - command timed out.", __FUNCTION__); | 1133 | dbg("%s - command timed out.", __FUNCTION__); |
1134 | retval = -ETIMEDOUT; | 1134 | retval = -ETIMEDOUT; |
1135 | goto exit; | 1135 | goto exit; |
diff --git a/drivers/usb/serial/whiteheat.h b/drivers/usb/serial/whiteheat.h index d714eff58dc0..f16079705664 100644 --- a/drivers/usb/serial/whiteheat.h +++ b/drivers/usb/serial/whiteheat.h | |||
@@ -20,10 +20,6 @@ | |||
20 | #define __LINUX_USB_SERIAL_WHITEHEAT_H | 20 | #define __LINUX_USB_SERIAL_WHITEHEAT_H |
21 | 21 | ||
22 | 22 | ||
23 | #define FALSE 0 | ||
24 | #define TRUE 1 | ||
25 | |||
26 | |||
27 | /* WhiteHEAT commands */ | 23 | /* WhiteHEAT commands */ |
28 | #define WHITEHEAT_OPEN 1 /* open the port */ | 24 | #define WHITEHEAT_OPEN 1 /* open the port */ |
29 | #define WHITEHEAT_CLOSE 2 /* close the port */ | 25 | #define WHITEHEAT_CLOSE 2 /* close the port */ |