diff options
author | Nishanth Menon <nm@ti.com> | 2010-07-12 18:55:59 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-07-22 13:48:42 -0400 |
commit | 5e7680679e4ac852db7b03e232f3472f86d4c47f (patch) | |
tree | 403eab253aeed7290b47bff30ef86bfa77b0213d /drivers/staging | |
parent | c8c1ad8ce317c1e213db47f094d6eee8dec7d280 (diff) |
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>
Diffstat (limited to 'drivers/staging')
-rw-r--r-- | drivers/staging/tidspbridge/core/tiomap3430.c | 6 | ||||
-rw-r--r-- | drivers/staging/tidspbridge/dynload/dload_internal.h | 3 | ||||
-rw-r--r-- | drivers/staging/tidspbridge/dynload/header.h | 2 | ||||
-rw-r--r-- | drivers/staging/tidspbridge/gen/gb.c | 2 | ||||
-rw-r--r-- | drivers/staging/tidspbridge/hw/GlobalTypes.h | 10 | ||||
-rw-r--r-- | drivers/staging/tidspbridge/include/dspbridge/dbtype.h | 11 | ||||
-rw-r--r-- | drivers/staging/tidspbridge/pmgr/dbll.c | 4 | ||||
-rw-r--r-- | drivers/staging/tidspbridge/pmgr/dmm.c | 2 | ||||
-rw-r--r-- | drivers/staging/tidspbridge/rmgr/node.c | 2 |
9 files changed, 8 insertions, 34 deletions
diff --git a/drivers/staging/tidspbridge/core/tiomap3430.c b/drivers/staging/tidspbridge/core/tiomap3430.c index cf65af4099e..71813f1fa0a 100644 --- 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) | |||
1863 | while (*((volatile u16 *)dw_sync_addr) && --timeout) | 1863 | while (*((volatile u16 *)dw_sync_addr) && --timeout) |
1864 | udelay(10); | 1864 | udelay(10); |
1865 | 1865 | ||
1866 | /* If timed out: return FALSE */ | 1866 | /* If timed out: return false */ |
1867 | if (!timeout) { | 1867 | if (!timeout) { |
1868 | pr_err("%s: Timed out waiting DSP to Start\n", __func__); | 1868 | pr_err("%s: Timed out waiting DSP to Start\n", __func__); |
1869 | return FALSE; | 1869 | return false; |
1870 | } | 1870 | } |
1871 | return TRUE; | 1871 | return true; |
1872 | } | 1872 | } |
diff --git a/drivers/staging/tidspbridge/dynload/dload_internal.h b/drivers/staging/tidspbridge/dynload/dload_internal.h index 803756198bc..5a17e6ce719 100644 --- a/drivers/staging/tidspbridge/dynload/dload_internal.h +++ b/drivers/staging/tidspbridge/dynload/dload_internal.h | |||
@@ -23,9 +23,6 @@ | |||
23 | * Internal state definitions for the dynamic loader | 23 | * Internal state definitions for the dynamic loader |
24 | */ | 24 | */ |
25 | 25 | ||
26 | #define TRUE 1 | ||
27 | #define FALSE 0 | ||
28 | |||
29 | /* type used for relocation intermediate results */ | 26 | /* type used for relocation intermediate results */ |
30 | typedef s32 rvalue; | 27 | typedef s32 rvalue; |
31 | 28 | ||
diff --git a/drivers/staging/tidspbridge/dynload/header.h b/drivers/staging/tidspbridge/dynload/header.h index 5cef3600157..04623f17574 100644 --- a/drivers/staging/tidspbridge/dynload/header.h +++ b/drivers/staging/tidspbridge/dynload/header.h | |||
@@ -14,8 +14,6 @@ | |||
14 | * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. | 14 | * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. |
15 | */ | 15 | */ |
16 | 16 | ||
17 | #define TRUE 1 | ||
18 | #define FALSE 0 | ||
19 | #ifndef NULL | 17 | #ifndef NULL |
20 | #define NULL 0 | 18 | #define NULL 0 |
21 | #endif | 19 | #endif |
diff --git a/drivers/staging/tidspbridge/gen/gb.c b/drivers/staging/tidspbridge/gen/gb.c index f1a9dd37c4e..d007233aa2a 100644 --- 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) | |||
161 | 161 | ||
162 | mask = 1L << (bitn % BITS_PER_LONG); | 162 | mask = 1L << (bitn % BITS_PER_LONG); |
163 | word = map->words[bitn / BITS_PER_LONG]; | 163 | word = map->words[bitn / BITS_PER_LONG]; |
164 | state = word & mask ? TRUE : FALSE; | 164 | state = word & mask ? true : false; |
165 | 165 | ||
166 | return state; | 166 | return state; |
167 | } | 167 | } |
diff --git a/drivers/staging/tidspbridge/hw/GlobalTypes.h b/drivers/staging/tidspbridge/hw/GlobalTypes.h index 95fc8ca5036..c67c91be1a4 100644 --- a/drivers/staging/tidspbridge/hw/GlobalTypes.h +++ b/drivers/staging/tidspbridge/hw/GlobalTypes.h | |||
@@ -20,16 +20,6 @@ | |||
20 | #define _GLOBALTYPES_H | 20 | #define _GLOBALTYPES_H |
21 | 21 | ||
22 | /* | 22 | /* |
23 | * Definition: TRUE, FALSE | ||
24 | * | ||
25 | * DESCRIPTION: Boolean Definitions | ||
26 | */ | ||
27 | #ifndef TRUE | ||
28 | #define FALSE 0 | ||
29 | #define TRUE (!(FALSE)) | ||
30 | #endif | ||
31 | |||
32 | /* | ||
33 | * Definition: NULL | 23 | * Definition: NULL |
34 | * | 24 | * |
35 | * DESCRIPTION: Invalid pointer | 25 | * DESCRIPTION: Invalid pointer |
diff --git a/drivers/staging/tidspbridge/include/dspbridge/dbtype.h b/drivers/staging/tidspbridge/include/dspbridge/dbtype.h index de65a825214..0b2cb93c050 100644 --- a/drivers/staging/tidspbridge/include/dspbridge/dbtype.h +++ b/drivers/staging/tidspbridge/include/dspbridge/dbtype.h | |||
@@ -42,17 +42,6 @@ | |||
42 | #endif | 42 | #endif |
43 | 43 | ||
44 | /*===========================================================================*/ | 44 | /*===========================================================================*/ |
45 | /* Boolean constants */ | ||
46 | /*===========================================================================*/ | ||
47 | |||
48 | #ifndef FALSE | ||
49 | #define FALSE 0 | ||
50 | #endif | ||
51 | #ifndef TRUE | ||
52 | #define TRUE 1 | ||
53 | #endif | ||
54 | |||
55 | /*===========================================================================*/ | ||
56 | /* NULL (Definition is language specific) */ | 45 | /* NULL (Definition is language specific) */ |
57 | /*===========================================================================*/ | 46 | /*===========================================================================*/ |
58 | 47 | ||
diff --git a/drivers/staging/tidspbridge/pmgr/dbll.c b/drivers/staging/tidspbridge/pmgr/dbll.c index 16dbde8cf88..05601dc5527 100644 --- 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, | |||
1226 | int status = 0; | 1226 | int status = 0; |
1227 | u32 mem_sect_type; | 1227 | u32 mem_sect_type; |
1228 | struct rmm_addr rmm_addr_obj; | 1228 | struct rmm_addr rmm_addr_obj; |
1229 | s32 ret = TRUE; | 1229 | s32 ret = true; |
1230 | unsigned stype = DLOAD_SECTION_TYPE(info->type); | 1230 | unsigned stype = DLOAD_SECTION_TYPE(info->type); |
1231 | char *token = NULL; | 1231 | char *token = NULL; |
1232 | char *sz_sec_last_token = NULL; | 1232 | char *sz_sec_last_token = NULL; |
@@ -1315,7 +1315,7 @@ func_cont: | |||
1315 | rmm_handle, mem_sect_type, | 1315 | rmm_handle, mem_sect_type, |
1316 | alloc_size, align, | 1316 | alloc_size, align, |
1317 | (u32 *) &rmm_addr_obj, | 1317 | (u32 *) &rmm_addr_obj, |
1318 | seg_id, req, FALSE); | 1318 | seg_id, req, false); |
1319 | } | 1319 | } |
1320 | if (DSP_FAILED(status)) { | 1320 | if (DSP_FAILED(status)) { |
1321 | ret = false; | 1321 | ret = false; |
diff --git a/drivers/staging/tidspbridge/pmgr/dmm.c b/drivers/staging/tidspbridge/pmgr/dmm.c index c4d6cbc4a31..d45cd72640e 100644 --- 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) | |||
503 | for (i = 0; i < table_size; i += | 503 | for (i = 0; i < table_size; i += |
504 | virtual_mapping_table[i].region_size) { | 504 | virtual_mapping_table[i].region_size) { |
505 | curr_node = virtual_mapping_table + i; | 505 | curr_node = virtual_mapping_table + i; |
506 | if (curr_node->reserved == TRUE) { | 506 | if (curr_node->reserved) { |
507 | /*printk("RESERVED size = 0x%x, " | 507 | /*printk("RESERVED size = 0x%x, " |
508 | "Map size = 0x%x\n", | 508 | "Map size = 0x%x\n", |
509 | (curr_node->region_size * PG_SIZE4K), | 509 | (curr_node->region_size * PG_SIZE4K), |
diff --git a/drivers/staging/tidspbridge/rmgr/node.c b/drivers/staging/tidspbridge/rmgr/node.c index 76011083958..c931721c04c 100644 --- 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, | |||
2620 | 2620 | ||
2621 | /* Free all SM address translator resources */ | 2621 | /* Free all SM address translator resources */ |
2622 | if (xlator) { | 2622 | if (xlator) { |
2623 | (void)cmm_xlator_delete(xlator, TRUE); /* force free */ | 2623 | (void)cmm_xlator_delete(xlator, true); /* force free */ |
2624 | xlator = NULL; | 2624 | xlator = NULL; |
2625 | } | 2625 | } |
2626 | 2626 | ||