diff options
| author | André Fabian Silva Delgado <emulatorman@parabola.nu> | 2016-01-20 14:01:31 -0300 |
|---|---|---|
| committer | André Fabian Silva Delgado <emulatorman@parabola.nu> | 2016-01-20 14:01:31 -0300 |
| commit | b4b7ff4b08e691656c9d77c758fc355833128ac0 (patch) | |
| tree | 82fcb00e6b918026dc9f2d1f05ed8eee83874cc0 /drivers/staging/rts5208 | |
| parent | 35acfa0fc609f2a2cd95cef4a6a9c3a5c38f1778 (diff) | |
Linux-libre 4.4-gnupck-4.4-gnu
Diffstat (limited to 'drivers/staging/rts5208')
| -rw-r--r-- | drivers/staging/rts5208/rtsx.c | 6 | ||||
| -rw-r--r-- | drivers/staging/rts5208/rtsx_chip.c | 28 |
2 files changed, 17 insertions, 17 deletions
diff --git a/drivers/staging/rts5208/rtsx.c b/drivers/staging/rts5208/rtsx.c index b4e45436a..1fe8e3e0a 100644 --- a/drivers/staging/rts5208/rtsx.c +++ b/drivers/staging/rts5208/rtsx.c @@ -647,8 +647,6 @@ static void rtsx_release_resources(struct rtsx_dev *dev) wait_timeout(200); if (dev->rtsx_resv_buf) { - dma_free_coherent(&(dev->pci->dev), RTSX_RESV_BUF_LEN, - dev->rtsx_resv_buf, dev->rtsx_resv_buf_addr); dev->chip->host_cmds_ptr = NULL; dev->chip->host_sg_tbl_ptr = NULL; } @@ -918,8 +916,8 @@ static int rtsx_probe(struct pci_dev *pci, dev_info(&pci->dev, "Original address: 0x%lx, remapped address: 0x%lx\n", (unsigned long)(dev->addr), (unsigned long)(dev->remap_addr)); - dev->rtsx_resv_buf = dma_alloc_coherent(&(pci->dev), RTSX_RESV_BUF_LEN, - &(dev->rtsx_resv_buf_addr), GFP_KERNEL); + dev->rtsx_resv_buf = dmam_alloc_coherent(&pci->dev, RTSX_RESV_BUF_LEN, + &dev->rtsx_resv_buf_addr, GFP_KERNEL); if (dev->rtsx_resv_buf == NULL) { dev_err(&pci->dev, "alloc dma buffer fail\n"); err = -ENXIO; diff --git a/drivers/staging/rts5208/rtsx_chip.c b/drivers/staging/rts5208/rtsx_chip.c index 0df3b9d97..c0ce659a5 100644 --- a/drivers/staging/rts5208/rtsx_chip.c +++ b/drivers/staging/rts5208/rtsx_chip.c @@ -521,13 +521,14 @@ int rtsx_reset_chip(struct rtsx_chip *chip) } } - /* Disable cd_pwr_save (u_force_rst_core_en=0, u_cd_rst_core_en=0) - 0xFE5B - bit[1] u_cd_rst_core_en rst_value = 0 - bit[2] u_force_rst_core_en rst_value = 0 - bit[5] u_mac_phy_rst_n_dbg rst_value = 1 - bit[4] u_non_sticky_rst_n_dbg rst_value = 0 - */ + /* + * Disable cd_pwr_save (u_force_rst_core_en=0, u_cd_rst_core_en=0) + * 0xFE5B + * bit[1] u_cd_rst_core_en rst_value = 0 + * bit[2] u_force_rst_core_en rst_value = 0 + * bit[5] u_mac_phy_rst_n_dbg rst_value = 1 + * bit[4] u_non_sticky_rst_n_dbg rst_value = 0 + */ retval = rtsx_write_register(chip, CHANGE_LINK_STATE, 0x16, 0x10); if (retval) { rtsx_trace(chip); @@ -2153,12 +2154,13 @@ int rtsx_pre_handle_interrupt(struct rtsx_chip *chip) clear_bit(SD_NR, &chip->need_reset); } } else { - /* If multi-luns, it's possible that - when plugging/unplugging one card - there is another card which still - exists in the slot. In this case, - all existed cards should be reset. - */ + /* + * If multi-luns, it's possible that + * when plugging/unplugging one card + * there is another card which still + * exists in the slot. In this case, + * all existed cards should be reset. + */ if (exit_ss && (status & SD_EXIST)) set_bit(SD_NR, &chip->need_reinit); } |