Commit e88728f4 authored by Vivek Gautam's avatar Vivek Gautam Committed by Rafael J. Wysocki
Browse files

driver core: Rename flag AUTOREMOVE to AUTOREMOVE_CONSUMER 



Now that we want to add another flag to autoremove the device link
on supplier unbind, it's fair to rename the existing flag from
DL_FLAG_AUTOREMOVE to DL_FLAG_AUTOREMOVE_CONSUMER so that we can
add similar flag for supplier later.
And, while we are touching device.h, fix a doc build warning.

Signed-off-by: default avatarVivek Gautam <vivek.gautam@codeaurora.org>
Reviewed-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent 1e4b044d

Documentation/driver-api/device_link.rst

+4 −4
Original line number Diff line number Diff line
@@ -81,10 +81,10 @@ integration is desired. 
Two other flags are specifically targeted at use cases where the device

link is added from the consumer's ``->probe`` callback:  ``DL_FLAG_RPM_ACTIVE``

can be specified to runtime resume the supplier upon addition of the

device link.  ``DL_FLAG_AUTOREMOVE`` causes the device link to be automatically

purged when the consumer fails to probe or later unbinds.  This obviates

the need to explicitly delete the link in the ``->remove`` callback or in

the error path of the ``->probe`` callback.

device link.  ``DL_FLAG_AUTOREMOVE_CONSUMER`` causes the device link to be

automatically purged when the consumer fails to probe or later unbinds.

This obviates the need to explicitly delete the link in the ``->remove``

callback or in the error path of the ``->probe`` callback.



Limitations

===========

drivers/base/core.c

+8 −7
Original line number Diff line number Diff line
@@ -178,10 +178,10 @@ void device_pm_move_to_tail(struct device *dev) 
 * of the link.  If DL_FLAG_PM_RUNTIME is not set, DL_FLAG_RPM_ACTIVE will be

 * ignored.

 *

 * If the DL_FLAG_AUTOREMOVE is set, the link will be removed automatically

 * when the consumer device driver unbinds from it.  The combination of both

 * DL_FLAG_AUTOREMOVE and DL_FLAG_STATELESS set is invalid and will cause NULL

 * to be returned.

 * If the DL_FLAG_AUTOREMOVE_CONSUMER is set, the link will be removed

 * automatically when the consumer device driver unbinds from it.

 * The combination of both DL_FLAG_AUTOREMOVE_CONSUMER and DL_FLAG_STATELESS

 * set is invalid and will cause NULL to be returned.

 *

 * A side effect of the link creation is re-ordering of dpm_list and the

 * devices_kset list by moving the consumer device and all devices depending
@@ -198,7 +198,8 @@ struct device_link *device_link_add(struct device *consumer, 
	struct device_link *link;



	if (!consumer || !supplier ||

	    ((flags & DL_FLAG_STATELESS) && (flags & DL_FLAG_AUTOREMOVE)))

	    ((flags & DL_FLAG_STATELESS) &&

	     (flags & DL_FLAG_AUTOREMOVE_CONSUMER)))

		return NULL;



	device_links_write_lock();
@@ -479,7 +480,7 @@ static void __device_links_no_driver(struct device *dev) 
		if (link->flags & DL_FLAG_STATELESS)

			continue;



		if (link->flags & DL_FLAG_AUTOREMOVE)

		if (link->flags & DL_FLAG_AUTOREMOVE_CONSUMER)

			kref_put(&link->kref, __device_link_del);

		else if (link->status != DL_STATE_SUPPLIER_UNBIND)

			WRITE_ONCE(link->status, DL_STATE_AVAILABLE);
@@ -515,7 +516,7 @@ void device_links_driver_cleanup(struct device *dev) 
		if (link->flags & DL_FLAG_STATELESS)

			continue;



		WARN_ON(link->flags & DL_FLAG_AUTOREMOVE);

		WARN_ON(link->flags & DL_FLAG_AUTOREMOVE_CONSUMER);

		WARN_ON(link->status != DL_STATE_SUPPLIER_UNBIND);

		WRITE_ONCE(link->status, DL_STATE_DORMANT);

	}

drivers/gpu/drm/tegra/dc.c

+1 −1
Original line number Diff line number Diff line
@@ -2312,7 +2312,7 @@ static int tegra_dc_couple(struct tegra_dc *dc) 
	 * POWER_CONTROL registers during CRTC enabling.

	 */

	if (dc->soc->coupled_pm && dc->pipe == 1) {

		u32 flags = DL_FLAG_PM_RUNTIME | DL_FLAG_AUTOREMOVE;

		u32 flags = DL_FLAG_PM_RUNTIME | DL_FLAG_AUTOREMOVE_CONSUMER;

		struct device_link *link;

		struct device *partner;

drivers/gpu/ipu-v3/ipu-pre.c

+2 −1
Original line number Diff line number Diff line
@@ -128,7 +128,8 @@ ipu_pre_lookup_by_phandle(struct device *dev, const char *name, int index) 
	list_for_each_entry(pre, &ipu_pre_list, list) {

		if (pre_node == pre->dev->of_node) {

			mutex_unlock(&ipu_pre_list_mutex);

			device_link_add(dev, pre->dev, DL_FLAG_AUTOREMOVE);

			device_link_add(dev, pre->dev,

					DL_FLAG_AUTOREMOVE_CONSUMER);

			of_node_put(pre_node);

			return pre;

		}

drivers/gpu/ipu-v3/ipu-prg.c

+2 −1
Original line number Diff line number Diff line
@@ -100,7 +100,8 @@ ipu_prg_lookup_by_phandle(struct device *dev, const char *name, int ipu_id) 
	list_for_each_entry(prg, &ipu_prg_list, list) {

		if (prg_node == prg->dev->of_node) {

			mutex_unlock(&ipu_prg_list_mutex);

			device_link_add(dev, prg->dev, DL_FLAG_AUTOREMOVE);

			device_link_add(dev, prg->dev,

					DL_FLAG_AUTOREMOVE_CONSUMER);

			prg->id = ipu_id;

			of_node_put(prg_node);

			return prg;

CRA Git | Maintained and supported by SUSTech CRA and CCSE