Commit 9171078a authored by Adrian Bunk's avatar Adrian Bunk Committed by Greg Kroah-Hartman
Browse files

[PATCH] PCI: drivers/pci/pci.c: remove pci_dac_set_dma_mask 



pci_dac_set_dma_mask is currently completely unused.

Signed-off-by: default avatarAdrian Bunk <bunk@stusta.de>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent b308240b

arch/arm/mach-ixp4xx/common-pci.c

+0 −10
Original line number Diff line number Diff line
@@ -501,15 +501,6 @@ pci_set_dma_mask(struct pci_dev *dev, u64 mask) 
	return -EIO;

}

    

int

pci_dac_set_dma_mask(struct pci_dev *dev, u64 mask)

{

	if (mask >= SZ_64M - 1 )

		return 0;



	return -EIO;

}



int

pci_set_consistent_dma_mask(struct pci_dev *dev, u64 mask)

{
@@ -520,7 +511,6 @@ pci_set_consistent_dma_mask(struct pci_dev *dev, u64 mask) 
}



EXPORT_SYMBOL(pci_set_dma_mask);

EXPORT_SYMBOL(pci_dac_set_dma_mask);

EXPORT_SYMBOL(pci_set_consistent_dma_mask);

EXPORT_SYMBOL(ixp4xx_pci_read);

EXPORT_SYMBOL(ixp4xx_pci_write);

drivers/pci/pci.c

+0 −12
Original line number Diff line number Diff line
@@ -748,17 +748,6 @@ pci_set_dma_mask(struct pci_dev *dev, u64 mask) 
	return 0;

}

    

int

pci_dac_set_dma_mask(struct pci_dev *dev, u64 mask)

{

	if (!pci_dac_dma_supported(dev, mask))

		return -EIO;



	dev->dma_mask = mask;



	return 0;

}



int

pci_set_consistent_dma_mask(struct pci_dev *dev, u64 mask)

{
@@ -821,7 +810,6 @@ EXPORT_SYMBOL(pci_set_master); 
EXPORT_SYMBOL(pci_set_mwi);

EXPORT_SYMBOL(pci_clear_mwi);

EXPORT_SYMBOL(pci_set_dma_mask);

EXPORT_SYMBOL(pci_dac_set_dma_mask);

EXPORT_SYMBOL(pci_set_consistent_dma_mask);

EXPORT_SYMBOL(pci_assign_resource);

EXPORT_SYMBOL(pci_find_parent_resource);

include/linux/pci.h

+0 −2
Original line number Diff line number Diff line
@@ -811,7 +811,6 @@ void pci_set_master(struct pci_dev *dev); 
int pci_set_mwi(struct pci_dev *dev);

void pci_clear_mwi(struct pci_dev *dev);

int pci_set_dma_mask(struct pci_dev *dev, u64 mask);

int pci_dac_set_dma_mask(struct pci_dev *dev, u64 mask);

int pci_set_consistent_dma_mask(struct pci_dev *dev, u64 mask);

int pci_assign_resource(struct pci_dev *dev, int i);
@@ -942,7 +941,6 @@ static inline void pci_set_master(struct pci_dev *dev) { } 
static inline int pci_enable_device(struct pci_dev *dev) { return -EIO; }

static inline void pci_disable_device(struct pci_dev *dev) { }

static inline int pci_set_dma_mask(struct pci_dev *dev, u64 mask) { return -EIO; }

static inline int pci_dac_set_dma_mask(struct pci_dev *dev, u64 mask) { return -EIO; }

static inline int pci_assign_resource(struct pci_dev *dev, int i) { return -EBUSY;}

static inline int pci_register_driver(struct pci_driver *drv) { return 0;}

static inline void pci_unregister_driver(struct pci_driver *drv) { }