Merge tag 'upstream-3.8-rc1' of git://git.infradead.org/linux-ubi

[firefly-linux-kernel-4.4.55.git] / drivers / staging / crystalhd / crystalhd_hw.c

diff --git a/drivers/staging/crystalhd/crystalhd_hw.c b/drivers/staging/crystalhd/crystalhd_hw.c
index eeddee9a6050632fd08cc56b38792502c1e81cab..e617d2fcbb1f7c85baadff62514b0db849aaad85 100644 (file)
--- a/drivers/staging/crystalhd/crystalhd_hw.c
+++ b/drivers/staging/crystalhd/crystalhd_hw.c
@@ -22,10 +22,11 @@
  * along with this driver.  If not, see <http://www.gnu.org/licenses/>.
  **********************************************************************/
 
+#include "crystalhd.h"
+
 #include <linux/pci.h>
 #include <linux/slab.h>
 #include <linux/delay.h>
-#include "crystalhd_hw.h"
 
 /* Functions internal to this file */
 
@@ -766,7 +767,7 @@ static enum BC_STATUS crystalhd_hw_fill_desc(struct crystalhd_dio_req *ioreq,
        crystalhd_hw_dump_desc(desc, last_desc_ix, 1);
 
        if (count != xfr_sz) {
-               BCMLOG_ERR("interal error sz curr:%x exp:%x\n", count, xfr_sz);
+               BCMLOG_ERR("internal error sz curr:%x exp:%x\n", count, xfr_sz);
                return BC_STS_ERROR;
        }
 
@@ -1627,7 +1628,6 @@ enum BC_STATUS crystalhd_download_fw(struct crystalhd_adp *adp, void *buffer, ui
        uint32_t fw_sig_len = 36;
        uint32_t dram_offset = BC_FWIMG_ST_ADDR, sig_reg;
 
-       BCMLOG_ENTER;
 
        if (!adp || !buffer || !sz) {
                BCMLOG_ERR("Invalid Params.\n");
@@ -1724,8 +1724,6 @@ enum BC_STATUS crystalhd_do_fw_cmd(struct crystalhd_hw *hw,
 
        crystalhd_create_event(&fw_cmd_event);
 
-       BCMLOG_ENTER;
-
        if (!hw || !fw_cmd) {
                BCMLOG_ERR("Invalid Arguments\n");
                return BC_STS_INV_ARG;