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>

diff --git a/drivers/staging/crystalhd/crystalhd_cmds.c b/drivers/staging/crystalhd/crystalhd_cmds.c
index 3ab502b8c3be7b9acb634ea0af7f037001e45421..07a2f24d0d47de4d2e4ea119bcc52e3a38a4b911 100644 (file)
--- 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,
        for (i = 0; i < BC_LINK_MAX_OPENS; i++) {
                if (ctx->user[i].mode == DTS_DIAG_MODE ||
                    ctx->user[i].mode == DTS_PLAYBACK_MODE) {
-                       BCMLOG_ERR("multiple playback sessions are not "
-                                  "supported..\n");
+                       BCMLOG_ERR("multiple playback sessions are not supported..\n");
                        return BC_STS_ERR_USAGE;
                }
        }

diff --git a/drivers/staging/crystalhd/crystalhd_hw.c b/drivers/staging/crystalhd/crystalhd_hw.c
index 0c8cb329420f2120cf43d04bb334d874a8f2bdba..5845e899ee806402d39dbfbe621aa7f2639818d2 100644 (file)
--- 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,
        dst_pib->aspect_ratio        = src_pib->ppb.aspect_ratio;
        dst_pib->colour_primaries     = src_pib->ppb.colour_primaries;
        dst_pib->picture_meta_payload = src_pib->ppb.picture_meta_payload;
-       dst_pib->frame_rate             = src_pib->resolution ;
+       dst_pib->frame_rate             = src_pib->resolution;
        return;
 }
 
@@ -1553,11 +1553,10 @@ static void crystalhd_rx_isr(struct crystalhd_hw *hw, uint32_t intr_sts)
                                crystalhd_get_dnsz(hw, i, &y_dn_sz, &uv_dn_sz);
                                /* FIXME: jarod: this is where
                                 my mini pci-e card is tripping up */
-                               BCMLOG(BCMLOG_DBG, "list_index:%x rx[%d] Y:%x "
-                                      "UV:%x Int:%x YDnSz:%x UVDnSz:%x\n",
+                               BCMLOG(BCMLOG_DBG, "list_index:%x rx[%d] Y:%x UV:%x Int:%x YDnSz:%x UVDnSz:%x\n",
                                       i, hw->stats.rx_errors, y_err_sts,
                                       uv_err_sts, intr_sts, y_dn_sz,
-                                                uv_dn_sz);
+                                      uv_dn_sz);
                                hw->rx_list_sts[i] = sts_free;
                                comp_sts = BC_STS_ERROR;
                                break;

diff --git a/drivers/staging/crystalhd/crystalhd_lnx.c b/drivers/staging/crystalhd/crystalhd_lnx.c
index c1f6163cdeb81b545bdbe592b8c871b9c5310ce1..b17fbf8181cf424459eb3010a1ca4922117ec931 100644 (file)
--- 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,
        int rc;
        enum BC_STATUS sts = BC_STS_SUCCESS;
 
-       BCMLOG(BCMLOG_DBG, "PCI_INFO: Vendor:0x%04x Device:0x%04x "
-              "s_vendor:0x%04x s_device: 0x%04x\n",
+       BCMLOG(BCMLOG_DBG, "PCI_INFO: Vendor:0x%04x Device:0x%04x s_vendor:0x%04x s_device: 0x%04x\n",
               pdev->vendor, pdev->device, pdev->subsystem_vendor,
               pdev->subsystem_device);