evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Staging: altpciechdma: fix build warnings

Browse source 
This fixes some build warnings in the altpciechdma driver.

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Greg Kroah-Hartman 2009-06-04 11:29:54 -07:00
parent 24f5063d3f
commit 602bd07313
1 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
drivers/staging/altpciechdma/altpciechdma.c
View file

@ -399,6 +399,7 @@ static inline void ape_chdma_desc_set(struct ape_chdma_desc *desc, dma_addr_t ad
desc->rc_addr_l = cpu_to_le32(pci_dma_l(addr)); desc->rc_addr_l = cpu_to_le32(pci_dma_l(addr));
} }
#if ALTPCIECHDMA_CDEV
/* /*
* ape_sg_to_chdma_table() - Create a device descriptor table from a scatterlist. * ape_sg_to_chdma_table() - Create a device descriptor table from a scatterlist.
* *
@ -456,6 +457,7 @@ static int ape_sg_to_chdma_table(struct scatterlist *sgl, int nents, int first,
j++; j++;
return j; return j;
} }
#endif
/* compare buffers */ /* compare buffers */
static inline int compare(u32 *p, u32 *q, int len) static inline int compare(u32 *p, u32 *q, int len)
@ -540,8 +542,8 @@ static int __devinit dma_test(struct ape_dev *ape, struct pci_dev *dev)
printk(KERN_DEBUG "Could not allocate coherent DMA buffer.\n"); printk(KERN_DEBUG "Could not allocate coherent DMA buffer.\n");
goto fail; goto fail;
} }
printk(KERN_DEBUG "Allocated cache-coherent DMA buffer (virtual address = 0x%016llx, bus address = 0x%016llx).\n", printk(KERN_DEBUG "Allocated cache-coherent DMA buffer (virtual address = %p, bus address = 0x%016llx).\n",
(u64)buffer_virt, (u64)buffer_bus); buffer_virt, (u64)buffer_bus);
/* fill first half of buffer with its virtual address as data */ /* fill first half of buffer with its virtual address as data */
for (i = 0; i < 4 * PAGE_SIZE; i += 4) for (i = 0; i < 4 * PAGE_SIZE; i += 4)
@ -801,8 +803,8 @@ static int __devinit probe(struct pci_dev *dev, const struct pci_device_id *id)
goto err_table; goto err_table;
} }
printk(KERN_DEBUG "table_virt = 0x%16llx, table_bus = 0x%16llx.\n", printk(KERN_DEBUG "table_virt = %p, table_bus = 0x%16llx.\n",
(u64)ape->table_virt, (u64)ape->table_bus); ape->table_virt, (u64)ape->table_bus);
/* enable device */ /* enable device */
rc = pci_enable_device(dev); rc = pci_enable_device(dev);
@ -913,9 +915,11 @@ static int __devinit probe(struct pci_dev *dev, const struct pci_device_id *id)
rc = 0; rc = 0;
printk(KERN_DEBUG "probe() successful.\n"); printk(KERN_DEBUG "probe() successful.\n");
goto end; goto end;
#if ALTPCIECHDMA_CDEV
err_cdev: err_cdev:
/* unmap the BARs */ /* unmap the BARs */
unmap_bars(ape, dev); unmap_bars(ape, dev);
#endif
err_map: err_map:
/* free allocated irq */ /* free allocated irq */
if (ape->irq_line >= 0) if (ape->irq_line >= 0)
@ -930,7 +934,7 @@ err_irq:
pci_release_regions(dev); pci_release_regions(dev);
err_mask: err_mask:
err_regions: err_regions:
err_rev: /*err_rev:*/
/* clean up everything before device enable() */ /* clean up everything before device enable() */
err_enable: err_enable:
if (ape->table_virt) if (ape->table_virt)