diff options
author | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2013-07-26 09:17:50 -0400 |
---|---|---|
committer | Jason Cooper <jason@lakedaemon.net> | 2013-08-06 10:10:45 -0400 |
commit | 124e5427f59877cd9dde5fa2ea90c413765e77ef (patch) | |
tree | a649f033e0a9963dfd6c6a1e3d46dfe1bd37336a | |
parent | b22503a9c3bd8a3512fa4daf2c6c456d12db34de (diff) |
bus: mvebu-mbus: Remove the no longer used name-based API
Now that every user of the deprecated name-based API has been
converted to using the ID-based API, let's remove the former one.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Tested-by: Andrew Lunn <andrew@lunn.ch>
Tested-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
-rw-r--r-- | drivers/bus/mvebu-mbus.c | 38 | ||||
-rw-r--r-- | include/linux/mbus.h | 5 |
2 files changed, 0 insertions, 43 deletions
diff --git a/drivers/bus/mvebu-mbus.c b/drivers/bus/mvebu-mbus.c index 929fed1f6eb9..b4a738236987 100644 --- a/drivers/bus/mvebu-mbus.c +++ b/drivers/bus/mvebu-mbus.c | |||
@@ -766,44 +766,6 @@ int mvebu_mbus_add_window_remap_by_id(unsigned int target, | |||
766 | return mvebu_mbus_alloc_window(s, base, size, remap, target, attribute); | 766 | return mvebu_mbus_alloc_window(s, base, size, remap, target, attribute); |
767 | } | 767 | } |
768 | 768 | ||
769 | int mvebu_mbus_add_window_remap_flags(const char *devname, phys_addr_t base, | ||
770 | size_t size, phys_addr_t remap, | ||
771 | unsigned int flags) | ||
772 | { | ||
773 | struct mvebu_mbus_state *s = &mbus_state; | ||
774 | u8 target, attr; | ||
775 | int i; | ||
776 | |||
777 | if (!s->soc->map) | ||
778 | return -ENODEV; | ||
779 | |||
780 | for (i = 0; s->soc->map[i].name; i++) | ||
781 | if (!strcmp(s->soc->map[i].name, devname)) | ||
782 | break; | ||
783 | |||
784 | if (!s->soc->map[i].name) { | ||
785 | pr_err("unknown device '%s'\n", devname); | ||
786 | return -ENODEV; | ||
787 | } | ||
788 | |||
789 | target = s->soc->map[i].target; | ||
790 | attr = s->soc->map[i].attr; | ||
791 | |||
792 | if (flags == MVEBU_MBUS_PCI_MEM) | ||
793 | attr |= 0x8; | ||
794 | else if (flags == MVEBU_MBUS_PCI_WA) | ||
795 | attr |= 0x28; | ||
796 | |||
797 | return mvebu_mbus_add_window_remap_by_id(target, attr, base, | ||
798 | size, remap); | ||
799 | } | ||
800 | |||
801 | int mvebu_mbus_add_window(const char *devname, phys_addr_t base, size_t size) | ||
802 | { | ||
803 | return mvebu_mbus_add_window_remap_flags(devname, base, size, | ||
804 | MVEBU_MBUS_NO_REMAP, 0); | ||
805 | } | ||
806 | |||
807 | int mvebu_mbus_add_window_by_id(unsigned int target, unsigned int attribute, | 769 | int mvebu_mbus_add_window_by_id(unsigned int target, unsigned int attribute, |
808 | phys_addr_t base, size_t size) | 770 | phys_addr_t base, size_t size) |
809 | { | 771 | { |
diff --git a/include/linux/mbus.h b/include/linux/mbus.h index 650bc154a86e..345b8c53b897 100644 --- a/include/linux/mbus.h +++ b/include/linux/mbus.h | |||
@@ -63,15 +63,10 @@ static inline const struct mbus_dram_target_info *mv_mbus_dram_info(void) | |||
63 | 63 | ||
64 | void mvebu_mbus_get_pcie_mem_aperture(struct resource *res); | 64 | void mvebu_mbus_get_pcie_mem_aperture(struct resource *res); |
65 | void mvebu_mbus_get_pcie_io_aperture(struct resource *res); | 65 | void mvebu_mbus_get_pcie_io_aperture(struct resource *res); |
66 | int mvebu_mbus_add_window_remap_flags(const char *devname, phys_addr_t base, | ||
67 | size_t size, phys_addr_t remap, | ||
68 | unsigned int flags); | ||
69 | int mvebu_mbus_add_window_remap_by_id(unsigned int target, | 66 | int mvebu_mbus_add_window_remap_by_id(unsigned int target, |
70 | unsigned int attribute, | 67 | unsigned int attribute, |
71 | phys_addr_t base, size_t size, | 68 | phys_addr_t base, size_t size, |
72 | phys_addr_t remap); | 69 | phys_addr_t remap); |
73 | int mvebu_mbus_add_window(const char *devname, phys_addr_t base, | ||
74 | size_t size); | ||
75 | int mvebu_mbus_add_window_by_id(unsigned int target, unsigned int attribute, | 70 | int mvebu_mbus_add_window_by_id(unsigned int target, unsigned int attribute, |
76 | phys_addr_t base, size_t size); | 71 | phys_addr_t base, size_t size); |
77 | int mvebu_mbus_del_window(phys_addr_t base, size_t size); | 72 | int mvebu_mbus_del_window(phys_addr_t base, size_t size); |