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>

diff --git a/drivers/bus/mvebu-mbus.c b/drivers/bus/mvebu-mbus.c
index 929fed1f6eb9a33ce75deee748fa0eee30a03575..b4a7382369877df1b364837dc437c4538ca67dd1 100644 (file)
--- 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,
        return mvebu_mbus_alloc_window(s, base, size, remap, target, attribute);
 }
 
-int mvebu_mbus_add_window_remap_flags(const char *devname, phys_addr_t base,
-                                     size_t size, phys_addr_t remap,
-                                     unsigned int flags)
-{
-       struct mvebu_mbus_state *s = &mbus_state;
-       u8 target, attr;
-       int i;
-
-       if (!s->soc->map)
-               return -ENODEV;
-
-       for (i = 0; s->soc->map[i].name; i++)
-               if (!strcmp(s->soc->map[i].name, devname))
-                       break;
-
-       if (!s->soc->map[i].name) {
-               pr_err("unknown device '%s'\n", devname);
-               return -ENODEV;
-       }
-
-       target = s->soc->map[i].target;
-       attr   = s->soc->map[i].attr;
-
-       if (flags == MVEBU_MBUS_PCI_MEM)
-               attr |= 0x8;
-       else if (flags == MVEBU_MBUS_PCI_WA)
-               attr |= 0x28;
-
-       return mvebu_mbus_add_window_remap_by_id(target, attr, base,
-                                                size, remap);
-}
-
-int mvebu_mbus_add_window(const char *devname, phys_addr_t base, size_t size)
-{
-       return mvebu_mbus_add_window_remap_flags(devname, base, size,
-                                                MVEBU_MBUS_NO_REMAP, 0);
-}
-
 int mvebu_mbus_add_window_by_id(unsigned int target, unsigned int attribute,
                                phys_addr_t base, size_t size)
 {

diff --git a/include/linux/mbus.h b/include/linux/mbus.h
index 650bc154a86eba33c949244e217cc166eecdac0e..345b8c53b8974d7a6cc271fda41c851ee5835f7c 100644 (file)
--- 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)
 
 void mvebu_mbus_get_pcie_mem_aperture(struct resource *res);
 void mvebu_mbus_get_pcie_io_aperture(struct resource *res);
-int mvebu_mbus_add_window_remap_flags(const char *devname, phys_addr_t base,
-                                     size_t size, phys_addr_t remap,
-                                     unsigned int flags);
 int mvebu_mbus_add_window_remap_by_id(unsigned int target,
                                      unsigned int attribute,
                                      phys_addr_t base, size_t size,
                                      phys_addr_t remap);
-int mvebu_mbus_add_window(const char *devname, phys_addr_t base,
-                         size_t size);
 int mvebu_mbus_add_window_by_id(unsigned int target, unsigned int attribute,
                                phys_addr_t base, size_t size);
 int mvebu_mbus_del_window(phys_addr_t base, size_t size);