diff options
author | Ernesto Ramos <ernesto@ti.com> | 2010-07-28 10:45:31 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-07-28 11:22:43 -0400 |
commit | b66e0986f900db194f637149e68c00345863195b (patch) | |
tree | 9890662fe9573f1e872604dc3acd5015925820ab /drivers/staging/tidspbridge/rmgr/dspdrv.c | |
parent | 51d5e099cc9a21960e59bcaee6cc5e2620ea6bb2 (diff) |
staging:ti dspbridge: remove DSP_FAILED macro from rmgr
Since status succeeded is 0, DSP_FAILED macro
is not necessary anymore.
Signed-off-by: Ernesto Ramos <ernesto@ti.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/tidspbridge/rmgr/dspdrv.c')
-rw-r--r-- | drivers/staging/tidspbridge/rmgr/dspdrv.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/staging/tidspbridge/rmgr/dspdrv.c b/drivers/staging/tidspbridge/rmgr/dspdrv.c index 0a10d886e2e..714f348f526 100644 --- a/drivers/staging/tidspbridge/rmgr/dspdrv.c +++ b/drivers/staging/tidspbridge/rmgr/dspdrv.c | |||
@@ -56,7 +56,7 @@ u32 dsp_init(u32 *init_status) | |||
56 | goto func_cont; | 56 | goto func_cont; |
57 | 57 | ||
58 | status = drv_create(&drv_obj); | 58 | status = drv_create(&drv_obj); |
59 | if (DSP_FAILED(status)) { | 59 | if (status) { |
60 | api_exit(); | 60 | api_exit(); |
61 | goto func_cont; | 61 | goto func_cont; |
62 | } | 62 | } |
@@ -68,7 +68,7 @@ u32 dsp_init(u32 *init_status) | |||
68 | /* Attempt to Start the Device */ | 68 | /* Attempt to Start the Device */ |
69 | status = dev_start_device((struct cfg_devnode *) | 69 | status = dev_start_device((struct cfg_devnode *) |
70 | device_node_string); | 70 | device_node_string); |
71 | if (DSP_FAILED(status)) | 71 | if (status) |
72 | (void)drv_release_resources | 72 | (void)drv_release_resources |
73 | ((u32) device_node_string, drv_obj); | 73 | ((u32) device_node_string, drv_obj); |
74 | } else { | 74 | } else { |
@@ -77,7 +77,7 @@ u32 dsp_init(u32 *init_status) | |||
77 | } | 77 | } |
78 | 78 | ||
79 | /* Unwind whatever was loaded */ | 79 | /* Unwind whatever was loaded */ |
80 | if (DSP_FAILED(status)) { | 80 | if (status) { |
81 | /* irrespective of the status of dev_remove_device we conitinue | 81 | /* irrespective of the status of dev_remove_device we conitinue |
82 | * unloading. Get the Driver Object iterate through and remove. | 82 | * unloading. Get the Driver Object iterate through and remove. |
83 | * Reset the status to E_FAIL to avoid going through | 83 | * Reset the status to E_FAIL to avoid going through |
@@ -106,7 +106,7 @@ func_cont: | |||
106 | dev_dbg(bridge, "%s: Failed\n", __func__); | 106 | dev_dbg(bridge, "%s: Failed\n", __func__); |
107 | } /* End api_init_complete2 */ | 107 | } /* End api_init_complete2 */ |
108 | DBC_ENSURE((!status && drv_obj != NULL) || | 108 | DBC_ENSURE((!status && drv_obj != NULL) || |
109 | (DSP_FAILED(status) && drv_obj == NULL)); | 109 | (status && drv_obj == NULL)); |
110 | *init_status = status; | 110 | *init_status = status; |
111 | /* Return the Driver Object */ | 111 | /* Return the Driver Object */ |
112 | return (u32) drv_obj; | 112 | return (u32) drv_obj; |