staging: tidspbridge: remove custom TRUE FALSE

bool has standard true and false, we dont need to introduce
our own TRUE and FALSE macros.

Signed-off-by: Nishanth Menon <nm@ti.com>
Reviewed-by: Felipe Contreras <felipe.contreras@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/drivers/staging/tidspbridge/core/tiomap3430.c b/drivers/staging/tidspbridge/core/tiomap3430.c
index cf65af4099e2482ba431d9e75c6b2d0e5ceb7b2f..71813f1fa0a35cf019c34d42275d0dd61f454127 100644 (file)
--- a/drivers/staging/tidspbridge/core/tiomap3430.c
+++ b/drivers/staging/tidspbridge/core/tiomap3430.c
@@ -1863,10 +1863,10 @@ bool wait_for_start(struct bridge_dev_context *dev_context, u32 dw_sync_addr)
        while (*((volatile u16 *)dw_sync_addr) && --timeout)
                udelay(10);
 
-       /*  If timed out: return FALSE */
+       /*  If timed out: return false */
        if (!timeout) {
                pr_err("%s: Timed out waiting DSP to Start\n", __func__);
-               return FALSE;
+               return false;
        }
-       return TRUE;
+       return true;
 }

diff --git a/drivers/staging/tidspbridge/dynload/dload_internal.h b/drivers/staging/tidspbridge/dynload/dload_internal.h
index 803756198bc516bcbbbbe2681cc56887f1a09d3f..5a17e6ce71958a69f858f2933c5eb785911f10e8 100644 (file)
--- a/drivers/staging/tidspbridge/dynload/dload_internal.h
+++ b/drivers/staging/tidspbridge/dynload/dload_internal.h
@@ -23,9 +23,6 @@
  * Internal state definitions for the dynamic loader
  */
 
-#define TRUE 1
-#define FALSE 0
-
 /* type used for relocation intermediate results */
 typedef s32 rvalue;
 

diff --git a/drivers/staging/tidspbridge/dynload/header.h b/drivers/staging/tidspbridge/dynload/header.h
index 5cef3600157e85f4b4f6db77f4ef96880a4be5ba..04623f17574ab3ef37f37c20296fa3c0f4a57d1a 100644 (file)
--- a/drivers/staging/tidspbridge/dynload/header.h
+++ b/drivers/staging/tidspbridge/dynload/header.h
@@ -14,8 +14,6 @@
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
-#define TRUE 1
-#define FALSE 0
 #ifndef NULL
 #define NULL 0
 #endif

diff --git a/drivers/staging/tidspbridge/gen/gb.c b/drivers/staging/tidspbridge/gen/gb.c
index f1a9dd37c4ebdd01837f92322affe2396851a9d7..d007233aa2a7a7d1ed2940e84930b4ab387c79d7 100644 (file)
--- a/drivers/staging/tidspbridge/gen/gb.c
+++ b/drivers/staging/tidspbridge/gen/gb.c
@@ -161,7 +161,7 @@ bool gb_test(struct gb_t_map *map, u32 bitn)
 
        mask = 1L << (bitn % BITS_PER_LONG);
        word = map->words[bitn / BITS_PER_LONG];
-       state = word & mask ? TRUE : FALSE;
+       state = word & mask ? true : false;
 
        return state;
 }

diff --git a/drivers/staging/tidspbridge/hw/GlobalTypes.h b/drivers/staging/tidspbridge/hw/GlobalTypes.h
index 95fc8ca503698626e73bacdee370ceac35a06032..c67c91be1a4e528e7603a4a1fb2584c4497a4101 100644 (file)
--- a/drivers/staging/tidspbridge/hw/GlobalTypes.h
+++ b/drivers/staging/tidspbridge/hw/GlobalTypes.h
@@ -19,16 +19,6 @@
 #ifndef _GLOBALTYPES_H
 #define _GLOBALTYPES_H
 
-/*
- * Definition: TRUE, FALSE
- *
- * DESCRIPTION:  Boolean Definitions
- */
-#ifndef TRUE
-#define FALSE  0
-#define TRUE   (!(FALSE))
-#endif
-
 /*
  * Definition: NULL
  *

diff --git a/drivers/staging/tidspbridge/include/dspbridge/dbtype.h b/drivers/staging/tidspbridge/include/dspbridge/dbtype.h
index de65a825214c92318010f55ac61592bd04a7c4af..0b2cb93c050e7887dce3c1957a86325854dc5d49 100644 (file)
--- a/drivers/staging/tidspbridge/include/dspbridge/dbtype.h
+++ b/drivers/staging/tidspbridge/include/dspbridge/dbtype.h
@@ -41,17 +41,6 @@
 #define CONST   const
 #endif
 
-/*===========================================================================*/
-/*  Boolean constants */
-/*===========================================================================*/
-
-#ifndef FALSE
-#define FALSE   0
-#endif
-#ifndef TRUE
-#define TRUE    1
-#endif
-
 /*===========================================================================*/
 /*  NULL    (Definition is language specific) */
 /*===========================================================================*/

diff --git a/drivers/staging/tidspbridge/pmgr/dbll.c b/drivers/staging/tidspbridge/pmgr/dbll.c
index 16dbde8cf886c16d18d623faab836796d5375795..05601dc55276e5db43c61b65ad619f42aa198ea3 100644 (file)
--- a/drivers/staging/tidspbridge/pmgr/dbll.c
+++ b/drivers/staging/tidspbridge/pmgr/dbll.c
@@ -1226,7 +1226,7 @@ static int dbll_rmm_alloc(struct dynamic_loader_allocate *this,
        int status = 0;
        u32 mem_sect_type;
        struct rmm_addr rmm_addr_obj;
-       s32 ret = TRUE;
+       s32 ret = true;
        unsigned stype = DLOAD_SECTION_TYPE(info->type);
        char *token = NULL;
        char *sz_sec_last_token = NULL;
@@ -1315,7 +1315,7 @@ func_cont:
                                                    rmm_handle, mem_sect_type,
                                                    alloc_size, align,
                                                    (u32 *) &rmm_addr_obj,
-                                                   seg_id, req, FALSE);
+                                                   seg_id, req, false);
        }
        if (DSP_FAILED(status)) {
                ret = false;

diff --git a/drivers/staging/tidspbridge/pmgr/dmm.c b/drivers/staging/tidspbridge/pmgr/dmm.c
index c4d6cbc4a31cfae7a054dd0fba105fed14502faa..d45cd72640e0a45776b8656dd805df5772c5cc2d 100644 (file)
--- a/drivers/staging/tidspbridge/pmgr/dmm.c
+++ b/drivers/staging/tidspbridge/pmgr/dmm.c
@@ -503,7 +503,7 @@ u32 dmm_mem_map_dump(struct dmm_object *dmm_mgr)
                for (i = 0; i < table_size; i +=
                     virtual_mapping_table[i].region_size) {
                        curr_node = virtual_mapping_table + i;
-                       if (curr_node->reserved == TRUE) {
+                       if (curr_node->reserved) {
                                /*printk("RESERVED size = 0x%x, "
                                   "Map size = 0x%x\n",
                                   (curr_node->region_size * PG_SIZE4K),

diff --git a/drivers/staging/tidspbridge/rmgr/node.c b/drivers/staging/tidspbridge/rmgr/node.c
index 760110839581af51b521a39437b7ad8dfca3053c..c931721c04c2ecd1ceea2f64471e77c993b0532e 100644 (file)
--- a/drivers/staging/tidspbridge/rmgr/node.c
+++ b/drivers/staging/tidspbridge/rmgr/node.c
@@ -2620,7 +2620,7 @@ static void delete_node(struct node_object *hnode,
 
        /* Free all SM address translator resources */
        if (xlator) {
-               (void)cmm_xlator_delete(xlator, TRUE);  /* force free */
+               (void)cmm_xlator_delete(xlator, true);  /* force free */
                xlator = NULL;
        }