diff mbox

[U-Boot] clk: Correct compilation when OF_CONTROL is not set

Message ID 1453344097-22465-1-git-send-email-sjg@chromium.org
State Not Applicable
Delegated to: Simon Glass
Headers show

Commit Message

Simon Glass Jan. 21, 2016, 2:41 a.m. UTC
At present clk.h does not build without OF_CONTROL, but it is clearly
intended to. Fix it.

Signed-off-by: Simon Glass <sjg@chromium.org>
---

 include/clk.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Comments

Masahiro Yamada Jan. 21, 2016, 3:06 a.m. UTC | #1
2016-01-21 11:41 GMT+09:00 Simon Glass <sjg@chromium.org>:
> At present clk.h does not build without OF_CONTROL, but it is clearly
> intended to. Fix it.
>
> Signed-off-by: Simon Glass <sjg@chromium.org>
> ---
>
>  include/clk.h | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/include/clk.h b/include/clk.h
> index 05c5a79..e6ab934 100644
> --- a/include/clk.h
> +++ b/include/clk.h
> @@ -8,6 +8,7 @@
>  #ifndef _CLK_H_
>  #define _CLK_H_
>
> +#include <errno.h>
>  #include <linux/types.h>
>
>  struct udevice;
> @@ -153,7 +154,7 @@ int fdt_clk_get(const void *fdt, int nodeoffset, int index,
>                 struct udevice **dev);
>  #else
>  static inline int fdt_clk_get(const void *fdt, int nodeoffset, int index,
> -                             struct udevice **dev);
> +                             struct udevice **dev)
>  {
>         return -ENOSYS;
>  }



Thanks for pointing this out.

But, I assume yours will go in:
http://patchwork.ozlabs.org/patch/571015/


Please just drop mine.
Simon Glass Jan. 30, 2016, 1:49 a.m. UTC | #2
Hi Masahiro,

On 20 January 2016 at 20:06, Masahiro Yamada
<yamada.masahiro@socionext.com> wrote:
>
> 2016-01-21 11:41 GMT+09:00 Simon Glass <sjg@chromium.org>:
> > At present clk.h does not build without OF_CONTROL, but it is clearly
> > intended to. Fix it.
> >
> > Signed-off-by: Simon Glass <sjg@chromium.org>
> > ---
> >
> >  include/clk.h | 3 ++-
> >  1 file changed, 2 insertions(+), 1 deletion(-)
> >
> > diff --git a/include/clk.h b/include/clk.h
> > index 05c5a79..e6ab934 100644
> > --- a/include/clk.h
> > +++ b/include/clk.h
> > @@ -8,6 +8,7 @@
> >  #ifndef _CLK_H_
> >  #define _CLK_H_
> >
> > +#include <errno.h>
> >  #include <linux/types.h>
> >
> >  struct udevice;
> > @@ -153,7 +154,7 @@ int fdt_clk_get(const void *fdt, int nodeoffset, int index,
> >                 struct udevice **dev);
> >  #else
> >  static inline int fdt_clk_get(const void *fdt, int nodeoffset, int index,
> > -                             struct udevice **dev);
> > +                             struct udevice **dev)
> >  {
> >         return -ENOSYS;
> >  }
>
>
>
> Thanks for pointing this out.
>
> But, I assume yours will go in:
> http://patchwork.ozlabs.org/patch/571015/
>
>
> Please just drop mine.

OK I see, they have a similar purpose. Do you have everything you need
to bring up the clock driver you were working on?

Regards,
Simon
diff mbox

Patch

diff --git a/include/clk.h b/include/clk.h
index 05c5a79..e6ab934 100644
--- a/include/clk.h
+++ b/include/clk.h
@@ -8,6 +8,7 @@ 
 #ifndef _CLK_H_
 #define _CLK_H_
 
+#include <errno.h>
 #include <linux/types.h>
 
 struct udevice;
@@ -153,7 +154,7 @@  int fdt_clk_get(const void *fdt, int nodeoffset, int index,
 		struct udevice **dev);
 #else
 static inline int fdt_clk_get(const void *fdt, int nodeoffset, int index,
-			      struct udevice **dev);
+			      struct udevice **dev)
 {
 	return -ENOSYS;
 }