[PATCH] clkdev: Add default clkdev.h

[PATCH] clkdev: Add default clkdev.h

[Mark Brown]

Ease the deployment of clkdev by providing a default asm/clkdev.h which
will be used if the arch does not have an include/asm/clkdev.h.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
---
 include/asm-generic/Kbuild.asm |    4 ++++
 include/asm-generic/clkdev.h   |   26 ++++++++++++++++++++++++++
 2 files changed, 30 insertions(+)
 create mode 100644 include/asm-generic/clkdev.h

diff --git a/include/asm-generic/Kbuild.asm b/include/asm-generic/Kbuild.asm
index c5d2e5d..da121e0 100644
--- a/include/asm-generic/Kbuild.asm
+++ b/include/asm-generic/Kbuild.asm
@@ -13,6 +13,10 @@ ifneq ($(wildcard $(srctree)/arch/$(SRCARCH)/include/asm/a.out.h \
 header-y += a.out.h
 endif
 
+ifeq ($(wildcard $(srctree)/arch/$(SRCARCH)/include/asm/clkdev.h),)
+generic-y += clkdev.h
+endif
+
 header-y += auxvec.h
 header-y += bitsperlong.h
 header-y += byteorder.h
diff --git a/include/asm-generic/clkdev.h b/include/asm-generic/clkdev.h
new file mode 100644
index 0000000..c362a9d
--- /dev/null
+++ b/include/asm-generic/clkdev.h
@@ -0,0 +1,26 @@
+/*
+ *  include/asm-generic/clkdev.h
+ *
+ * Based on the ARM clkdev.h:
+ *  Copyright (C) 2008 Russell King.
+ *
+ * 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 __ASM_CLKDEV_H
+#define __ASM_CLKDEV_H
+
+#include <linux/slab.h>
+
+#define __clk_get(clk)	({ 1; })
+#define __clk_put(clk)	do { } while (0)
+
+static inline struct clk_lookup_alloc *__clkdev_alloc(size_t size)
+{
+	return kzalloc(size, GFP_KERNEL);
+}
+
+#endif
-- 
1.7.10

[PATCH] clkdev: Add default clkdev.h

[Arnd Bergmann]

On Monday 14 May 2012, Mark Brown wrote:
> Ease the deployment of clkdev by providing a default asm/clkdev.h which
> will be used if the arch does not have an include/asm/clkdev.h.
> 
> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
> ---
>  include/asm-generic/Kbuild.asm |    4 ++++
>  include/asm-generic/clkdev.h   |   26 ++++++++++++++++++++++++++
>  2 files changed, 30 insertions(+)
>  create mode 100644 include/asm-generic/clkdev.h
> 

Good idea!

>diff --git a/include/asm-generic/Kbuild.asm b/include/asm-generic/Kbuild.asm
>index c5d2e5d..da121e0 100644
>--- a/include/asm-generic/Kbuild.asm
>+++ b/include/asm-generic/Kbuild.asm
>@@ -13,6 +13,10 @@ ifneq ($(wildcard $(srctree)/arch/$(SRCARCH)/include/asm/a.out.h \
> header-y += a.out.h
> endif
> 
>+ifeq ($(wildcard $(srctree)/arch/$(SRCARCH)/include/asm/clkdev.h),)
>+generic-y += clkdev.h
>+endif
>+
> header-y += auxvec.h
> header-y += bitsperlong.h
> header-y += byteorder.h

I'm not completely sure about this part. It should work just fine, but we haven't
done this for any of the other asm/* headers. If we decide to list generic header
files  in Kconfig.asm that automatically get added to architectures, I would prefer
doing it with a nicer syntax so we can do it for a lot of the other header files
too. For now, I'd prefer to just add the file manually to the asm/Kbuild files
in the architectures where it makes sense (e.g. all but s390).

	Arnd

[PATCH] clkdev: Add default clkdev.h

[Mark Brown]

On Mon, May 14, 2012 at 07:03:03PM +0000, Arnd Bergmann wrote:

> I'm not completely sure about this part. It should work just fine, but
> we haven't done this for any of the other asm/* headers. If we decide
> to list generic header files  in Kconfig.asm that automatically get
> added to architectures, I would prefer doing it with a nicer syntax so
> we can do it for a lot of the other header files too. For now, I'd
> prefer to just add the file manually to the asm/Kbuild files in the
> architectures where it makes sense (e.g. all but s390).

The problem with that is the general pain that seems to come from trying
to get all the architecture maintainers to apply patches like this (lots
of them are OK but many do great /dev/null impressions) and it's pushing
the problem back onto the wrong people.  It seems less work to go put
something ugly in and then hopefully some Kbuild expert will get annoyed
and fix things rather than we get stuck with the status quo.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20120514/8cd3ea98/attachment-0001.sig>