staging: dst: fix coding style

[safe/jmp/linux-2.6] / drivers / staging / altpciechdma / altpciechdma.c

diff --git a/drivers/staging/altpciechdma/altpciechdma.c b/drivers/staging/altpciechdma/altpciechdma.c
index f5004d3..e0c5ba4 100644 (file)
--- a/drivers/staging/altpciechdma/altpciechdma.c
+++ b/drivers/staging/altpciechdma/altpciechdma.c
@@ -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));
 }
 
+#if ALTPCIECHDMA_CDEV
 /*
  * 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++;
        return j;
 }
+#endif
 
 /* compare buffers */
 static inline int compare(u32 *p, u32 *q, int len)
@@ -540,15 +542,15 @@ static int __devinit dma_test(struct ape_dev *ape, struct pci_dev *dev)
                printk(KERN_DEBUG "Could not allocate coherent DMA buffer.\n");
                goto fail;
        }
-       printk(KERN_DEBUG "Allocated cache-coherent DMA buffer (virtual address = 0x%016llx, bus address = 0x%016llx).\n",
-               (u64)buffer_virt, (u64)buffer_bus);
+       printk(KERN_DEBUG "Allocated cache-coherent DMA buffer (virtual address = %p, bus address = 0x%016llx).\n",
+              buffer_virt, (u64)buffer_bus);
 
        /* fill first half of buffer with its virtual address as data */
        for (i = 0; i < 4 * PAGE_SIZE; i += 4)
 #if 0
                *(u32 *)(buffer_virt + i) = i / PAGE_SIZE + 1;
 #else
-               *(u32 *)(buffer_virt + i) = (buffer_virt + i);
+               *(u32 *)(buffer_virt + i) = (u32)(unsigned long)(buffer_virt + i);
 #endif
 #if 0
   compare((u32 *)buffer_virt, (u32 *)(buffer_virt + 2 * PAGE_SIZE), 8192);
@@ -801,8 +803,8 @@ static int __devinit probe(struct pci_dev *dev, const struct pci_device_id *id)
                goto err_table;
        }
 
-       printk(KERN_DEBUG "table_virt = 0x%16llx, table_bus = 0x%16llx.\n",
-               (u64)ape->table_virt, (u64)ape->table_bus);
+       printk(KERN_DEBUG "table_virt = %p, table_bus = 0x%16llx.\n",
+               ape->table_virt, (u64)ape->table_bus);
 
        /* enable device */
        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;
        printk(KERN_DEBUG "probe() successful.\n");
        goto end;
+#if ALTPCIECHDMA_CDEV
 err_cdev:
        /* unmap the BARs */
        unmap_bars(ape, dev);
+#endif
 err_map:
        /* free allocated irq */
        if (ape->irq_line >= 0)
@@ -930,7 +934,7 @@ err_irq:
                pci_release_regions(dev);
 err_mask:
 err_regions:
-err_rev:
+/*err_rev:*/
 /* clean up everything before device enable() */
 err_enable:
        if (ape->table_virt)
@@ -1143,7 +1147,7 @@ static struct pci_driver pci_driver = {
        .name = DRV_NAME,
        .id_table = ids,
        .probe = probe,
-       .remove = remove,
+       .remove = __devexit_p(remove),
        /* resume, suspend are optional */
 };