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

Commit 265c271c authored by Russell King's avatar Russell King
Browse files

ARM: l2c: remove outer_inv_all() method 



No one ever calls this function anywhere in the kernel, so let's
completely remove it from the outer cache API and turn it into an
internal-only thing.

Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 4b660a7f

arch/arm/include/asm/outercache.h

+0 −8
Original line number Diff line number Diff line
@@ -28,7 +28,6 @@ struct outer_cache_fns { 
	void (*clean_range)(unsigned long, unsigned long);

	void (*flush_range)(unsigned long, unsigned long);

	void (*flush_all)(void);

	void (*inv_all)(void);

	void (*disable)(void);

#ifdef CONFIG_OUTER_CACHE_SYNC

	void (*sync)(void);
@@ -63,12 +62,6 @@ static inline void outer_flush_all(void) 
		outer_cache.flush_all();

}



static inline void outer_inv_all(void)

{

	if (outer_cache.inv_all)

		outer_cache.inv_all();

}



static inline void outer_disable(void)

{

	if (outer_cache.disable)
@@ -90,7 +83,6 @@ static inline void outer_clean_range(phys_addr_t start, phys_addr_t end) 
static inline void outer_flush_range(phys_addr_t start, phys_addr_t end)

{ }

static inline void outer_flush_all(void) { }

static inline void outer_inv_all(void) { }

static inline void outer_disable(void) { }

static inline void outer_resume(void) { }

arch/arm/mm/cache-feroceon-l2.c

+0 −1
Original line number Diff line number Diff line
@@ -350,7 +350,6 @@ void __init feroceon_l2_init(int __l2_wt_override) 
	outer_cache.inv_range = feroceon_l2_inv_range;

	outer_cache.clean_range = feroceon_l2_clean_range;

	outer_cache.flush_range = feroceon_l2_flush_range;

	outer_cache.inv_all = l2_inv_all;



	enable_l2();

arch/arm/mm/cache-l2x0.c

+0 −5
Original line number Diff line number Diff line
@@ -414,7 +414,6 @@ void __init l2x0_init(void __iomem *base, u32 aux_val, u32 aux_mask) 
		outer_cache.flush_range = l2x0_flush_range;

		outer_cache.sync = l2x0_cache_sync;

		outer_cache.flush_all = l2x0_flush_all;

		outer_cache.inv_all = l2x0_inv_all;

		outer_cache.disable = l2x0_disable;

	}
@@ -884,7 +883,6 @@ static const struct l2x0_of_data pl310_data = { 
		.flush_range = l2x0_flush_range,

		.sync        = l2x0_cache_sync,

		.flush_all   = l2x0_flush_all,

		.inv_all     = l2x0_inv_all,

		.disable     = l2x0_disable,

	},

};
@@ -899,7 +897,6 @@ static const struct l2x0_of_data l2x0_data = { 
		.flush_range = l2x0_flush_range,

		.sync        = l2x0_cache_sync,

		.flush_all   = l2x0_flush_all,

		.inv_all     = l2x0_inv_all,

		.disable     = l2x0_disable,

	},

};
@@ -914,7 +911,6 @@ static const struct l2x0_of_data aurora_with_outer_data = { 
		.flush_range = aurora_flush_range,

		.sync        = l2x0_cache_sync,

		.flush_all   = l2x0_flush_all,

		.inv_all     = l2x0_inv_all,

		.disable     = l2x0_disable,

	},

};
@@ -946,7 +942,6 @@ static const struct l2x0_of_data bcm_l2x0_data = { 
		.flush_range = bcm_flush_range,

		.sync        = l2x0_cache_sync,

		.flush_all   = l2x0_flush_all,

		.inv_all     = l2x0_inv_all,

		.disable     = l2x0_disable,

	},

};