sh: Use generic clkdev.h header (ea17c9d8) · Commits · 戴 / test

The generic header file is almost equivalent to the SH one. The only difference is that the SH one supports allocating clkdev lookups early using bootmem allocators instead of the slabs. From what I can tell using visual inspection, the slab is initialized before any clkdev allocation is made under arch/sh. So let's remove the arch specific clkdev.h header and use the generic one instead. Signed-off-by:

Stephen Boyd <sboyd@codeaurora.org> Signed-off-by:

Rich Felker <dalias@libc.org>

arch/sh/include/asm/Kbuild

+1 −0

Original line number	Diff line number	Diff line

		generic-y += bitsperlong.h
		generic-y += clkdev.h
		generic-y += cputime.h
		generic-y += current.h
		generic-y += delay.h

arch/sh/include/asm/clkdev.h

deleted100644 → 0

+0 −33

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2010 Paul Mundt <lethal@linux-sh.org>
		*
		* This program is free software; you can redistribute it and/or modify
		* it under the terms of the GNU General Public License version 2 as
		* published by the Free Software Foundation.
		*
		* Helper for the clk API to assist looking up a struct clk.
		*/

		#ifndef __CLKDEV__H_
		#define __CLKDEV__H_

		#include <linux/bootmem.h>
		#include <linux/mm.h>
		#include <linux/slab.h>

		#include <asm/clock.h>

		static inline struct clk_lookup_alloc *__clkdev_alloc(size_t size)
		{
		if (!slab_is_available())
		return alloc_bootmem_low_pages(size);
		else
		return kzalloc(size, GFP_KERNEL);
		}

		#ifndef CONFIG_COMMON_CLK
		#define __clk_put(clk)
		#define __clk_get(clk) ({ 1; })
		#endif

		#endif /* __CLKDEV_H__ */

Admin message