[PATCH] reset: fix bulk API when DM_RESET is disabled

[PATCH] reset: fix bulk API when DM_RESET is disabled

[Neil Armstrong]

In the commit "reset: Add get/assert/deassert/release for bulk of reset signals"
the disabled reset_release_bulk() and reset_get_bulk() used the wrong
struct clk_bulk instead of struct reset_ctl_bulk.

Fixes: 0c28233903b5 ("reset: Add get/assert/deassert/release for bulk of reset signals")
Reported-by: Jean-Jacques Hiblot <jjhiblot@ti.com>
Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
---
 include/reset.h | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/include/reset.h b/include/reset.h
index d38f176..ae247ce 100644
--- a/include/reset.h
+++ b/include/reset.h
@@ -243,7 +243,8 @@ static inline int reset_get_by_index(struct udevice *dev, int index,
 	return -ENOTSUPP;
 }
 
-static inline int reset_get_bulk(struct udevice *dev, struct clk_bulk *bulk)
+static inline int reset_get_bulk(struct udevice *dev,
+				 struct reset_ctl_bulk *bulk)
 {
 	return -ENOTSUPP;
 }
@@ -284,7 +285,7 @@ static inline int reset_release_all(struct reset_ctl *reset_ctl, int count)
 	return 0;
 }
 
-static inline int reset_release_bulk(struct clk_bulk *bulk)
+static inline int reset_release_bulk(struct reset_ctl_bulk *bulk)
 {
 	return 0;
 }
-- 
2.7.4

[PATCH] reset: fix bulk API when DM_RESET is disabled

[Simon Glass]

On 12 April 2018 at 02:03, Neil Armstrong <narmstrong@baylibre.com> wrote:
> In the commit "reset: Add get/assert/deassert/release for bulk of reset signals"
> the disabled reset_release_bulk() and reset_get_bulk() used the wrong
> struct clk_bulk instead of struct reset_ctl_bulk.
>
> Fixes: 0c28233903b5 ("reset: Add get/assert/deassert/release for bulk of reset signals")
> Reported-by: Jean-Jacques Hiblot <jjhiblot@ti.com>
> Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
> ---
>  include/reset.h | 5 +++--
>  1 file changed, 3 insertions(+), 2 deletions(-)

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

We don't have build coverage for this at the moment I suppose. It
would be a bit of pain to add that with sandbox, although I wonder if
it could be done with some horrible #define hackery in a C file that
includes this header?

- Simon

[PATCH] reset: fix bulk API when DM_RESET is disabled

[Neil Armstrong]

On 12/04/2018 18:41, Simon Glass wrote:
> On 12 April 2018 at 02:03, Neil Armstrong <narmstrong@baylibre.com> wrote:
>> In the commit "reset: Add get/assert/deassert/release for bulk of reset signals"
>> the disabled reset_release_bulk() and reset_get_bulk() used the wrong
>> struct clk_bulk instead of struct reset_ctl_bulk.
>>
>> Fixes: 0c28233903b5 ("reset: Add get/assert/deassert/release for bulk of reset signals")
>> Reported-by: Jean-Jacques Hiblot <jjhiblot@ti.com>
>> Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
>> ---
>>  include/reset.h | 5 +++--
>>  1 file changed, 3 insertions(+), 2 deletions(-)
> 
> Reviewed-by: Simon Glass <sjg@chromium.org>
> 
> We don't have build coverage for this at the moment I suppose. It
> would be a bit of pain to add that with sandbox, although I wonder if
> it could be done with some horrible #define hackery in a C file that
> includes this header?
> 
> - Simon
> 

It could but it will be horrible indeed.

Neil