From 06d745b71d03fe7b692038a35031b99e02ef8cc1 Mon Sep 17 00:00:00 2001 From: Ernesto Ramos Date: Wed, 28 Jul 2010 09:45:32 -0500 Subject: [PATCH] --- yaml --- r: 206026 b: refs/heads/master c: 82f575e5bb27ca30e3e27b537228610cb7ee26c6 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/staging/tidspbridge/services/cfg.c | 13 ++++++------- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/[refs] b/[refs] index ad657009b03c..791594152784 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b66e0986f900db194f637149e68c00345863195b +refs/heads/master: 82f575e5bb27ca30e3e27b537228610cb7ee26c6 diff --git a/trunk/drivers/staging/tidspbridge/services/cfg.c b/trunk/drivers/staging/tidspbridge/services/cfg.c index c3f33f6292f9..a7af74f482dd 100644 --- a/trunk/drivers/staging/tidspbridge/services/cfg.c +++ b/trunk/drivers/staging/tidspbridge/services/cfg.c @@ -102,7 +102,7 @@ int cfg_get_dev_object(struct cfg_devnode *dev_node_obj, "TIOMAP1510"))) *value = (u32)drv_datap->dev_object; } - if (DSP_FAILED(status)) + if (status) pr_err("%s: Failed, status 0x%x\n", __func__, status); return status; } @@ -130,7 +130,7 @@ int cfg_get_exec_file(struct cfg_devnode *dev_node_obj, u32 buf_size, if (!status && drv_datap->base_img) strcpy(str_exec_file, drv_datap->base_img); - if (DSP_FAILED(status)) + if (status) pr_err("%s: Failed, status 0x%x\n", __func__, status); DBC_ENSURE(((status == 0) && (strlen(str_exec_file) <= buf_size)) @@ -174,12 +174,11 @@ int cfg_get_object(u32 *value, u8 dw_type) default: break; } - if (DSP_FAILED(status)) { + if (status) { *value = 0; pr_err("%s: Failed, status 0x%x\n", __func__, status); } - DBC_ENSURE((!status && *value != 0) || - (DSP_FAILED(status) && *value == 0)); + DBC_ENSURE((!status && *value != 0) || (status && *value == 0)); return status; } @@ -217,7 +216,7 @@ int cfg_set_dev_object(struct cfg_devnode *dev_node_obj, u32 value) if (!(strcmp((char *)dev_node_obj, "TIOMAP1510"))) drv_datap->dev_object = (void *) value; } - if (DSP_FAILED(status)) + if (status) pr_err("%s: Failed, status 0x%x\n", __func__, status); return status; @@ -248,7 +247,7 @@ int cfg_set_object(u32 value, u8 dw_type) default: break; } - if (DSP_FAILED(status)) + if (status) pr_err("%s: Failed, status 0x%x\n", __func__, status); return status; }