?  search:
summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
blame | history | raw | HEAD
Update from omapzoom 18-Aug-2008
[bridge-dev.git] / 0018-BRIDGE-cosmetic_checkpatch_fixes.patch
blob70a33c15d3b3366ed9ebfa04194d2293616575f7
1 From: Omar Ramirez Luna <x00omar@ti.com>
2 Subject: [PATCH] BRIDGE: Cosmetic changes reported from checkpatch
3
4 Cosmetic changes reported from checkpatch
5
6 Signed-off-by: Omar Ramirez Luna <x00omar@ti.com>
7 Acked-by: Hari Kanigeri <h-kanigeri2@ti.com>
8 ---
9 drivers/dsp/bridge/gen/gs.c | 2 +-
10 drivers/dsp/bridge/gen/gt.c | 2 +-
11 drivers/dsp/bridge/pmgr/dbll.c | 4 ++--
12 drivers/dsp/bridge/pmgr/dev.c | 3 ++-
13 drivers/dsp/bridge/pmgr/wcd.c | 2 ++
14 drivers/dsp/bridge/rmgr/drv.c | 2 +-
15 drivers/dsp/bridge/rmgr/drv_interface.c | 12 +++++++-----
16 drivers/dsp/bridge/rmgr/node.c | 17 +++++++++++------
17 drivers/dsp/bridge/rmgr/proc.c | 19 +++++++++++++------
18 drivers/dsp/bridge/rmgr/strm.c | 14 ++++++++++----
19 drivers/dsp/bridge/services/cfg.c | 2 +-
20 drivers/dsp/bridge/services/mem.c | 2 +-
21 drivers/dsp/bridge/services/ntfy.c | 2 +-
22 drivers/dsp/bridge/services/services.c | 2 +-
23 drivers/dsp/bridge/services/sync.c | 2 +-
24 drivers/dsp/bridge/wmd/ue_deh.c | 6 ++++--
25 arch/arm/plat-omap/include/bridge/resourcecleanup.h | 3 ++-
26 17 files changed, 61 insertions(+), 35 deletions(-)
27
28 Index: lk/drivers/dsp/bridge/gen/gs.c
29 ===================================================================
30 --- lk.orig/drivers/dsp/bridge/gen/gs.c 2008-08-18 10:38:36.000000000 +0300
31 +++ lk/drivers/dsp/bridge/gen/gs.c 2008-08-18 10:38:40.000000000 +0300
32 @@ -98,7 +98,7 @@
33 */
34 void GS_init(void)
35 {
36 - static bool curInit = false;
37 + static bool curInit;
38
39 if (curInit == false) {
40 curInit = true;
41 Index: lk/drivers/dsp/bridge/gen/gt.c
42 ===================================================================
43 --- lk.orig/drivers/dsp/bridge/gen/gt.c 2008-08-18 10:38:40.000000000 +0300
44 +++ lk/drivers/dsp/bridge/gen/gt.c 2008-08-18 10:38:40.000000000 +0300
45 @@ -53,7 +53,7 @@
46
47 static unsigned char *GT_tMask[GT_BOUND];
48
49 -static bool curInit = false;
50 +static bool curInit;
51 static char *separator;
52 static unsigned char tabMem[GT_BOUND][sizeof(unsigned char) * GT_BOUND];
53
54 Index: lk/drivers/dsp/bridge/pmgr/dbll.c
55 ===================================================================
56 --- lk.orig/drivers/dsp/bridge/pmgr/dbll.c 2008-08-18 10:38:39.000000000 +0300
57 +++ lk/drivers/dsp/bridge/pmgr/dbll.c 2008-08-18 10:38:40.000000000 +0300
58 @@ -221,13 +221,13 @@
59 static void symDelete(void *sp);
60
61 #if GT_TRACE
62 -static struct GT_Mask DBLL_debugMask = { NULL, NULL }; /* GT trace variable */
63 +static struct GT_Mask DBLL_debugMask = { NULL, NULL }; /* GT trace variable */
64 #endif
65
66 static u32 cRefs; /* module reference count */
67
68 /* Symbol Redefinition */
69 -static int bRedefinedSymbol = 0;
70 +static int bRedefinedSymbol;
71 static int bGblSearch = 1;
72
73 /*
74 Index: lk/drivers/dsp/bridge/pmgr/dev.c
75 ===================================================================
76 --- lk.orig/drivers/dsp/bridge/pmgr/dev.c 2008-08-18 10:38:37.000000000 +0300
77 +++ lk/drivers/dsp/bridge/pmgr/dev.c 2008-08-18 10:38:40.000000000 +0300
78 @@ -899,7 +899,8 @@
79 status = DEV_GetCodMgr(hDevObject, &hCodMgr);
80 if (DSP_SUCCEEDED(status)) {
81 DBC_Assert(hCodMgr != NULL);
82 - status = COD_GetSymValue(hCodMgr, (char *)pstrSym, pulValue);
83 + status = COD_GetSymValue(hCodMgr, (char *)pstrSym,
84 + pulValue);
85 }
86 } else {
87 status = DSP_EHANDLE;
88 Index: lk/drivers/dsp/bridge/pmgr/wcd.c
89 ===================================================================
90 --- lk.orig/drivers/dsp/bridge/pmgr/wcd.c 2008-08-18 10:38:39.000000000 +0300
91 +++ lk/drivers/dsp/bridge/pmgr/wcd.c 2008-08-18 10:38:40.000000000 +0300
92 @@ -174,7 +174,9 @@
93 } ;
94
95 /* ----------------------------------- Globals */
96 +#if GT_TRACE
97 static struct GT_Mask WCD_debugMask = { NULL, NULL }; /* Core VxD Mask */
98 +#endif
99 static u32 WCD_cRefs;
100
101 /*
102 Index: lk/drivers/dsp/bridge/rmgr/drv.c
103 ===================================================================
104 --- lk.orig/drivers/dsp/bridge/rmgr/drv.c 2008-08-18 10:38:39.000000000 +0300
105 +++ lk/drivers/dsp/bridge/rmgr/drv.c 2008-08-18 10:38:40.000000000 +0300
106 @@ -425,7 +425,7 @@
107 }
108
109 /* Actual Node De-Allocation */
110 -DSP_STATUS DRV_ProcFreeNodeRes(HANDLE hPCtxt)
111 +static DSP_STATUS DRV_ProcFreeNodeRes(HANDLE hPCtxt)
112 {
113 struct PROCESS_CONTEXT *pCtxt = (struct PROCESS_CONTEXT *)hPCtxt;
114 DSP_STATUS status = DSP_SOK;
115 Index: lk/drivers/dsp/bridge/rmgr/drv_interface.c
116 ===================================================================
117 --- lk.orig/drivers/dsp/bridge/rmgr/drv_interface.c 2008-08-18 10:38:39.000000000 +0300
118 +++ lk/drivers/dsp/bridge/rmgr/drv_interface.c 2008-08-18 10:38:40.000000000 +0300
119 @@ -136,7 +136,7 @@
120 #if !defined(CONFIG_ARCH_OMAP2430) && !defined(CONFIG_ARCH_OMAP3430)
121 static int tc_wordswapon = 1; /* Default value is always TRUE */
122 #else
123 -static int tc_wordswapon = 0; /* Default value is always true */
124 +static int tc_wordswapon; /* Default value is always true */
125 #endif
126
127
128 @@ -577,7 +577,7 @@
129 DRV_RemoveAllResources(pCtxtclosed);
130 if (pCtxtclosed->hProcessor != NULL) {
131 DRV_GetProcCtxtList(&pCtxttraverse,
132 - (struct DRV_OBJECT *)hDrvObject);
133 + (struct DRV_OBJECT *)hDrvObject);
134 if (pCtxttraverse->next == NULL) {
135 PROC_Detach(pCtxtclosed->hProcessor);
136 } else {
137 @@ -606,8 +606,9 @@
138 }
139 }
140 pTmp = pCtxtclosed->next;
141 - DRV_RemoveProcContext((struct DRV_OBJECT *)hDrvObject, pCtxtclosed,
142 - (void *)pCtxtclosed->pid);
143 + DRV_RemoveProcContext((struct DRV_OBJECT *)hDrvObject,
144 + pCtxtclosed,
145 + (void *)pCtxtclosed->pid);
146 } else {
147 pTmp = pCtxtclosed->next;
148 }
149 @@ -616,7 +617,8 @@
150 func_cont:
151 dsp_status = CFG_GetObject((u32 *)&hDrvObject, REG_DRV_OBJECT);
152 if (DSP_SUCCEEDED(dsp_status))
153 - dsp_status = DRV_InsertProcContext((struct DRV_OBJECT *)hDrvObject, &pPctxt);
154 + dsp_status = DRV_InsertProcContext(
155 + (struct DRV_OBJECT *)hDrvObject, &pPctxt);
156
157 if (pPctxt != NULL) {
158 PRCS_GetCurrentHandle(&hProcess);
159 Index: lk/drivers/dsp/bridge/rmgr/node.c
160 ===================================================================
161 --- lk.orig/drivers/dsp/bridge/rmgr/node.c 2008-08-18 10:38:39.000000000 +0300
162 +++ lk/drivers/dsp/bridge/rmgr/node.c 2008-08-18 10:38:40.000000000 +0300
163 @@ -776,10 +776,13 @@
164 res_status = CFG_GetObject((u32 *)&hDrvObject,
165 REG_DRV_OBJECT);
166 if (DSP_SUCCEEDED(res_status)) {
167 - DRV_GetProcContext((u32)hProcess, (struct DRV_OBJECT *)hDrvObject, &pPctxt,
168 - *phNode, 0);
169 + DRV_GetProcContext((u32)hProcess,
170 + (struct DRV_OBJECT *)hDrvObject,
171 + &pPctxt, *phNode, 0);
172 if (pPctxt == NULL) {
173 - DRV_InsertProcContext((struct DRV_OBJECT *)hDrvObject, &pPctxt);
174 + DRV_InsertProcContext(
175 + (struct DRV_OBJECT *)hDrvObject,
176 + &pPctxt);
177 if (pPctxt != NULL) {
178 DRV_ProcUpdatestate(pPctxt,
179 PROC_RES_ALLOCATED);
180 @@ -795,8 +798,9 @@
181 res_status = CFG_GetObject((u32 *)&hDrvObject,
182 REG_DRV_OBJECT);
183 if (DSP_SUCCEEDED(res_status)) {
184 - DRV_GetProcContext((u32)hProcess, (struct DRV_OBJECT *)hDrvObject, &pPctxt,
185 - *phNode, 0);
186 + DRV_GetProcContext((u32)hProcess,
187 + (struct DRV_OBJECT *)hDrvObject,
188 + &pPctxt, *phNode, 0);
189 if (pPctxt != NULL) {
190 DRV_InsertNodeResElement(*phNode, &nodeRes,
191 pPctxt);
192 @@ -1775,7 +1779,8 @@
193 if (DSP_FAILED(res_status))
194 goto func_cont;
195
196 - DRV_GetProcContext((u32)hProcess, (struct DRV_OBJECT *)hDrvObject, &pCtxt, hNode, 0);
197 + DRV_GetProcContext((u32)hProcess, (struct DRV_OBJECT *)hDrvObject,
198 + &pCtxt, hNode, 0);
199 if (pCtxt == NULL)
200 goto func_cont;
201
202 Index: lk/drivers/dsp/bridge/rmgr/proc.c
203 ===================================================================
204 --- lk.orig/drivers/dsp/bridge/rmgr/proc.c 2008-08-18 10:38:39.000000000 +0300
205 +++ lk/drivers/dsp/bridge/rmgr/proc.c 2008-08-18 10:38:40.000000000 +0300
206 @@ -365,7 +365,8 @@
207 if (DSP_FAILED(res_status))
208 goto func_cont;
209
210 - DRV_GetProcContext((u32)hProcess, (struct DRV_OBJECT *)hDRVObject, &pPctxt, NULL, 0);
211 + DRV_GetProcContext((u32)hProcess, (struct DRV_OBJECT *)hDRVObject,
212 + &pPctxt, NULL, 0);
213 if (pPctxt == NULL) {
214 DRV_InsertProcContext((struct DRV_OBJECT *)hDRVObject, &pPctxt);
215 if (pPctxt != NULL) {
216 @@ -377,7 +378,9 @@
217 PRCS_GetCurrentHandle(&hProcess);
218 res_status = CFG_GetObject((u32 *)&hDRVObject, REG_DRV_OBJECT);
219 if (DSP_SUCCEEDED(res_status)) {
220 - DRV_GetProcContext((u32)hProcess, (struct DRV_OBJECT *)hDRVObject, &pPctxt, NULL, 0);
221 + DRV_GetProcContext((u32)hProcess,
222 + (struct DRV_OBJECT *)hDRVObject, &pPctxt,
223 + NULL, 0);
224 if (pPctxt != NULL)
225 pPctxt->hProcessor = (DSP_HPROCESSOR)*phProcessor;
226
227 @@ -634,7 +637,9 @@
228 res_status = CFG_GetObject((u32 *)&hDRVObject, REG_DRV_OBJECT);
229 /* res_status = CFG_GetObject(REG_DRV_OBJECT, (u32*)&hDRVObject); */
230 if (DSP_SUCCEEDED(res_status)) {
231 - DRV_GetProcContext((u32)hProcess, (struct DRV_OBJECT *)hDRVObject, &pPctxt, NULL, 0);
232 + DRV_GetProcContext((u32)hProcess,
233 + (struct DRV_OBJECT *)hDRVObject, &pPctxt,
234 + NULL, 0);
235 if (pPctxt != NULL)
236 pPctxt->hProcessor = NULL;
237 }
238 @@ -1383,8 +1388,9 @@
239 res_status = CFG_GetObject((u32 *)&hDrvObject,
240 REG_DRV_OBJECT);
241 if (DSP_SUCCEEDED(res_status)) {
242 - if (DRV_GetProcContext((u32)hProcess, (struct DRV_OBJECT *)hDrvObject, &pCtxt,
243 - NULL, (u32)pMpuAddr) != DSP_ENOTFOUND) {
244 + if (DRV_GetProcContext((u32)hProcess,
245 + (struct DRV_OBJECT *)hDrvObject, &pCtxt, NULL,
246 + (u32)pMpuAddr) != DSP_ENOTFOUND) {
247 DRV_InsertDMMResElement(&dmmRes, pCtxt);
248 DRV_UpdateDMMResElement(dmmRes, (u32)pMpuAddr,
249 ulSize, (u32)pReqAddr,
250 @@ -1737,7 +1743,8 @@
251 if (DSP_FAILED(res_status))
252 goto func_end;
253
254 - DRV_GetProcContext((u32)hProcess, (struct DRV_OBJECT *)hDrvObject, &pCtxt, NULL, (u32)pMapAddr);
255 + DRV_GetProcContext((u32)hProcess, (struct DRV_OBJECT *)hDrvObject,
256 + &pCtxt, NULL, (u32)pMapAddr);
257 if (pCtxt != NULL) {
258 if (DRV_GetDMMResElement((u32)pMapAddr, &dmmRes, pCtxt) !=
259 DSP_ENOTFOUND)
260 Index: lk/drivers/dsp/bridge/rmgr/strm.c
261 ===================================================================
262 --- lk.orig/drivers/dsp/bridge/rmgr/strm.c 2008-08-18 10:38:39.000000000 +0300
263 +++ lk/drivers/dsp/bridge/rmgr/strm.c 2008-08-18 10:38:40.000000000 +0300
264 @@ -209,7 +209,8 @@
265 if (DSP_FAILED(res_status))
266 goto func_end;
267
268 - DRV_GetProcContext((u32)hProcess, (struct DRV_OBJECT *)hDrvObject, &pCtxt, NULL, 0);
269 + DRV_GetProcContext((u32)hProcess, (struct DRV_OBJECT *)hDrvObject,
270 + &pCtxt, NULL, 0);
271 if (pCtxt != NULL) {
272 if (DRV_GetSTRMResElement(hStrm, &hSTRMRes, pCtxt) !=
273 DSP_ENOTFOUND) {
274 @@ -280,7 +281,8 @@
275 if (DSP_FAILED(res_status))
276 goto func_end;
277
278 - DRV_GetProcContext((u32)hProcess, (struct DRV_OBJECT *)hDrvObject, &pCtxt, NULL, 0);
279 + DRV_GetProcContext((u32)hProcess, (struct DRV_OBJECT *)hDrvObject,
280 + &pCtxt, NULL, 0);
281 if (pCtxt != NULL) {
282 if (DRV_GetSTRMResElement(hStrm, &hSTRMRes, pCtxt) !=
283 DSP_ENOTFOUND) {
284 @@ -428,7 +430,9 @@
285 PRCS_GetCurrentHandle(&hProcess);
286 res_status = CFG_GetObject((u32 *)&hDrvObject, REG_DRV_OBJECT);
287 if (DSP_SUCCEEDED(res_status)) {
288 - DRV_GetProcContext((u32)hProcess, (struct DRV_OBJECT *)hDrvObject, &pCtxt, NULL, 0);
289 + DRV_GetProcContext((u32)hProcess,
290 + (struct DRV_OBJECT *)hDrvObject, &pCtxt,
291 + NULL, 0);
292 if (pCtxt != NULL) {
293 if (DRV_GetSTRMResElement(hStrm, hSTRMRes, pCtxt) !=
294 DSP_ENOTFOUND) {
295 @@ -773,7 +777,9 @@
296 PRCS_GetCurrentHandle(&hProcess);
297 res_status = CFG_GetObject((u32 *)&hDrvObject, REG_DRV_OBJECT);
298 if (DSP_SUCCEEDED(res_status)) {
299 - DRV_GetProcContext((u32)hProcess, (struct DRV_OBJECT *)hDrvObject, &pCtxt, hNode, 0);
300 + DRV_GetProcContext((u32)hProcess,
301 + (struct DRV_OBJECT *)hDrvObject, &pCtxt,
302 + hNode, 0);
303 if (pCtxt != NULL)
304 DRV_ProcInsertSTRMResElement(*phStrm, &hSTRMRes, pCtxt);
305
306 Index: lk/drivers/dsp/bridge/services/cfg.c
307 ===================================================================
308 --- lk.orig/drivers/dsp/bridge/services/cfg.c 2008-08-18 10:38:37.000000000 +0300
309 +++ lk/drivers/dsp/bridge/services/cfg.c 2008-08-18 10:38:40.000000000 +0300
310 @@ -99,7 +99,7 @@
311
312 /* ----------------------------------- Globals */
313 #if GT_TRACE
314 -static struct GT_Mask CFG_debugMask = { NULL, NULL }; /* CFG debug Mask */
315 +static struct GT_Mask CFG_debugMask = { NULL, NULL }; /* CFG debug Mask */
316 #endif
317
318 /*
319 Index: lk/drivers/dsp/bridge/services/mem.c
320 ===================================================================
321 --- lk.orig/drivers/dsp/bridge/services/mem.c 2008-08-18 10:38:39.000000000 +0300
322 +++ lk/drivers/dsp/bridge/services/mem.c 2008-08-18 10:38:40.000000000 +0300
323 @@ -82,7 +82,7 @@
324
325 static u32 cRefs; /* module reference count */
326
327 -static bool extPhysMemPoolEnabled = false;
328 +static bool extPhysMemPoolEnabled;
329
330 struct extPhysMemPool {
331 u32 physMemBase;
332 Index: lk/drivers/dsp/bridge/services/ntfy.c
333 ===================================================================
334 --- lk.orig/drivers/dsp/bridge/services/ntfy.c 2008-08-18 10:38:37.000000000 +0300
335 +++ lk/drivers/dsp/bridge/services/ntfy.c 2008-08-18 10:38:40.000000000 +0300
336 @@ -92,7 +92,7 @@
337
338 /* ----------------------------------- Globals */
339 #if GT_TRACE
340 -static struct GT_Mask NTFY_debugMask = { NULL, NULL }; /* GT trace variable */
341 +static struct GT_Mask NTFY_debugMask = { NULL, NULL }; /* GT trace variable */
342 #endif
343
344 /* ----------------------------------- Function Prototypes */
345 Index: lk/drivers/dsp/bridge/services/services.c
346 ===================================================================
347 --- lk.orig/drivers/dsp/bridge/services/services.c 2008-08-18 10:38:37.000000000 +0300
348 +++ lk/drivers/dsp/bridge/services/services.c 2008-08-18 10:38:40.000000000 +0300
349 @@ -63,7 +63,7 @@
350
351 /* ----------------------------------- Globals */
352 #if GT_TRACE
353 -static struct GT_Mask SERVICES_debugMask = { NULL, NULL }; /* GT trace var. */
354 +static struct GT_Mask SERVICES_debugMask = { NULL, NULL }; /* GT trace var. */
355 #endif
356
357 static u32 cRefs; /* SERVICES module reference count */
358 Index: lk/drivers/dsp/bridge/services/sync.c
359 ===================================================================
360 --- lk.orig/drivers/dsp/bridge/services/sync.c 2008-08-18 10:38:37.000000000 +0300
361 +++ lk/drivers/dsp/bridge/services/sync.c 2008-08-18 10:38:40.000000000 +0300
362 @@ -108,7 +108,7 @@
363
364 /* ----------------------------------- Globals */
365 #if GT_TRACE
366 -static struct GT_Mask SYNC_debugMask = { NULL, NULL }; /* GT trace variable */
367 +static struct GT_Mask SYNC_debugMask = { NULL, NULL }; /* GT trace variable */
368 #endif
369
370 static int test_and_set(volatile void *ptr, int val)
371 Index: lk/drivers/dsp/bridge/wmd/ue_deh.c
372 ===================================================================
373 --- lk.orig/drivers/dsp/bridge/wmd/ue_deh.c 2008-08-18 10:38:39.000000000 +0300
374 +++ lk/drivers/dsp/bridge/wmd/ue_deh.c 2008-08-18 10:38:40.000000000 +0300
375 @@ -69,7 +69,8 @@
376 #include "_deh.h"
377 #include <_tiomap_mmu.h>
378
379 -static struct HW_MMUMapAttrs_t mapAttrs = { HW_LITTLE_ENDIAN, HW_ELEM_SIZE_16BIT,
380 +static struct HW_MMUMapAttrs_t mapAttrs = { HW_LITTLE_ENDIAN,
381 + HW_ELEM_SIZE_16BIT,
382 HW_MMU_CPUES} ;
383 #define VirtToPhys(x) ((x) - PAGE_OFFSET + PHYS_OFFSET)
384 /*
385 @@ -405,7 +406,8 @@
386 case DSP_MMUFAULT:
387 /* MMU fault routine should have set err info
388 * structure */
389 - pDevContext = (struct WMD_DEV_CONTEXT *)pDehMgr->hWmdContext;
390 + pDevContext = (struct WMD_DEV_CONTEXT *)pDehMgr->
391 + hWmdContext;
392 pDehMgr->errInfo.dwErrMask = DSP_MMUFAULT;
393 printk(KERN_INFO "WMD_DEH_Notify: DSP_MMUFAULT,"
394 "errInfo = 0x%x\n", dwErrInfo);
395 Index: lk/arch/arm/plat-omap/include/bridge/resourcecleanup.h
396 ===================================================================
397 --- lk.orig/arch/arm/plat-omap/include/bridge/resourcecleanup.h 2008-08-18 10:38:39.000000000 +0300
398 +++ lk/arch/arm/plat-omap/include/bridge/resourcecleanup.h 2008-08-18 10:38:40.000000000 +0300
399 @@ -23,7 +23,8 @@
400 extern DSP_STATUS DRV_GetProcCtxtList(struct PROCESS_CONTEXT **pPctxt,
401 struct DRV_OBJECT *hDrvObject);
402
403 -extern DSP_STATUS DRV_InsertProcContext(struct DRV_OBJECT *hDrVObject, HANDLE hPCtxt);
404 +extern DSP_STATUS DRV_InsertProcContext(struct DRV_OBJECT *hDrVObject,
405 + HANDLE hPCtxt);
406
407 extern DSP_STATUS DRV_RemoveAllDMMResElements(HANDLE pCtxt);
408
my dev tree for bridge