aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/staging/crystalhd/crystalhd_cmds.c
diff options
context:
space:
mode:
authorLars Lindley <lindley@coyote.org>2010-03-10 18:21:20 -0500
committerGreg Kroah-Hartman <gregkh@suse.de>2010-05-11 14:35:36 -0400
commit641b63f9981a082eeefab3b395203a54dcd6e93b (patch)
treef1d8a4074fde3b34023a5399b07bfe265f5dd8ea /drivers/staging/crystalhd/crystalhd_cmds.c
parent15df6385d940ad5486b4c2de8ab45979b13349fe (diff)
Staging: crystalhd: Whitespace fixes, indentation fixes and 3 changed #includes
These patches fixes some whitspace and indentation warnings from checkpatch.pl Also these changed #includes: bc_dts_glob_lnx.h:43: WARNING: Use #include <linux/param.h> instead of <asm/param.h> rystalhd_lnx.h:45: WARNING: Use #include <linux/io.h> instead of <asm/io.h> crystalhd_lnx.h:49: WARNING: Use #include <linux/uaccess.h> instead of <asm/uaccess.h> It all compiles fine, but I don't have the hardware to test with.. Signed-off-by: Lars Lindley <lindley@coyote.org> Cc: Jarod Wilson <jarod@redhat.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/crystalhd/crystalhd_cmds.c')
-rw-r--r--drivers/staging/crystalhd/crystalhd_cmds.c20
1 files changed, 10 insertions, 10 deletions
diff --git a/drivers/staging/crystalhd/crystalhd_cmds.c b/drivers/staging/crystalhd/crystalhd_cmds.c
index 26145a8d0f7..d826715809d 100644
--- a/drivers/staging/crystalhd/crystalhd_cmds.c
+++ b/drivers/staging/crystalhd/crystalhd_cmds.c
@@ -88,7 +88,7 @@ static BC_STATUS bc_cproc_notify_mode(struct crystalhd_cmd *ctx,
88 return BC_STS_SUCCESS; 88 return BC_STS_SUCCESS;
89 } 89 }
90 if (ctx->state != BC_LINK_INVALID) { 90 if (ctx->state != BC_LINK_INVALID) {
91 BCMLOG_ERR("Link invalid state %d \n", ctx->state); 91 BCMLOG_ERR("Link invalid state %d\n", ctx->state);
92 return BC_STS_ERR_USAGE; 92 return BC_STS_ERR_USAGE;
93 } 93 }
94 /* Check for duplicate playback sessions..*/ 94 /* Check for duplicate playback sessions..*/
@@ -301,7 +301,7 @@ static BC_STATUS bc_cproc_download_fw(struct crystalhd_cmd *ctx,
301 } 301 }
302 302
303 if (ctx->state != BC_LINK_INVALID) { 303 if (ctx->state != BC_LINK_INVALID) {
304 BCMLOG_ERR("Link invalid state %d \n", ctx->state); 304 BCMLOG_ERR("Link invalid state %d\n", ctx->state);
305 return BC_STS_ERR_USAGE; 305 return BC_STS_ERR_USAGE;
306 } 306 }
307 307
@@ -309,7 +309,7 @@ static BC_STATUS bc_cproc_download_fw(struct crystalhd_cmd *ctx,
309 idata->add_cdata_sz); 309 idata->add_cdata_sz);
310 310
311 if (sts != BC_STS_SUCCESS) { 311 if (sts != BC_STS_SUCCESS) {
312 BCMLOG_ERR("Firmware Download Failure!! - %d\n", sts); 312 BCMLOG_ERR("Firmware Download Failure!! - %d\n", sts)
313 } else 313 } else
314 ctx->state |= BC_LINK_INIT; 314 ctx->state |= BC_LINK_INIT;
315 315
@@ -335,7 +335,7 @@ static BC_STATUS bc_cproc_do_fw_cmd(struct crystalhd_cmd *ctx, crystalhd_ioctl_d
335 uint32_t *cmd; 335 uint32_t *cmd;
336 336
337 if (!(ctx->state & BC_LINK_INIT)) { 337 if (!(ctx->state & BC_LINK_INIT)) {
338 BCMLOG_ERR("Link invalid state %d \n", ctx->state); 338 BCMLOG_ERR("Link invalid state %d\n", ctx->state);
339 return BC_STS_ERR_USAGE; 339 return BC_STS_ERR_USAGE;
340 } 340 }
341 341
@@ -379,7 +379,7 @@ static void bc_proc_in_completion(crystalhd_dio_req *dio_hnd,
379 return; 379 return;
380 } 380 }
381 if (sts == BC_STS_IO_USER_ABORT) 381 if (sts == BC_STS_IO_USER_ABORT)
382 return; 382 return;
383 383
384 dio_hnd->uinfo.comp_sts = sts; 384 dio_hnd->uinfo.comp_sts = sts;
385 dio_hnd->uinfo.ev_sts = 1; 385 dio_hnd->uinfo.ev_sts = 1;
@@ -452,7 +452,7 @@ static BC_STATUS bc_cproc_hw_txdma(struct crystalhd_cmd *ctx,
452 if (!rc) { 452 if (!rc) {
453 return dio->uinfo.comp_sts; 453 return dio->uinfo.comp_sts;
454 } else if (rc == -EBUSY) { 454 } else if (rc == -EBUSY) {
455 BCMLOG(BCMLOG_DBG, "_tx_post() T/O \n"); 455 BCMLOG(BCMLOG_DBG, "_tx_post() T/O\n");
456 sts = BC_STS_TIMEOUT; 456 sts = BC_STS_TIMEOUT;
457 } else if (rc == -EINTR) { 457 } else if (rc == -EINTR) {
458 BCMLOG(BCMLOG_DBG, "Tx Wait Signal int.\n"); 458 BCMLOG(BCMLOG_DBG, "Tx Wait Signal int.\n");
@@ -482,7 +482,7 @@ static BC_STATUS bc_cproc_check_inbuffs(bool pin, void *ubuff, uint32_t ub_sz,
482 482
483 /* Check for alignment */ 483 /* Check for alignment */
484 if (((uintptr_t)ubuff) & 0x03) { 484 if (((uintptr_t)ubuff) & 0x03) {
485 BCMLOG_ERR("%s-->Un-aligned address not implemented yet.. %p \n", 485 BCMLOG_ERR("%s-->Un-aligned address not implemented yet.. %p\n",
486 ((pin) ? "TX" : "RX"), ubuff); 486 ((pin) ? "TX" : "RX"), ubuff);
487 return BC_STS_NOT_IMPL; 487 return BC_STS_NOT_IMPL;
488 } 488 }
@@ -523,7 +523,7 @@ static BC_STATUS bc_cproc_proc_input(struct crystalhd_cmd *ctx, crystalhd_ioctl_
523 523
524 sts = crystalhd_map_dio(ctx->adp, ubuff, ub_sz, 0, 0, 1, &dio_hnd); 524 sts = crystalhd_map_dio(ctx->adp, ubuff, ub_sz, 0, 0, 1, &dio_hnd);
525 if (sts != BC_STS_SUCCESS) { 525 if (sts != BC_STS_SUCCESS) {
526 BCMLOG_ERR("dio map - %d \n", sts); 526 BCMLOG_ERR("dio map - %d\n", sts);
527 return sts; 527 return sts;
528 } 528 }
529 529
@@ -563,7 +563,7 @@ static BC_STATUS bc_cproc_add_cap_buff(struct crystalhd_cmd *ctx,
563 sts = crystalhd_map_dio(ctx->adp, ubuff, ub_sz, uv_off, 563 sts = crystalhd_map_dio(ctx->adp, ubuff, ub_sz, uv_off,
564 en_422, 0, &dio_hnd); 564 en_422, 0, &dio_hnd);
565 if (sts != BC_STS_SUCCESS) { 565 if (sts != BC_STS_SUCCESS) {
566 BCMLOG_ERR("dio map - %d \n", sts); 566 BCMLOG_ERR("dio map - %d\n", sts);
567 return sts; 567 return sts;
568 } 568 }
569 569
@@ -1026,7 +1026,7 @@ crystalhd_cmd_proc crystalhd_get_cmd_proc(struct crystalhd_cmd *ctx, uint32_t cm
1026 if (g_crystalhd_cproc_tbl[i].cmd_id == cmd) { 1026 if (g_crystalhd_cproc_tbl[i].cmd_id == cmd) {
1027 if ((uc->mode == DTS_MONITOR_MODE) && 1027 if ((uc->mode == DTS_MONITOR_MODE) &&
1028 (g_crystalhd_cproc_tbl[i].block_mon)) { 1028 (g_crystalhd_cproc_tbl[i].block_mon)) {
1029 BCMLOG(BCMLOG_INFO, "Blocking cmd %d \n", cmd); 1029 BCMLOG(BCMLOG_INFO, "Blocking cmd %d\n", cmd);
1030 break; 1030 break;
1031 } 1031 }
1032 cproc = g_crystalhd_cproc_tbl[i].cmd_proc; 1032 cproc = g_crystalhd_cproc_tbl[i].cmd_proc;