diff options
author | Lars Lindley <lindley@coyote.org> | 2010-03-10 18:21:20 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-05-11 14:35:36 -0400 |
commit | 641b63f9981a082eeefab3b395203a54dcd6e93b (patch) | |
tree | f1d8a4074fde3b34023a5399b07bfe265f5dd8ea /drivers/staging | |
parent | 15df6385d940ad5486b4c2de8ab45979b13349fe (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')
-rw-r--r-- | drivers/staging/crystalhd/bc_dts_glob_lnx.h | 2 | ||||
-rw-r--r-- | drivers/staging/crystalhd/bc_dts_types.h | 2 | ||||
-rw-r--r-- | drivers/staging/crystalhd/bcm_70012_regs.h | 24 | ||||
-rw-r--r-- | drivers/staging/crystalhd/crystalhd_cmds.c | 20 | ||||
-rw-r--r-- | drivers/staging/crystalhd/crystalhd_cmds.h | 2 | ||||
-rw-r--r-- | drivers/staging/crystalhd/crystalhd_lnx.c | 26 | ||||
-rw-r--r-- | drivers/staging/crystalhd/crystalhd_lnx.h | 4 | ||||
-rw-r--r-- | drivers/staging/crystalhd/crystalhd_misc.c | 18 |
8 files changed, 49 insertions, 49 deletions
diff --git a/drivers/staging/crystalhd/bc_dts_glob_lnx.h b/drivers/staging/crystalhd/bc_dts_glob_lnx.h index b3125e3e037..0fd34e20dc8 100644 --- a/drivers/staging/crystalhd/bc_dts_glob_lnx.h +++ b/drivers/staging/crystalhd/bc_dts_glob_lnx.h | |||
@@ -40,7 +40,7 @@ | |||
40 | #include <sys/time.h> | 40 | #include <sys/time.h> |
41 | #include <time.h> | 41 | #include <time.h> |
42 | #include <arpa/inet.h> | 42 | #include <arpa/inet.h> |
43 | #include <asm/param.h> | 43 | #include <linux/param.h> |
44 | #include <linux/ioctl.h> | 44 | #include <linux/ioctl.h> |
45 | #include <sys/select.h> | 45 | #include <sys/select.h> |
46 | 46 | ||
diff --git a/drivers/staging/crystalhd/bc_dts_types.h b/drivers/staging/crystalhd/bc_dts_types.h index ac0c8171738..95a2f875f1e 100644 --- a/drivers/staging/crystalhd/bc_dts_types.h +++ b/drivers/staging/crystalhd/bc_dts_types.h | |||
@@ -25,7 +25,7 @@ | |||
25 | #ifndef _BC_DTS_TYPES_H_ | 25 | #ifndef _BC_DTS_TYPES_H_ |
26 | #define _BC_DTS_TYPES_H_ | 26 | #define _BC_DTS_TYPES_H_ |
27 | 27 | ||
28 | #ifdef __LINUX_USER__ // Don't include these for KERNEL.. | 28 | #ifdef __LINUX_USER__ /* Don't include these for KERNEL.. */ |
29 | #include <stdint.h> | 29 | #include <stdint.h> |
30 | #endif | 30 | #endif |
31 | 31 | ||
diff --git a/drivers/staging/crystalhd/bcm_70012_regs.h b/drivers/staging/crystalhd/bcm_70012_regs.h index 6922f54e432..f3ab3146cd9 100644 --- a/drivers/staging/crystalhd/bcm_70012_regs.h +++ b/drivers/staging/crystalhd/bcm_70012_regs.h | |||
@@ -25,22 +25,22 @@ | |||
25 | * m = memory, c = core, r = register, f = field, d = data. | 25 | * m = memory, c = core, r = register, f = field, d = data. |
26 | */ | 26 | */ |
27 | #if !defined(GET_FIELD) && !defined(SET_FIELD) | 27 | #if !defined(GET_FIELD) && !defined(SET_FIELD) |
28 | #define BRCM_ALIGN(c,r,f) c##_##r##_##f##_ALIGN | 28 | #define BRCM_ALIGN(c, r, f) c##_##r##_##f##_ALIGN |
29 | #define BRCM_BITS(c,r,f) c##_##r##_##f##_BITS | 29 | #define BRCM_BITS(c, r, f) c##_##r##_##f##_BITS |
30 | #define BRCM_MASK(c,r,f) c##_##r##_##f##_MASK | 30 | #define BRCM_MASK(c, r, f) c##_##r##_##f##_MASK |
31 | #define BRCM_SHIFT(c,r,f) c##_##r##_##f##_SHIFT | 31 | #define BRCM_SHIFT(c, r, f) c##_##r##_##f##_SHIFT |
32 | 32 | ||
33 | #define GET_FIELD(m,c,r,f) \ | 33 | #define GET_FIELD(m, c, r, f) \ |
34 | ((((m) & BRCM_MASK(c,r,f)) >> BRCM_SHIFT(c,r,f)) << BRCM_ALIGN(c,r,f)) | 34 | ((((m) & BRCM_MASK(c, r, f)) >> BRCM_SHIFT(c, r, f)) << BRCM_ALIGN(c, r, f)) |
35 | 35 | ||
36 | #define SET_FIELD(m,c,r,f,d) \ | 36 | #define SET_FIELD(m, c, r, f, d) \ |
37 | ((m) = (((m) & ~BRCM_MASK(c,r,f)) | ((((d) >> BRCM_ALIGN(c,r,f)) << \ | 37 | ((m) = (((m) & ~BRCM_MASK(c, r, f)) | ((((d) >> BRCM_ALIGN(c, r, f)) << \ |
38 | BRCM_SHIFT(c,r,f)) & BRCM_MASK(c,r,f))) \ | 38 | BRCM_SHIFT(c, r, f)) & BRCM_MASK(c, r, f))) \ |
39 | ) | 39 | ) |
40 | 40 | ||
41 | #define SET_TYPE_FIELD(m,c,r,f,d) SET_FIELD(m,c,r,f,c##_##d) | 41 | #define SET_TYPE_FIELD(m, c, r, f, d) SET_FIELD(m, c, r, f, c##_##d) |
42 | #define SET_NAME_FIELD(m,c,r,f,d) SET_FIELD(m,c,r,f,c##_##r##_##f##_##d) | 42 | #define SET_NAME_FIELD(m, c, r, f, d) SET_FIELD(m, c, r, f, c##_##r##_##f##_##d) |
43 | #define SET_VALUE_FIELD(m,c,r,f,d) SET_FIELD(m,c,r,f,d) | 43 | #define SET_VALUE_FIELD(m, c, r, f, d) SET_FIELD(m, c, r, f, d) |
44 | 44 | ||
45 | #endif /* GET & SET */ | 45 | #endif /* GET & SET */ |
46 | 46 | ||
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; |
diff --git a/drivers/staging/crystalhd/crystalhd_cmds.h b/drivers/staging/crystalhd/crystalhd_cmds.h index 6b290aed8e0..9989038b5c1 100644 --- a/drivers/staging/crystalhd/crystalhd_cmds.h +++ b/drivers/staging/crystalhd/crystalhd_cmds.h | |||
@@ -66,7 +66,7 @@ struct crystalhd_cmd { | |||
66 | struct crystalhd_hw hw_ctx; | 66 | struct crystalhd_hw hw_ctx; |
67 | }; | 67 | }; |
68 | 68 | ||
69 | typedef BC_STATUS (*crystalhd_cmd_proc)(struct crystalhd_cmd *, crystalhd_ioctl_data *); | 69 | typedef BC_STATUS(*crystalhd_cmd_proc)(struct crystalhd_cmd *, crystalhd_ioctl_data *); |
70 | 70 | ||
71 | typedef struct _crystalhd_cmd_tbl { | 71 | typedef struct _crystalhd_cmd_tbl { |
72 | uint32_t cmd_id; | 72 | uint32_t cmd_id; |
diff --git a/drivers/staging/crystalhd/crystalhd_lnx.c b/drivers/staging/crystalhd/crystalhd_lnx.c index 3c562f0f86b..58fd91af091 100644 --- a/drivers/staging/crystalhd/crystalhd_lnx.c +++ b/drivers/staging/crystalhd/crystalhd_lnx.c | |||
@@ -51,7 +51,7 @@ static int chd_dec_enable_int(struct crystalhd_adp *adp) | |||
51 | rc = request_irq(adp->pdev->irq, chd_dec_isr, IRQF_SHARED, | 51 | rc = request_irq(adp->pdev->irq, chd_dec_isr, IRQF_SHARED, |
52 | adp->name, (void *)adp); | 52 | adp->name, (void *)adp); |
53 | if (rc) { | 53 | if (rc) { |
54 | BCMLOG_ERR("Interrupt request failed.. \n"); | 54 | BCMLOG_ERR("Interrupt request failed..\n"); |
55 | pci_disable_msi(adp->pdev); | 55 | pci_disable_msi(adp->pdev); |
56 | } | 56 | } |
57 | 57 | ||
@@ -112,7 +112,7 @@ static inline int crystalhd_user_data(unsigned long ud, void *dr, int size, int | |||
112 | int rc; | 112 | int rc; |
113 | 113 | ||
114 | if (!ud || !dr) { | 114 | if (!ud || !dr) { |
115 | BCMLOG_ERR("Invalid arg \n"); | 115 | BCMLOG_ERR("Invalid arg\n"); |
116 | return -EINVAL; | 116 | return -EINVAL; |
117 | } | 117 | } |
118 | 118 | ||
@@ -122,7 +122,7 @@ static inline int crystalhd_user_data(unsigned long ud, void *dr, int size, int | |||
122 | rc = copy_from_user(dr, (void *)ud, size); | 122 | rc = copy_from_user(dr, (void *)ud, size); |
123 | 123 | ||
124 | if (rc) { | 124 | if (rc) { |
125 | BCMLOG_ERR("Invalid args for command \n"); | 125 | BCMLOG_ERR("Invalid args for command\n"); |
126 | rc = -EFAULT; | 126 | rc = -EFAULT; |
127 | } | 127 | } |
128 | 128 | ||
@@ -206,7 +206,7 @@ static int chd_dec_proc_user_data(struct crystalhd_adp *adp, | |||
206 | 206 | ||
207 | rc = crystalhd_user_data(ua, &io->udata, sizeof(io->udata), set); | 207 | rc = crystalhd_user_data(ua, &io->udata, sizeof(io->udata), set); |
208 | if (rc) { | 208 | if (rc) { |
209 | BCMLOG_ERR("failed to %s iodata \n", (set ? "set" : "get")); | 209 | BCMLOG_ERR("failed to %s iodata\n", (set ? "set" : "get")); |
210 | return rc; | 210 | return rc; |
211 | } | 211 | } |
212 | 212 | ||
@@ -308,7 +308,7 @@ static int chd_dec_open(struct inode *in, struct file *fd) | |||
308 | 308 | ||
309 | sts = crystalhd_user_open(&adp->cmds, &uc); | 309 | sts = crystalhd_user_open(&adp->cmds, &uc); |
310 | if (sts != BC_STS_SUCCESS) { | 310 | if (sts != BC_STS_SUCCESS) { |
311 | BCMLOG_ERR("cmd_user_open - %d \n", sts); | 311 | BCMLOG_ERR("cmd_user_open - %d\n", sts); |
312 | rc = -EBUSY; | 312 | rc = -EBUSY; |
313 | } | 313 | } |
314 | 314 | ||
@@ -326,7 +326,7 @@ static int chd_dec_close(struct inode *in, struct file *fd) | |||
326 | 326 | ||
327 | BCMLOG_ENTER; | 327 | BCMLOG_ENTER; |
328 | if (!adp) { | 328 | if (!adp) { |
329 | BCMLOG_ERR("Invalid adp \n"); | 329 | BCMLOG_ERR("Invalid adp\n"); |
330 | return -EINVAL; | 330 | return -EINVAL; |
331 | } | 331 | } |
332 | 332 | ||
@@ -521,7 +521,7 @@ static void __devexit chd_dec_pci_remove(struct pci_dev *pdev) | |||
521 | 521 | ||
522 | sts = crystalhd_delete_cmd_context(&pinfo->cmds); | 522 | sts = crystalhd_delete_cmd_context(&pinfo->cmds); |
523 | if (sts != BC_STS_SUCCESS) | 523 | if (sts != BC_STS_SUCCESS) |
524 | BCMLOG_ERR("cmd delete :%d \n", sts); | 524 | BCMLOG_ERR("cmd delete :%d\n", sts); |
525 | 525 | ||
526 | chd_dec_release_chdev(pinfo); | 526 | chd_dec_release_chdev(pinfo); |
527 | 527 | ||
@@ -581,7 +581,7 @@ static int __devinit chd_dec_pci_probe(struct pci_dev *pdev, | |||
581 | chd_dec_init_chdev(pinfo); | 581 | chd_dec_init_chdev(pinfo); |
582 | rc = chd_dec_enable_int(pinfo); | 582 | rc = chd_dec_enable_int(pinfo); |
583 | if (rc) { | 583 | if (rc) { |
584 | BCMLOG_ERR("_enable_int err:%d \n", rc); | 584 | BCMLOG_ERR("_enable_int err:%d\n", rc); |
585 | pci_disable_device(pdev); | 585 | pci_disable_device(pdev); |
586 | return -ENODEV; | 586 | return -ENODEV; |
587 | } | 587 | } |
@@ -601,7 +601,7 @@ static int __devinit chd_dec_pci_probe(struct pci_dev *pdev, | |||
601 | 601 | ||
602 | sts = crystalhd_setup_cmd_context(&pinfo->cmds, pinfo); | 602 | sts = crystalhd_setup_cmd_context(&pinfo->cmds, pinfo); |
603 | if (sts != BC_STS_SUCCESS) { | 603 | if (sts != BC_STS_SUCCESS) { |
604 | BCMLOG_ERR("cmd setup :%d \n", sts); | 604 | BCMLOG_ERR("cmd setup :%d\n", sts); |
605 | pci_disable_device(pdev); | 605 | pci_disable_device(pdev); |
606 | return -ENODEV; | 606 | return -ENODEV; |
607 | } | 607 | } |
@@ -675,7 +675,7 @@ int chd_dec_pci_resume(struct pci_dev *pdev) | |||
675 | 675 | ||
676 | rc = chd_dec_enable_int(adp); | 676 | rc = chd_dec_enable_int(adp); |
677 | if (rc) { | 677 | if (rc) { |
678 | BCMLOG_ERR("_enable_int err:%d \n", rc); | 678 | BCMLOG_ERR("_enable_int err:%d\n", rc); |
679 | pci_disable_device(pdev); | 679 | pci_disable_device(pdev); |
680 | return -ENODEV; | 680 | return -ENODEV; |
681 | } | 681 | } |
@@ -738,13 +738,13 @@ static int __init chd_dec_module_init(void) | |||
738 | int rc; | 738 | int rc; |
739 | 739 | ||
740 | chd_set_log_level(NULL, "debug"); | 740 | chd_set_log_level(NULL, "debug"); |
741 | BCMLOG(BCMLOG_DATA, "Loading crystalhd %d.%d.%d \n", | 741 | BCMLOG(BCMLOG_DATA, "Loading crystalhd %d.%d.%d\n", |
742 | crystalhd_kmod_major, crystalhd_kmod_minor, crystalhd_kmod_rev); | 742 | crystalhd_kmod_major, crystalhd_kmod_minor, crystalhd_kmod_rev); |
743 | 743 | ||
744 | rc = pci_register_driver(&bc_chd_70012_driver); | 744 | rc = pci_register_driver(&bc_chd_70012_driver); |
745 | 745 | ||
746 | if (rc < 0) | 746 | if (rc < 0) |
747 | BCMLOG_ERR("Could not find any devices. err:%d \n", rc); | 747 | BCMLOG_ERR("Could not find any devices. err:%d\n", rc); |
748 | 748 | ||
749 | return rc; | 749 | return rc; |
750 | } | 750 | } |
@@ -752,7 +752,7 @@ module_init(chd_dec_module_init); | |||
752 | 752 | ||
753 | static void __exit chd_dec_module_cleanup(void) | 753 | static void __exit chd_dec_module_cleanup(void) |
754 | { | 754 | { |
755 | BCMLOG(BCMLOG_DATA, "unloading crystalhd %d.%d.%d \n", | 755 | BCMLOG(BCMLOG_DATA, "unloading crystalhd %d.%d.%d\n", |
756 | crystalhd_kmod_major, crystalhd_kmod_minor, crystalhd_kmod_rev); | 756 | crystalhd_kmod_major, crystalhd_kmod_minor, crystalhd_kmod_rev); |
757 | 757 | ||
758 | pci_unregister_driver(&bc_chd_70012_driver); | 758 | pci_unregister_driver(&bc_chd_70012_driver); |
diff --git a/drivers/staging/crystalhd/crystalhd_lnx.h b/drivers/staging/crystalhd/crystalhd_lnx.h index d338ae97a4c..eee4926f04e 100644 --- a/drivers/staging/crystalhd/crystalhd_lnx.h +++ b/drivers/staging/crystalhd/crystalhd_lnx.h | |||
@@ -42,11 +42,11 @@ | |||
42 | #include <linux/pagemap.h> | 42 | #include <linux/pagemap.h> |
43 | #include <linux/vmalloc.h> | 43 | #include <linux/vmalloc.h> |
44 | 44 | ||
45 | #include <asm/io.h> | 45 | #include <linux/io.h> |
46 | #include <asm/irq.h> | 46 | #include <asm/irq.h> |
47 | #include <asm/pgtable.h> | 47 | #include <asm/pgtable.h> |
48 | #include <asm/system.h> | 48 | #include <asm/system.h> |
49 | #include <asm/uaccess.h> | 49 | #include <linux/uaccess.h> |
50 | 50 | ||
51 | #include "crystalhd_cmds.h" | 51 | #include "crystalhd_cmds.h" |
52 | 52 | ||
diff --git a/drivers/staging/crystalhd/crystalhd_misc.c b/drivers/staging/crystalhd/crystalhd_misc.c index 73593b078b3..d1346672531 100644 --- a/drivers/staging/crystalhd/crystalhd_misc.c +++ b/drivers/staging/crystalhd/crystalhd_misc.c | |||
@@ -237,7 +237,7 @@ BC_STATUS crystalhd_mem_rd(struct crystalhd_adp *adp, uint32_t start_off, | |||
237 | 237 | ||
238 | if (!adp || !rd_buff || | 238 | if (!adp || !rd_buff || |
239 | (bc_chk_dram_range(adp, start_off, dw_cnt) != BC_STS_SUCCESS)) { | 239 | (bc_chk_dram_range(adp, start_off, dw_cnt) != BC_STS_SUCCESS)) { |
240 | BCMLOG_ERR("Invalid arg \n"); | 240 | BCMLOG_ERR("Invalid arg\n"); |
241 | return BC_STS_INV_ARG; | 241 | return BC_STS_INV_ARG; |
242 | } | 242 | } |
243 | for (ix = 0; ix < dw_cnt; ix++) | 243 | for (ix = 0; ix < dw_cnt; ix++) |
@@ -265,7 +265,7 @@ BC_STATUS crystalhd_mem_wr(struct crystalhd_adp *adp, uint32_t start_off, | |||
265 | 265 | ||
266 | if (!adp || !wr_buff || | 266 | if (!adp || !wr_buff || |
267 | (bc_chk_dram_range(adp, start_off, dw_cnt) != BC_STS_SUCCESS)) { | 267 | (bc_chk_dram_range(adp, start_off, dw_cnt) != BC_STS_SUCCESS)) { |
268 | BCMLOG_ERR("Invalid arg \n"); | 268 | BCMLOG_ERR("Invalid arg\n"); |
269 | return BC_STS_INV_ARG; | 269 | return BC_STS_INV_ARG; |
270 | } | 270 | } |
271 | 271 | ||
@@ -293,7 +293,7 @@ BC_STATUS crystalhd_pci_cfg_rd(struct crystalhd_adp *adp, uint32_t off, | |||
293 | int rc = 0; | 293 | int rc = 0; |
294 | 294 | ||
295 | if (!adp || !val) { | 295 | if (!adp || !val) { |
296 | BCMLOG_ERR("Invalid arg \n"); | 296 | BCMLOG_ERR("Invalid arg\n"); |
297 | return BC_STS_INV_ARG; | 297 | return BC_STS_INV_ARG; |
298 | } | 298 | } |
299 | 299 | ||
@@ -338,7 +338,7 @@ BC_STATUS crystalhd_pci_cfg_wr(struct crystalhd_adp *adp, uint32_t off, | |||
338 | int rc = 0; | 338 | int rc = 0; |
339 | 339 | ||
340 | if (!adp || !val) { | 340 | if (!adp || !val) { |
341 | BCMLOG_ERR("Invalid arg \n"); | 341 | BCMLOG_ERR("Invalid arg\n"); |
342 | return BC_STS_INV_ARG; | 342 | return BC_STS_INV_ARG; |
343 | } | 343 | } |
344 | 344 | ||
@@ -685,7 +685,7 @@ BC_STATUS crystalhd_map_dio(struct crystalhd_adp *adp, void *ubuff, | |||
685 | int i = 0, rw = 0, res = 0, nr_pages = 0, skip_fb_sg = 0; | 685 | int i = 0, rw = 0, res = 0, nr_pages = 0, skip_fb_sg = 0; |
686 | 686 | ||
687 | if (!adp || !ubuff || !ubuff_sz || !dio_hnd) { | 687 | if (!adp || !ubuff || !ubuff_sz || !dio_hnd) { |
688 | BCMLOG_ERR("Invalid arg \n"); | 688 | BCMLOG_ERR("Invalid arg\n"); |
689 | return BC_STS_INV_ARG; | 689 | return BC_STS_INV_ARG; |
690 | } | 690 | } |
691 | /* Compute pages */ | 691 | /* Compute pages */ |
@@ -791,7 +791,7 @@ BC_STATUS crystalhd_map_dio(struct crystalhd_adp *adp, void *ubuff, | |||
791 | dio->sg_cnt = pci_map_sg(adp->pdev, dio->sg, | 791 | dio->sg_cnt = pci_map_sg(adp->pdev, dio->sg, |
792 | dio->page_cnt, dio->direction); | 792 | dio->page_cnt, dio->direction); |
793 | if (dio->sg_cnt <= 0) { | 793 | if (dio->sg_cnt <= 0) { |
794 | BCMLOG_ERR("sg map %d-%d \n", dio->sg_cnt, dio->page_cnt); | 794 | BCMLOG_ERR("sg map %d-%d\n", dio->sg_cnt, dio->page_cnt); |
795 | crystalhd_unmap_dio(adp, dio); | 795 | crystalhd_unmap_dio(adp, dio); |
796 | return BC_STS_ERROR; | 796 | return BC_STS_ERROR; |
797 | } | 797 | } |
@@ -826,7 +826,7 @@ BC_STATUS crystalhd_unmap_dio(struct crystalhd_adp *adp, crystalhd_dio_req *dio) | |||
826 | int j = 0; | 826 | int j = 0; |
827 | 827 | ||
828 | if (!adp || !dio) { | 828 | if (!adp || !dio) { |
829 | BCMLOG_ERR("Invalid arg \n"); | 829 | BCMLOG_ERR("Invalid arg\n"); |
830 | return BC_STS_INV_ARG; | 830 | return BC_STS_INV_ARG; |
831 | } | 831 | } |
832 | 832 | ||
@@ -947,7 +947,7 @@ void crystalhd_destroy_dio_pool(struct crystalhd_adp *adp) | |||
947 | adp->fill_byte_pool = NULL; | 947 | adp->fill_byte_pool = NULL; |
948 | } | 948 | } |
949 | 949 | ||
950 | BCMLOG(BCMLOG_DBG, "Released dio pool %d \n", count); | 950 | BCMLOG(BCMLOG_DBG, "Released dio pool %d\n", count); |
951 | } | 951 | } |
952 | 952 | ||
953 | /** | 953 | /** |
@@ -973,7 +973,7 @@ int __devinit crystalhd_create_elem_pool(struct crystalhd_adp *adp, | |||
973 | for (i = 0; i < pool_size; i++) { | 973 | for (i = 0; i < pool_size; i++) { |
974 | temp = kzalloc(sizeof(*temp), GFP_KERNEL); | 974 | temp = kzalloc(sizeof(*temp), GFP_KERNEL); |
975 | if (!temp) { | 975 | if (!temp) { |
976 | BCMLOG_ERR("kalloc failed \n"); | 976 | BCMLOG_ERR("kalloc failed\n"); |
977 | return -ENOMEM; | 977 | return -ENOMEM; |
978 | } | 978 | } |
979 | crystalhd_free_elem(adp, temp); | 979 | crystalhd_free_elem(adp, temp); |