diff options
author | Robert Foss <dev@robertfoss.se> | 2013-08-28 14:51:47 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-08-28 18:28:43 -0400 |
commit | 8114c93e48e642e12a49c96e31a674d6a7946bf1 (patch) | |
tree | bbd806a351e4724a86628f446dac7e3b7a90bd87 | |
parent | 688141d674b4b44b43b46adfa52bff5cf48834bf (diff) |
Staging: crystalhd: fixed whitespace and string style issues
Fixed 3 instances of user-visible string being broken into two string.
Fixed 2 instances of illegal whitespace.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r-- | drivers/staging/crystalhd/crystalhd_cmds.c | 3 | ||||
-rw-r--r-- | drivers/staging/crystalhd/crystalhd_hw.c | 7 | ||||
-rw-r--r-- | drivers/staging/crystalhd/crystalhd_lnx.c | 3 |
3 files changed, 5 insertions, 8 deletions
diff --git a/drivers/staging/crystalhd/crystalhd_cmds.c b/drivers/staging/crystalhd/crystalhd_cmds.c index 3ab502b8c3be..07a2f24d0d47 100644 --- a/drivers/staging/crystalhd/crystalhd_cmds.c +++ b/drivers/staging/crystalhd/crystalhd_cmds.c | |||
@@ -94,8 +94,7 @@ static enum BC_STATUS bc_cproc_notify_mode(struct crystalhd_cmd *ctx, | |||
94 | for (i = 0; i < BC_LINK_MAX_OPENS; i++) { | 94 | for (i = 0; i < BC_LINK_MAX_OPENS; i++) { |
95 | if (ctx->user[i].mode == DTS_DIAG_MODE || | 95 | if (ctx->user[i].mode == DTS_DIAG_MODE || |
96 | ctx->user[i].mode == DTS_PLAYBACK_MODE) { | 96 | ctx->user[i].mode == DTS_PLAYBACK_MODE) { |
97 | BCMLOG_ERR("multiple playback sessions are not " | 97 | BCMLOG_ERR("multiple playback sessions are not supported..\n"); |
98 | "supported..\n"); | ||
99 | return BC_STS_ERR_USAGE; | 98 | return BC_STS_ERR_USAGE; |
100 | } | 99 | } |
101 | } | 100 | } |
diff --git a/drivers/staging/crystalhd/crystalhd_hw.c b/drivers/staging/crystalhd/crystalhd_hw.c index 0c8cb329420f..5845e899ee80 100644 --- a/drivers/staging/crystalhd/crystalhd_hw.c +++ b/drivers/staging/crystalhd/crystalhd_hw.c | |||
@@ -1061,7 +1061,7 @@ static void cpy_pib_to_app(struct c011_pib *src_pib, | |||
1061 | dst_pib->aspect_ratio = src_pib->ppb.aspect_ratio; | 1061 | dst_pib->aspect_ratio = src_pib->ppb.aspect_ratio; |
1062 | dst_pib->colour_primaries = src_pib->ppb.colour_primaries; | 1062 | dst_pib->colour_primaries = src_pib->ppb.colour_primaries; |
1063 | dst_pib->picture_meta_payload = src_pib->ppb.picture_meta_payload; | 1063 | dst_pib->picture_meta_payload = src_pib->ppb.picture_meta_payload; |
1064 | dst_pib->frame_rate = src_pib->resolution ; | 1064 | dst_pib->frame_rate = src_pib->resolution; |
1065 | return; | 1065 | return; |
1066 | } | 1066 | } |
1067 | 1067 | ||
@@ -1553,11 +1553,10 @@ static void crystalhd_rx_isr(struct crystalhd_hw *hw, uint32_t intr_sts) | |||
1553 | crystalhd_get_dnsz(hw, i, &y_dn_sz, &uv_dn_sz); | 1553 | crystalhd_get_dnsz(hw, i, &y_dn_sz, &uv_dn_sz); |
1554 | /* FIXME: jarod: this is where | 1554 | /* FIXME: jarod: this is where |
1555 | my mini pci-e card is tripping up */ | 1555 | my mini pci-e card is tripping up */ |
1556 | BCMLOG(BCMLOG_DBG, "list_index:%x rx[%d] Y:%x " | 1556 | BCMLOG(BCMLOG_DBG, "list_index:%x rx[%d] Y:%x UV:%x Int:%x YDnSz:%x UVDnSz:%x\n", |
1557 | "UV:%x Int:%x YDnSz:%x UVDnSz:%x\n", | ||
1558 | i, hw->stats.rx_errors, y_err_sts, | 1557 | i, hw->stats.rx_errors, y_err_sts, |
1559 | uv_err_sts, intr_sts, y_dn_sz, | 1558 | uv_err_sts, intr_sts, y_dn_sz, |
1560 | uv_dn_sz); | 1559 | uv_dn_sz); |
1561 | hw->rx_list_sts[i] = sts_free; | 1560 | hw->rx_list_sts[i] = sts_free; |
1562 | comp_sts = BC_STS_ERROR; | 1561 | comp_sts = BC_STS_ERROR; |
1563 | break; | 1562 | break; |
diff --git a/drivers/staging/crystalhd/crystalhd_lnx.c b/drivers/staging/crystalhd/crystalhd_lnx.c index c1f6163cdeb8..b17fbf8181cf 100644 --- a/drivers/staging/crystalhd/crystalhd_lnx.c +++ b/drivers/staging/crystalhd/crystalhd_lnx.c | |||
@@ -545,8 +545,7 @@ static int chd_dec_pci_probe(struct pci_dev *pdev, | |||
545 | int rc; | 545 | int rc; |
546 | enum BC_STATUS sts = BC_STS_SUCCESS; | 546 | enum BC_STATUS sts = BC_STS_SUCCESS; |
547 | 547 | ||
548 | BCMLOG(BCMLOG_DBG, "PCI_INFO: Vendor:0x%04x Device:0x%04x " | 548 | BCMLOG(BCMLOG_DBG, "PCI_INFO: Vendor:0x%04x Device:0x%04x s_vendor:0x%04x s_device: 0x%04x\n", |
549 | "s_vendor:0x%04x s_device: 0x%04x\n", | ||
550 | pdev->vendor, pdev->device, pdev->subsystem_vendor, | 549 | pdev->vendor, pdev->device, pdev->subsystem_vendor, |
551 | pdev->subsystem_device); | 550 | pdev->subsystem_device); |
552 | 551 | ||