Commit b25e2972 authored by Olof Johansson's avatar Olof Johansson

Merge tag 'reset-fixes-for-v5.5' of git://git.pengutronix.de/git/pza/linux into arm/fixes

Reset controller fixes for v5.5

This tag fixes a memory leak in reset_control_array_put(), which is
called by reset_control_put() for reset array controls. The other
patches are small kerneldoc comment fixes to avoid documentation build
warnings.

* tag 'reset-fixes-for-v5.5' of git://git.pengutronix.de/git/pza/linux:
  reset: fix reset_control_ops kerneldoc comment
  reset: fix reset_control_get_exclusive kerneldoc comment
  reset: fix reset_control_lookup kerneldoc comment
  reset: fix of_reset_control_get_count kerneldoc comment
  reset: fix of_reset_simple_xlate kerneldoc comment
  reset: Fix memory leak in reset_control_array_put()

Link: https://lore.kernel.org/r/cbc2af1aece3762553219ba6b5222237dacaea9d.camel@pengutronix.deSigned-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 86ec2e17 f430c7ed
...@@ -76,7 +76,6 @@ static const char *rcdev_name(struct reset_controller_dev *rcdev) ...@@ -76,7 +76,6 @@ static const char *rcdev_name(struct reset_controller_dev *rcdev)
* of_reset_simple_xlate - translate reset_spec to the reset line number * of_reset_simple_xlate - translate reset_spec to the reset line number
* @rcdev: a pointer to the reset controller device * @rcdev: a pointer to the reset controller device
* @reset_spec: reset line specifier as found in the device tree * @reset_spec: reset line specifier as found in the device tree
* @flags: a flags pointer to fill in (optional)
* *
* This simple translation function should be used for reset controllers * This simple translation function should be used for reset controllers
* with 1:1 mapping, where reset lines can be indexed by number without gaps. * with 1:1 mapping, where reset lines can be indexed by number without gaps.
...@@ -748,6 +747,7 @@ static void reset_control_array_put(struct reset_control_array *resets) ...@@ -748,6 +747,7 @@ static void reset_control_array_put(struct reset_control_array *resets)
for (i = 0; i < resets->num_rstcs; i++) for (i = 0; i < resets->num_rstcs; i++)
__reset_control_put_internal(resets->rstc[i]); __reset_control_put_internal(resets->rstc[i]);
mutex_unlock(&reset_list_mutex); mutex_unlock(&reset_list_mutex);
kfree(resets);
} }
/** /**
...@@ -825,9 +825,10 @@ int __device_reset(struct device *dev, bool optional) ...@@ -825,9 +825,10 @@ int __device_reset(struct device *dev, bool optional)
} }
EXPORT_SYMBOL_GPL(__device_reset); EXPORT_SYMBOL_GPL(__device_reset);
/** /*
* APIs to manage an array of reset controls. * APIs to manage an array of reset controls.
*/ */
/** /**
* of_reset_control_get_count - Count number of resets available with a device * of_reset_control_get_count - Count number of resets available with a device
* *
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
struct reset_controller_dev; struct reset_controller_dev;
/** /**
* struct reset_control_ops * struct reset_control_ops - reset controller driver callbacks
* *
* @reset: for self-deasserting resets, does all necessary * @reset: for self-deasserting resets, does all necessary
* things to reset the device * things to reset the device
...@@ -33,7 +33,7 @@ struct of_phandle_args; ...@@ -33,7 +33,7 @@ struct of_phandle_args;
* @provider: name of the reset controller device controlling this reset line * @provider: name of the reset controller device controlling this reset line
* @index: ID of the reset controller in the reset controller device * @index: ID of the reset controller in the reset controller device
* @dev_id: name of the device associated with this reset line * @dev_id: name of the device associated with this reset line
* @con_id name of the reset line (can be NULL) * @con_id: name of the reset line (can be NULL)
*/ */
struct reset_control_lookup { struct reset_control_lookup {
struct list_head list; struct list_head list;
......
...@@ -143,7 +143,7 @@ static inline int device_reset_optional(struct device *dev) ...@@ -143,7 +143,7 @@ static inline int device_reset_optional(struct device *dev)
* If this function is called more than once for the same reset_control it will * If this function is called more than once for the same reset_control it will
* return -EBUSY. * return -EBUSY.
* *
* See reset_control_get_shared for details on shared references to * See reset_control_get_shared() for details on shared references to
* reset-controls. * reset-controls.
* *
* Use of id names is optional. * Use of id names is optional.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment