On Jun 13 Christophe JAILLET wrote: > The wrappers in include/linux/pci-dma-compat.h should go away. > > The patch has been generated with the coccinelle script below and has been > hand modified to replace GFP_ with a correct flag. > It has been compile tested. > > When memory is allocated in 'add_card()', GFP_KERNEL can be used because > this flag is already used a few lines above and no lock is taken in the > between. > > While at it, also remove some useless casting. [...] > Signed-off-by: Christophe JAILLET <christophe.jaillet@xxxxxxxxxx> Thanks. Committed to linux1394.git. > --- > If needed, see post from Christoph Hellwig on the kernel-janitors ML: > https://marc.info/?l=kernel-janitors&m=158745678307186&w=4 > --- > drivers/firewire/nosy.c | 43 +++++++++++++++++++++++------------------ > 1 file changed, 24 insertions(+), 19 deletions(-) > > diff --git a/drivers/firewire/nosy.c b/drivers/firewire/nosy.c > index 88ed971e32c0..b0d671db178a 100644 > --- a/drivers/firewire/nosy.c > +++ b/drivers/firewire/nosy.c > @@ -511,12 +511,12 @@ remove_card(struct pci_dev *dev) > wake_up_interruptible(&client->buffer.wait); > spin_unlock_irq(&lynx->client_list_lock); > > - pci_free_consistent(lynx->pci_device, sizeof(struct pcl), > - lynx->rcv_start_pcl, lynx->rcv_start_pcl_bus); > - pci_free_consistent(lynx->pci_device, sizeof(struct pcl), > - lynx->rcv_pcl, lynx->rcv_pcl_bus); > - pci_free_consistent(lynx->pci_device, PAGE_SIZE, > - lynx->rcv_buffer, lynx->rcv_buffer_bus); > + dma_free_coherent(&lynx->pci_device->dev, sizeof(struct pcl), > + lynx->rcv_start_pcl, lynx->rcv_start_pcl_bus); > + dma_free_coherent(&lynx->pci_device->dev, sizeof(struct pcl), > + lynx->rcv_pcl, lynx->rcv_pcl_bus); > + dma_free_coherent(&lynx->pci_device->dev, PAGE_SIZE, lynx->rcv_buffer, > + lynx->rcv_buffer_bus); > > iounmap(lynx->registers); > pci_disable_device(dev); > @@ -532,7 +532,7 @@ add_card(struct pci_dev *dev, const struct pci_device_id *unused) > u32 p, end; > int ret, i; > > - if (pci_set_dma_mask(dev, DMA_BIT_MASK(32))) { > + if (dma_set_mask(&dev->dev, DMA_BIT_MASK(32))) { > dev_err(&dev->dev, > "DMA address limits not supported for PCILynx hardware\n"); > return -ENXIO; > @@ -564,12 +564,16 @@ add_card(struct pci_dev *dev, const struct pci_device_id *unused) > goto fail_deallocate_lynx; > } > > - lynx->rcv_start_pcl = pci_alloc_consistent(lynx->pci_device, > - sizeof(struct pcl), &lynx->rcv_start_pcl_bus); > - lynx->rcv_pcl = pci_alloc_consistent(lynx->pci_device, > - sizeof(struct pcl), &lynx->rcv_pcl_bus); > - lynx->rcv_buffer = pci_alloc_consistent(lynx->pci_device, > - RCV_BUFFER_SIZE, &lynx->rcv_buffer_bus); > + lynx->rcv_start_pcl = dma_alloc_coherent(&lynx->pci_device->dev, > + sizeof(struct pcl), > + &lynx->rcv_start_pcl_bus, > + GFP_KERNEL); > + lynx->rcv_pcl = dma_alloc_coherent(&lynx->pci_device->dev, > + sizeof(struct pcl), > + &lynx->rcv_pcl_bus, GFP_KERNEL); > + lynx->rcv_buffer = dma_alloc_coherent(&lynx->pci_device->dev, > + RCV_BUFFER_SIZE, > + &lynx->rcv_buffer_bus, GFP_KERNEL); > if (lynx->rcv_start_pcl == NULL || > lynx->rcv_pcl == NULL || > lynx->rcv_buffer == NULL) { > @@ -667,14 +671,15 @@ add_card(struct pci_dev *dev, const struct pci_device_id *unused) > > fail_deallocate_buffers: > if (lynx->rcv_start_pcl) > - pci_free_consistent(lynx->pci_device, sizeof(struct pcl), > - lynx->rcv_start_pcl, lynx->rcv_start_pcl_bus); > + dma_free_coherent(&lynx->pci_device->dev, sizeof(struct pcl), > + lynx->rcv_start_pcl, > + lynx->rcv_start_pcl_bus); > if (lynx->rcv_pcl) > - pci_free_consistent(lynx->pci_device, sizeof(struct pcl), > - lynx->rcv_pcl, lynx->rcv_pcl_bus); > + dma_free_coherent(&lynx->pci_device->dev, sizeof(struct pcl), > + lynx->rcv_pcl, lynx->rcv_pcl_bus); > if (lynx->rcv_buffer) > - pci_free_consistent(lynx->pci_device, PAGE_SIZE, > - lynx->rcv_buffer, lynx->rcv_buffer_bus); > + dma_free_coherent(&lynx->pci_device->dev, PAGE_SIZE, > + lynx->rcv_buffer, lynx->rcv_buffer_bus); > iounmap(lynx->registers); > > fail_deallocate_lynx: -- Stefan Richter -======--=-= -=== --=-= http://arcgraph.de/sr/
