From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 5 May 2021 23:07:54 +0000 (+1000)
Subject: Merge remote-tracking branch 'reset/reset/next'
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=37c5c4a0b28754baada06238a4ed1590cc1e681b;p=users%2Fjedix%2Flinux-maple.git

Merge remote-tracking branch 'reset/reset/next'

# Conflicts:
#	drivers/reset/core.c
---

37c5c4a0b28754baada06238a4ed1590cc1e681b
diff --cc drivers/reset/core.c
index 71c1c8264b2db,123b0c53a8574..63852076a5a37
--- a/drivers/reset/core.c
+++ b/drivers/reset/core.c
@@@ -724,29 -610,9 +724,29 @@@ void reset_control_release(struct reset
  }
  EXPORT_SYMBOL_GPL(reset_control_release);
  
 +/**
 + * reset_control_bulk_release() - releases exclusive access to reset controls
 + * @num_rstcs: number of entries in rstcs array
 + * @rstcs: array of struct reset_control_bulk_data with reset controls set
 + *
 + * Releases exclusive access right to reset controls previously obtained by a
 + * call to reset_control_bulk_acquire().
 + *
 + * See also: reset_control_release(), reset_control_bulk_acquire()
 + */
 +void reset_control_bulk_release(int num_rstcs,
 +				struct reset_control_bulk_data *rstcs)
 +{
 +	int i;
 +
 +	for (i = 0; i < num_rstcs; i++)
 +		reset_control_release(rstcs[i].rstc);
 +}
 +EXPORT_SYMBOL_GPL(reset_control_bulk_release);
 +
- static struct reset_control *__reset_control_get_internal(
- 				struct reset_controller_dev *rcdev,
- 				unsigned int index, bool shared, bool acquired)
+ static struct reset_control *
+ __reset_control_get_internal(struct reset_controller_dev *rcdev,
+ 			     unsigned int index, bool shared, bool acquired)
  {
  	struct reset_control *rstc;