.. | .. |
---|
111 | 111 | |
---|
112 | 112 | SNIC_BUG_ON((((unsigned long)buf) % SNIC_SG_DESC_ALIGN) != 0); |
---|
113 | 113 | |
---|
114 | | - pa = pci_map_single(snic->pdev, buf, buf_len, PCI_DMA_FROMDEVICE); |
---|
115 | | - if (pci_dma_mapping_error(snic->pdev, pa)) { |
---|
| 114 | + pa = dma_map_single(&snic->pdev->dev, buf, buf_len, DMA_FROM_DEVICE); |
---|
| 115 | + if (dma_mapping_error(&snic->pdev->dev, pa)) { |
---|
116 | 116 | SNIC_HOST_ERR(snic->shost, |
---|
117 | 117 | "Rpt-tgt rspbuf %p: PCI DMA Mapping Failed\n", |
---|
118 | 118 | buf); |
---|
.. | .. |
---|
138 | 138 | |
---|
139 | 139 | ret = snic_queue_wq_desc(snic, rqi->req, rqi->req_len); |
---|
140 | 140 | if (ret) { |
---|
141 | | - pci_unmap_single(snic->pdev, pa, buf_len, PCI_DMA_FROMDEVICE); |
---|
| 141 | + dma_unmap_single(&snic->pdev->dev, pa, buf_len, |
---|
| 142 | + DMA_FROM_DEVICE); |
---|
142 | 143 | kfree(buf); |
---|
143 | 144 | rqi->sge_va = 0; |
---|
144 | 145 | snic_release_untagged_req(snic, rqi); |
---|
.. | .. |
---|
317 | 318 | ret); |
---|
318 | 319 | |
---|
319 | 320 | put_device(&snic->shost->shost_gendev); |
---|
320 | | - kfree(tgt); |
---|
| 321 | + spin_lock_irqsave(snic->shost->host_lock, flags); |
---|
| 322 | + list_del(&tgt->list); |
---|
| 323 | + spin_unlock_irqrestore(snic->shost->host_lock, flags); |
---|
| 324 | + put_device(&tgt->dev); |
---|
321 | 325 | tgt = NULL; |
---|
322 | 326 | |
---|
323 | 327 | return tgt; |
---|