tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

mtd/nand: Fix denali build on ppc64

drivers/mtd/nand/denali.c:1427: error: conflicting types for ‘enable_dma’
arch/powerpc/include/asm/dma.h:189: note: previous definition of ‘enable_dma’ was here

Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>

David Woodhouse aadff49c ce082596

+11 -11
+11 -11
drivers/mtd/nand/denali.c
··· 1424 1424 } 1425 1425 1426 1426 /* programs the controller to either enable/disable DMA transfers */ 1427 - static void enable_dma(struct denali_nand_info *denali, bool en) 1427 + static void denali_enable_dma(struct denali_nand_info *denali, bool en) 1428 1428 { 1429 1429 uint32_t reg_val = 0x0; 1430 1430 ··· 1435 1435 } 1436 1436 1437 1437 /* setups the HW to perform the data DMA */ 1438 - static void setup_dma(struct denali_nand_info *denali, int op) 1438 + static void denali_setup_dma(struct denali_nand_info *denali, int op) 1439 1439 { 1440 1440 uint32_t mode = 0x0; 1441 1441 const int page_count = 1; ··· 1494 1494 pci_dma_sync_single_for_device(pci_dev, addr, size, PCI_DMA_TODEVICE); 1495 1495 1496 1496 clear_interrupts(denali); 1497 - enable_dma(denali, true); 1497 + denali_enable_dma(denali, true); 1498 1498 1499 - setup_dma(denali, DENALI_WRITE); 1499 + denali_setup_dma(denali, DENALI_WRITE); 1500 1500 1501 1501 /* wait for operation to complete */ 1502 1502 irq_status = wait_for_irq(denali, irq_mask); ··· 1509 1509 PASS; 1510 1510 } 1511 1511 1512 - enable_dma(denali, false); 1512 + denali_enable_dma(denali, false); 1513 1513 pci_dma_sync_single_for_cpu(pci_dev, addr, size, PCI_DMA_TODEVICE); 1514 1514 } 1515 1515 ··· 1569 1569 1570 1570 setup_ecc_for_xfer(denali, true, false); 1571 1571 1572 - enable_dma(denali, true); 1572 + denali_enable_dma(denali, true); 1573 1573 pci_dma_sync_single_for_device(pci_dev, addr, size, PCI_DMA_FROMDEVICE); 1574 1574 1575 1575 clear_interrupts(denali); 1576 - setup_dma(denali, DENALI_READ); 1576 + denali_setup_dma(denali, DENALI_READ); 1577 1577 1578 1578 /* wait for operation to complete */ 1579 1579 irq_status = wait_for_irq(denali, irq_mask); ··· 1583 1583 memcpy(buf, denali->buf.buf, mtd->writesize); 1584 1584 1585 1585 check_erased_page = handle_ecc(denali, buf, chip->oob_poi, irq_status); 1586 - enable_dma(denali, false); 1586 + denali_enable_dma(denali, false); 1587 1587 1588 1588 if (check_erased_page) 1589 1589 { ··· 1618 1618 uint32_t irq_mask = INTR_STATUS0__DMA_CMD_COMP; 1619 1619 1620 1620 setup_ecc_for_xfer(denali, false, true); 1621 - enable_dma(denali, true); 1621 + denali_enable_dma(denali, true); 1622 1622 1623 1623 pci_dma_sync_single_for_device(pci_dev, addr, size, PCI_DMA_FROMDEVICE); 1624 1624 1625 1625 clear_interrupts(denali); 1626 - setup_dma(denali, DENALI_READ); 1626 + denali_setup_dma(denali, DENALI_READ); 1627 1627 1628 1628 /* wait for operation to complete */ 1629 1629 irq_status = wait_for_irq(denali, irq_mask); 1630 1630 1631 1631 pci_dma_sync_single_for_cpu(pci_dev, addr, size, PCI_DMA_FROMDEVICE); 1632 1632 1633 - enable_dma(denali, false); 1633 + denali_enable_dma(denali, false); 1634 1634 1635 1635 memcpy(buf, denali->buf.buf, mtd->writesize); 1636 1636 memcpy(chip->oob_poi, denali->buf.buf + mtd->writesize, mtd->oobsize);