Merge tag 'reset-fixes-for-v5.5' of git://git.pengutronix.de/git/pza/linux into arm/fixes (b25e2972) · Commits · 戴 / test

drivers/reset/core.c

+3 −2

Original line number	Diff line number	Diff line
		@@ -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
		* @rcdev: a pointer to the reset controller device
		* @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
		* 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)
		for (i = 0; i < resets->num_rstcs; i++)
		__reset_control_put_internal(resets->rstc[i]);
		mutex_unlock(&reset_list_mutex);
		kfree(resets);
		}

		/**
		@@ -825,9 +825,10 @@ int __device_reset(struct device *dev, bool optional)
		}
		EXPORT_SYMBOL_GPL(__device_reset);

		/**
		/*
		* APIs to manage an array of reset controls.
		*/

		/**
		* of_reset_control_get_count - Count number of resets available with a device
		*

+2 −2

Original line number	Diff line number	Diff line
		@@ -7,7 +7,7 @@
		struct reset_controller_dev;

		/**
		* struct reset_control_ops
		* struct reset_control_ops - reset controller driver callbacks
		*
		* @reset: for self-deasserting resets, does all necessary
		* things to reset the device
		@@ -33,7 +33,7 @@ struct of_phandle_args;
		* @provider: name of the reset controller device controlling this reset line
		* @index: ID of the reset controller in the reset controller device
		* @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 list_head list;

+1 −1

Original line number	Diff line number	Diff line
		@@ -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
		* 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.
		*
		* Use of id names is optional.