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>

diff --git a/drivers/usb/serial/whiteheat.c b/drivers/usb/serial/whiteheat.c
index bf16e9e1d84ebb81b01ac098554aec3900421abf..27c5f8f9a2d5e9907f49e094826167eb8c5ddd6d 100644 (file)
--- 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 *
        command_port = port->serial->port[COMMAND_PORT];
        command_info = usb_get_serial_port_data(command_port);
        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[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);
 
        /* wait for the command to complete */
-       wait_event_interruptible_timeout(command_info->wait_command, 
-               (command_info->command_finished != FALSE), COMMAND_TIMEOUT);
+       wait_event_interruptible_timeout(command_info->wait_command,
+               (bool)command_info->command_finished, COMMAND_TIMEOUT);
 
        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__);
                retval = -ETIMEDOUT;
                goto exit;

diff --git a/drivers/usb/serial/whiteheat.h b/drivers/usb/serial/whiteheat.h
index d714eff58dc094203c601b664608645f9199fa14..f16079705664b8b43a594585c7df06feedf8c257 100644 (file)
--- a/drivers/usb/serial/whiteheat.h
+++ b/drivers/usb/serial/whiteheat.h
@@ -20,10 +20,6 @@
 #define __LINUX_USB_SERIAL_WHITEHEAT_H
 
 
-#define FALSE  0
-#define TRUE   1
-
-
 /* WhiteHEAT commands */
 #define WHITEHEAT_OPEN                 1       /* open the port */
 #define WHITEHEAT_CLOSE                        2       /* close the port */