diff options
author | Adrian Bunk <bunk@stusta.de> | 2005-05-01 09:53:08 -0400 |
---|---|---|
committer | Greg KH <gregkh@suse.de> | 2005-05-04 02:45:17 -0400 |
commit | 9171078ab5a0bbb516029cfc61378e0350a7b30d (patch) | |
tree | c0748641f2574f1621bb1f78d14c70c49805e4dd | |
parent | b308240b49ff5a1bddc6e10513c2c83f37a0bc78 (diff) |
[PATCH] PCI: drivers/pci/pci.c: remove pci_dac_set_dma_mask
pci_dac_set_dma_mask is currently completely unused.
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r-- | arch/arm/mach-ixp4xx/common-pci.c | 10 | ||||
-rw-r--r-- | drivers/pci/pci.c | 12 | ||||
-rw-r--r-- | include/linux/pci.h | 2 |
3 files changed, 0 insertions, 24 deletions
diff --git a/arch/arm/mach-ixp4xx/common-pci.c b/arch/arm/mach-ixp4xx/common-pci.c index 94bcdb933e41..aa92e3708838 100644 --- a/arch/arm/mach-ixp4xx/common-pci.c +++ b/arch/arm/mach-ixp4xx/common-pci.c | |||
@@ -502,15 +502,6 @@ pci_set_dma_mask(struct pci_dev *dev, u64 mask) | |||
502 | } | 502 | } |
503 | 503 | ||
504 | int | 504 | int |
505 | pci_dac_set_dma_mask(struct pci_dev *dev, u64 mask) | ||
506 | { | ||
507 | if (mask >= SZ_64M - 1 ) | ||
508 | return 0; | ||
509 | |||
510 | return -EIO; | ||
511 | } | ||
512 | |||
513 | int | ||
514 | pci_set_consistent_dma_mask(struct pci_dev *dev, u64 mask) | 505 | pci_set_consistent_dma_mask(struct pci_dev *dev, u64 mask) |
515 | { | 506 | { |
516 | if (mask >= SZ_64M - 1 ) | 507 | if (mask >= SZ_64M - 1 ) |
@@ -520,7 +511,6 @@ pci_set_consistent_dma_mask(struct pci_dev *dev, u64 mask) | |||
520 | } | 511 | } |
521 | 512 | ||
522 | EXPORT_SYMBOL(pci_set_dma_mask); | 513 | EXPORT_SYMBOL(pci_set_dma_mask); |
523 | EXPORT_SYMBOL(pci_dac_set_dma_mask); | ||
524 | EXPORT_SYMBOL(pci_set_consistent_dma_mask); | 514 | EXPORT_SYMBOL(pci_set_consistent_dma_mask); |
525 | EXPORT_SYMBOL(ixp4xx_pci_read); | 515 | EXPORT_SYMBOL(ixp4xx_pci_read); |
526 | EXPORT_SYMBOL(ixp4xx_pci_write); | 516 | EXPORT_SYMBOL(ixp4xx_pci_write); |
diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c index 88cbe5b5b3f3..f04b9ffe4153 100644 --- a/drivers/pci/pci.c +++ b/drivers/pci/pci.c | |||
@@ -749,17 +749,6 @@ pci_set_dma_mask(struct pci_dev *dev, u64 mask) | |||
749 | } | 749 | } |
750 | 750 | ||
751 | int | 751 | int |
752 | pci_dac_set_dma_mask(struct pci_dev *dev, u64 mask) | ||
753 | { | ||
754 | if (!pci_dac_dma_supported(dev, mask)) | ||
755 | return -EIO; | ||
756 | |||
757 | dev->dma_mask = mask; | ||
758 | |||
759 | return 0; | ||
760 | } | ||
761 | |||
762 | int | ||
763 | pci_set_consistent_dma_mask(struct pci_dev *dev, u64 mask) | 752 | pci_set_consistent_dma_mask(struct pci_dev *dev, u64 mask) |
764 | { | 753 | { |
765 | if (!pci_dma_supported(dev, mask)) | 754 | if (!pci_dma_supported(dev, mask)) |
@@ -821,7 +810,6 @@ EXPORT_SYMBOL(pci_set_master); | |||
821 | EXPORT_SYMBOL(pci_set_mwi); | 810 | EXPORT_SYMBOL(pci_set_mwi); |
822 | EXPORT_SYMBOL(pci_clear_mwi); | 811 | EXPORT_SYMBOL(pci_clear_mwi); |
823 | EXPORT_SYMBOL(pci_set_dma_mask); | 812 | EXPORT_SYMBOL(pci_set_dma_mask); |
824 | EXPORT_SYMBOL(pci_dac_set_dma_mask); | ||
825 | EXPORT_SYMBOL(pci_set_consistent_dma_mask); | 813 | EXPORT_SYMBOL(pci_set_consistent_dma_mask); |
826 | EXPORT_SYMBOL(pci_assign_resource); | 814 | EXPORT_SYMBOL(pci_assign_resource); |
827 | EXPORT_SYMBOL(pci_find_parent_resource); | 815 | EXPORT_SYMBOL(pci_find_parent_resource); |
diff --git a/include/linux/pci.h b/include/linux/pci.h index cff5ba3ac8ce..b5238bd18830 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h | |||
@@ -811,7 +811,6 @@ void pci_set_master(struct pci_dev *dev); | |||
811 | int pci_set_mwi(struct pci_dev *dev); | 811 | int pci_set_mwi(struct pci_dev *dev); |
812 | void pci_clear_mwi(struct pci_dev *dev); | 812 | void pci_clear_mwi(struct pci_dev *dev); |
813 | int pci_set_dma_mask(struct pci_dev *dev, u64 mask); | 813 | int pci_set_dma_mask(struct pci_dev *dev, u64 mask); |
814 | int pci_dac_set_dma_mask(struct pci_dev *dev, u64 mask); | ||
815 | int pci_set_consistent_dma_mask(struct pci_dev *dev, u64 mask); | 814 | int pci_set_consistent_dma_mask(struct pci_dev *dev, u64 mask); |
816 | int pci_assign_resource(struct pci_dev *dev, int i); | 815 | int pci_assign_resource(struct pci_dev *dev, int i); |
817 | 816 | ||
@@ -942,7 +941,6 @@ static inline void pci_set_master(struct pci_dev *dev) { } | |||
942 | static inline int pci_enable_device(struct pci_dev *dev) { return -EIO; } | 941 | static inline int pci_enable_device(struct pci_dev *dev) { return -EIO; } |
943 | static inline void pci_disable_device(struct pci_dev *dev) { } | 942 | static inline void pci_disable_device(struct pci_dev *dev) { } |
944 | static inline int pci_set_dma_mask(struct pci_dev *dev, u64 mask) { return -EIO; } | 943 | static inline int pci_set_dma_mask(struct pci_dev *dev, u64 mask) { return -EIO; } |
945 | static inline int pci_dac_set_dma_mask(struct pci_dev *dev, u64 mask) { return -EIO; } | ||
946 | static inline int pci_assign_resource(struct pci_dev *dev, int i) { return -EBUSY;} | 944 | static inline int pci_assign_resource(struct pci_dev *dev, int i) { return -EBUSY;} |
947 | static inline int pci_register_driver(struct pci_driver *drv) { return 0;} | 945 | static inline int pci_register_driver(struct pci_driver *drv) { return 0;} |
948 | static inline void pci_unregister_driver(struct pci_driver *drv) { } | 946 | static inline void pci_unregister_driver(struct pci_driver *drv) { } |