These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / drivers / staging / rts5208 / rtsx.c

diff --git a/kernel/drivers/staging/rts5208/rtsx.c b/kernel/drivers/staging/rts5208/rtsx.c
index d64b6ed..1fe8e3e 100644 (file)
--- a/kernel/drivers/staging/rts5208/rtsx.c
+++ b/kernel/drivers/staging/rts5208/rtsx.c
@@ -230,7 +230,6 @@ static struct scsi_host_template rtsx_host_template = {
 
        /* queue commands only, only one command per LUN */
        .can_queue =                    1,
-       .cmd_per_lun =                  1,
 
        /* unknown initiator id */
        .this_id =                      -1,
@@ -537,7 +536,7 @@ static int rtsx_polling_thread(void *__dev)
        for (;;) {
 
                set_current_state(TASK_INTERRUPTIBLE);
-               schedule_timeout(POLLING_INTERVAL);
+               schedule_timeout(msecs_to_jiffies(POLLING_INTERVAL));
 
                /* lock the device pointers */
                mutex_lock(&(dev->dev_mutex));
@@ -648,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;
        }
@@ -919,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;