Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 124e5427 authored by Thomas Petazzoni's avatar Thomas Petazzoni Committed by Jason Cooper
Browse files

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: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
Tested-by: default avatarAndrew Lunn <andrew@lunn.ch>
Tested-by: default avatarSebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
Signed-off-by: default avatarJason Cooper <jason@lakedaemon.net>
parent b22503a9

drivers/bus/mvebu-mbus.c

+0 −38
Original line number Diff line number Diff line
@@ -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)

{

include/linux/mbus.h

+0 −5
Original line number Diff line number Diff line
@@ -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);