target/linux/mvebu/patches-3.10/0049-bus-mvebu-mbus-Remove-the-no-longer-used-name-based-.patch

   1 From 1e94a8740cb1f9c328a3ae8ec4727d90bfb2d7f7 Mon Sep 17 00:00:00 2001
   2 From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
   3 Date: Fri, 5 Jul 2013 14:54:23 +0200
   4 Subject: [PATCH 049/203] bus: mvebu-mbus: Remove the no longer used name-based
   5  API
   6
   7 Now that every user of the deprecated name-based API has been
   8 converted to using the ID-based API, let's remove the former one.
   9
  10 Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
  11 Tested-by: Andrew Lunn <andrew@lunn.ch>
  12 Tested-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
  13 ---
  14  drivers/bus/mvebu-mbus.c | 38 --------------------------------------
  15  include/linux/mbus.h     |  5 -----
  16  2 files changed, 43 deletions(-)
  17
  18 --- a/drivers/bus/mvebu-mbus.c
  19 +++ b/drivers/bus/mvebu-mbus.c
  20 @@ -766,44 +766,6 @@ int mvebu_mbus_add_window_remap_by_id(un
  21         return mvebu_mbus_alloc_window(s, base, size, remap, target, attribute);
  22  }
  23
  24 -int mvebu_mbus_add_window_remap_flags(const char *devname, phys_addr_t base,
  25 -                                     size_t size, phys_addr_t remap,
  26 -                                     unsigned int flags)
  27 -{
  28 -       struct mvebu_mbus_state *s = &mbus_state;
  29 -       u8 target, attr;
  30 -       int i;
  31 -
  32 -       if (!s->soc->map)
  33 -               return -ENODEV;
  34 -
  35 -       for (i = 0; s->soc->map[i].name; i++)
  36 -               if (!strcmp(s->soc->map[i].name, devname))
  37 -                       break;
  38 -
  39 -       if (!s->soc->map[i].name) {
  40 -               pr_err("unknown device '%s'\n", devname);
  41 -               return -ENODEV;
  42 -       }
  43 -
  44 -       target = s->soc->map[i].target;
  45 -       attr   = s->soc->map[i].attr;
  46 -
  47 -       if (flags == MVEBU_MBUS_PCI_MEM)
  48 -               attr |= 0x8;
  49 -       else if (flags == MVEBU_MBUS_PCI_WA)
  50 -               attr |= 0x28;
  51 -
  52 -       return mvebu_mbus_add_window_remap_by_id(target, attr, base,
  53 -                                                size, remap);
  54 -}
  55 -
  56 -int mvebu_mbus_add_window(const char *devname, phys_addr_t base, size_t size)
  57 -{
  58 -       return mvebu_mbus_add_window_remap_flags(devname, base, size,
  59 -                                                MVEBU_MBUS_NO_REMAP, 0);
  60 -}
  61 -
  62  int mvebu_mbus_add_window_by_id(unsigned int target, unsigned int attribute,
  63                                 phys_addr_t base, size_t size)
  64  {
  65 --- a/include/linux/mbus.h
  66 +++ b/include/linux/mbus.h
  67 @@ -63,15 +63,10 @@ static inline const struct mbus_dram_tar
  68
  69  void mvebu_mbus_get_pcie_mem_aperture(struct resource *res);
  70  void mvebu_mbus_get_pcie_io_aperture(struct resource *res);
  71 -int mvebu_mbus_add_window_remap_flags(const char *devname, phys_addr_t base,
  72 -                                     size_t size, phys_addr_t remap,
  73 -                                     unsigned int flags);
  74  int mvebu_mbus_add_window_remap_by_id(unsigned int target,
  75                                       unsigned int attribute,
  76                                       phys_addr_t base, size_t size,
  77                                       phys_addr_t remap);
  78 -int mvebu_mbus_add_window(const char *devname, phys_addr_t base,
  79 -                         size_t size);
  80  int mvebu_mbus_add_window_by_id(unsigned int target, unsigned int attribute,
  81                                 phys_addr_t base, size_t size);
  82  int mvebu_mbus_del_window(phys_addr_t base, size_t size);