[PATCH 1/6] clk: Sync prototypes for clk_bulk_enable()

[PATCH 1/6] clk: Sync prototypes for clk_bulk_enable()

[Andrey Smirnov]

No-op version of clk_bulk_enable() should have the same protoype as
the real implementation, so constify the last argument to make it so.

Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com>
Cc: Russell King <linux@armlinux.org.uk>
Cc: Chris Healy <cphealy@gmail.com>
Cc: linux-clk@vger.kernel.org
Cc: linux-kernel@vger.kernel.org
---
 include/linux/clk.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/include/linux/clk.h b/include/linux/clk.h
index 3c096c7a51dc..a35868ccc912 100644
--- a/include/linux/clk.h
+++ b/include/linux/clk.h
@@ -819,7 +819,8 @@ static inline int clk_enable(struct clk *clk)
 	return 0;
 }
 
-static inline int __must_check clk_bulk_enable(int num_clks, struct clk_bulk_data *clks)
+static inline int __must_check clk_bulk_enable(int num_clks,
+					       const struct clk_bulk_data *clks)
 {
 	return 0;
 }
-- 
2.21.0

[PATCH 2/6] clk: Sync prototypes for clk_bulk_prepare()

[Andrey Smirnov]

No-op version of clk_bulk_prepare() should have the same protoype as
the real implementation, so constify the last argument to make it so.

Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com>
Cc: Russell King <linux@armlinux.org.uk>
Cc: Chris Healy <cphealy@gmail.com>
Cc: linux-clk@vger.kernel.org
Cc: linux-kernel@vger.kernel.org
---
 include/linux/clk.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/include/linux/clk.h b/include/linux/clk.h
index a35868ccc912..8af6b943bb9a 100644
--- a/include/linux/clk.h
+++ b/include/linux/clk.h
@@ -239,7 +239,8 @@ static inline int clk_prepare(struct clk *clk)
 	return 0;
 }
 
-static inline int __must_check clk_bulk_prepare(int num_clks, struct clk_bulk_data *clks)
+static inline int __must_check
+clk_bulk_prepare(int num_clks, const struct clk_bulk_data *clks)
 {
 	might_sleep();
 	return 0;
-- 
2.21.0

[PATCH 3/6] clk: Constify second argument of clk_bulk_prepare_enable()

[Andrey Smirnov]

Both clk_bulk_prepare() and clk_bulk_enable() take const struct
clk_bulk_data, so change clk_bulk_prepare_enable() to do so as
well. No functional change intended.

Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com>
Cc: Russell King <linux@armlinux.org.uk>
Cc: Chris Healy <cphealy@gmail.com>
Cc: linux-clk@vger.kernel.org
Cc: linux-kernel@vger.kernel.org
---
 include/linux/clk.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/linux/clk.h b/include/linux/clk.h
index 8af6b943bb9a..fafa63ea06b9 100644
--- a/include/linux/clk.h
+++ b/include/linux/clk.h
@@ -919,8 +919,8 @@ static inline void clk_disable_unprepare(struct clk *clk)
 	clk_unprepare(clk);
 }
 
-static inline int __must_check clk_bulk_prepare_enable(int num_clks,
-					struct clk_bulk_data *clks)
+static inline int __must_check
+clk_bulk_prepare_enable(int num_clks, const struct clk_bulk_data *clks)
 {
 	int ret;
 
-- 
2.21.0

[PATCH 4/6] clk: Sync prototypes for clk_bulk_disable()

[Andrey Smirnov]

No-op version of clk_bulk_disable() should have the same protoype as
the real implementation, so constify the last argument to make it so.

Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com>
Cc: Russell King <linux@armlinux.org.uk>
Cc: Chris Healy <cphealy@gmail.com>
Cc: linux-clk@vger.kernel.org
Cc: linux-kernel@vger.kernel.org
---
 include/linux/clk.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/linux/clk.h b/include/linux/clk.h
index fafa63ea06b9..2d3f2a55795a 100644
--- a/include/linux/clk.h
+++ b/include/linux/clk.h
@@ -830,7 +830,7 @@ static inline void clk_disable(struct clk *clk) {}
 
 
 static inline void clk_bulk_disable(int num_clks,
-				    struct clk_bulk_data *clks) {}
+				    const struct clk_bulk_data *clks) {}
 
 static inline unsigned long clk_get_rate(struct clk *clk)
 {
-- 
2.21.0

[PATCH 5/6] clk: Sync prototypes for clk_bulk_unprepare()

[Andrey Smirnov]

No-op version of clk_bulk_unprepare() should have the same protoype as
the real implementation, so constify the last argument to make it so.

Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com>
Cc: Russell King <linux@armlinux.org.uk>
Cc: Chris Healy <cphealy@gmail.com>
Cc: linux-clk@vger.kernel.org
Cc: linux-kernel@vger.kernel.org
---
 include/linux/clk.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/include/linux/clk.h b/include/linux/clk.h
index 2d3f2a55795a..3956ae05b1cf 100644
--- a/include/linux/clk.h
+++ b/include/linux/clk.h
@@ -264,7 +264,8 @@ static inline void clk_unprepare(struct clk *clk)
 {
 	might_sleep();
 }
-static inline void clk_bulk_unprepare(int num_clks, struct clk_bulk_data *clks)
+static inline void clk_bulk_unprepare(int num_clks,
+				      const struct clk_bulk_data *clks)
 {
 	might_sleep();
 }
-- 
2.21.0

[PATCH 6/6] clk: Constify second argument of clk_bulk_disable_unprepare()

[Andrey Smirnov]

Both clk_bulk_disable() and clk_bulk_unprepare() take const struct
clk_bulk_data, so change clk_bulk_disable_unprepare() to do so as
well. No functional change intended.

Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com>
Cc: Russell King <linux@armlinux.org.uk>
Cc: Chris Healy <cphealy@gmail.com>
Cc: linux-clk@vger.kernel.org
Cc: linux-kernel@vger.kernel.org
---
 include/linux/clk.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/linux/clk.h b/include/linux/clk.h
index 3956ae05b1cf..7a795fd6d141 100644
--- a/include/linux/clk.h
+++ b/include/linux/clk.h
@@ -936,7 +936,7 @@ clk_bulk_prepare_enable(int num_clks, const struct clk_bulk_data *clks)
 }
 
 static inline void clk_bulk_disable_unprepare(int num_clks,
-					      struct clk_bulk_data *clks)
+					      const struct clk_bulk_data *clks)
 {
 	clk_bulk_disable(num_clks, clks);
 	clk_bulk_unprepare(num_clks, clks);
-- 
2.21.0

Re: [PATCH 1/6] clk: Sync prototypes for clk_bulk_enable()

[Stephen Boyd]

Quoting Andrey Smirnov (2019-07-15 13:12:29)
> No-op version of clk_bulk_enable() should have the same protoype as
> the real implementation, so constify the last argument to make it so.
> 
> Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com>
> Cc: Russell King <linux@armlinux.org.uk>
> Cc: Chris Healy <cphealy@gmail.com>
> Cc: linux-clk@vger.kernel.org
> Cc: linux-kernel@vger.kernel.org
> ---

No cover letter, but I'm inclined to squash these all together into one
patch instead of 6. I'm not sure why each function gets a different
patch.

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

Re: [PATCH 1/6] clk: Sync prototypes for clk_bulk_enable()

[Andrey Smirnov]

On Mon, Jul 15, 2019 at 3:00 PM Stephen Boyd <sboyd@kernel.org> wrote:
>
> Quoting Andrey Smirnov (2019-07-15 13:12:29)
> > No-op version of clk_bulk_enable() should have the same protoype as
> > the real implementation, so constify the last argument to make it so.
> >
> > Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com>
> > Cc: Russell King <linux@armlinux.org.uk>
> > Cc: Chris Healy <cphealy@gmail.com>
> > Cc: linux-clk@vger.kernel.org
> > Cc: linux-kernel@vger.kernel.org
> > ---
>
> No cover letter, but I'm inclined to squash these all together into one
> patch instead of 6. I'm not sure why each function gets a different
> patch.
>

Sure, will squash all in v2.

Thanks,
Andrey Smirnov