Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Thomas Petazzoni and committed by
Jason Cooper
124e5427 b22503a9

-43
-38
drivers/bus/mvebu-mbus.c
··· 766 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 769 int mvebu_mbus_add_window_by_id(unsigned int target, unsigned int attribute, 808 770 phys_addr_t base, size_t size) 809 771 {
-5
include/linux/mbus.h
··· 63 63 64 64 void mvebu_mbus_get_pcie_mem_aperture(struct resource *res); 65 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 66 int mvebu_mbus_add_window_remap_by_id(unsigned int target, 70 67 unsigned int attribute, 71 68 phys_addr_t base, size_t size, 72 69 phys_addr_t remap); 73 - int mvebu_mbus_add_window(const char *devname, phys_addr_t base, 74 - size_t size); 75 70 int mvebu_mbus_add_window_by_id(unsigned int target, unsigned int attribute, 76 71 phys_addr_t base, size_t size); 77 72 int mvebu_mbus_del_window(phys_addr_t base, size_t size);