clk: Fix compile errors in DEFINE_CLK_GATE

Message ID 20120304203359.GE11546@lunn.ch
State New
Headers show

Commit Message

Andrew Lunn March 4, 2012, 8:33 p.m.
From 71e9a676b2b2f0dc2bb0cc395e8325cf38f4808b Mon Sep 17 00:00:00 2001
From: Andrew Lunn <andrew@lunn.ch>
Date: Sun, 4 Mar 2012 16:31:14 +0100
Subject: [PATCH] [clk] Fix compile errors in DEFINE_CLK_GATE()

Signed-off-by: Andrew Lunn <andrew@lunn.ch>
---
 include/linux/clk-private.h |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

Comments

Mike Turquette March 5, 2012, 12:31 a.m. | #1
On Sun, Mar 4, 2012 at 12:33 PM, Andrew Lunn <andrew@lunn.ch> wrote:
> From 71e9a676b2b2f0dc2bb0cc395e8325cf38f4808b Mon Sep 17 00:00:00 2001
> From: Andrew Lunn <andrew@lunn.ch>
> Date: Sun, 4 Mar 2012 16:31:14 +0100
> Subject: [PATCH] [clk] Fix compile errors in DEFINE_CLK_GATE()
>
> Signed-off-by: Andrew Lunn <andrew@lunn.ch>

Thanks Andrew.  Will roll this fix in.

Regards,
Mike

> ---
>  include/linux/clk-private.h |    4 ++--
>  1 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/include/linux/clk-private.h b/include/linux/clk-private.h
> index d06e6fb..9d5c4b1 100644
> --- a/include/linux/clk-private.h
> +++ b/include/linux/clk-private.h
> @@ -95,7 +95,7 @@ extern struct clk_ops clk_gate_ops;
>                },                                              \
>                .reg = _reg,                                    \
>                .bit_idx = _bit_idx,                            \
> -               .flags = _gate_flags                            \
> +               .flags = _gate_flags,                           \
>                .lock = _lock,                                  \
>        };                                                      \
>        static struct clk _name = {                             \
> @@ -104,7 +104,7 @@ extern struct clk_ops clk_gate_ops;
>                .hw = &_name##_hw.hw,                           \
>                .parent_names = _name##_parent_names,           \
>                .num_parents =                                  \
> -                       ARRAY_SIZE(_name##parent_names),        \
> +                       ARRAY_SIZE(_name##_parent_names),       \
>                .parents = _name##_parents,                     \
>                .flags = _flags,                                \
>        };
> --
> 1.7.2.5
>

Patch

diff --git a/include/linux/clk-private.h b/include/linux/clk-private.h
index d06e6fb..9d5c4b1 100644
--- a/include/linux/clk-private.h
+++ b/include/linux/clk-private.h
@@ -95,7 +95,7 @@  extern struct clk_ops clk_gate_ops;
 		},						\
 		.reg = _reg,					\
 		.bit_idx = _bit_idx,				\
-		.flags = _gate_flags				\
+		.flags = _gate_flags,				\
 		.lock = _lock,					\
 	};							\
 	static struct clk _name = {				\
@@ -104,7 +104,7 @@  extern struct clk_ops clk_gate_ops;
 		.hw = &_name##_hw.hw,				\
 		.parent_names = _name##_parent_names,		\
 		.num_parents =					\
-			ARRAY_SIZE(_name##parent_names),	\
+			ARRAY_SIZE(_name##_parent_names),	\
 		.parents = _name##_parents,			\
 		.flags = _flags,				\
 	};