On Fri, 08 Dec 2023 16:14:10 +0100
Nuno Sa via B4 Relay <devnull+nuno.sa.analog.com@xxxxxxxxxx> wrote:
> From: Nuno Sa <nuno.sa@xxxxxxxxxx>
>
> If a device_link is previously created (eg: via
> fw_devlink_create_devlink()) before the supplier + consumer are both
> present and bound to their respective drivers, there's no way to set
> DL_FLAG_AUTOREMOVE_CONSUMER anymore while one can still set
> DL_FLAG_AUTOREMOVE_SUPPLIER. Hence, rework the flags checks to allow
> for DL_FLAG_AUTOREMOVE_CONSUMER in the same way
> DL_FLAG_AUTOREMOVE_SUPPLIER is done.
>
> While at it, make sure that we are never left with
> DL_FLAG_AUTOPROBE_CONSUMER set together with one of
> DL_FLAG_AUTOREMOVE_CONSUMER or DL_FLAG_AUTOREMOVE_SUPPLIER.
>
> Signed-off-by: Nuno Sa <nuno.sa@xxxxxxxxxx>
> ---
> drivers/base/core.c | 14 +++++++++-----
> 1 file changed, 9 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/base/core.c b/drivers/base/core.c
> index 67ba592afc77..fdbb5abc75d5 100644
> --- a/drivers/base/core.c
> +++ b/drivers/base/core.c
> @@ -807,11 +807,15 @@ struct device_link *device_link_add(struct device *consumer,
> * update the existing link to stay around longer.
> */
> if (flags & DL_FLAG_AUTOREMOVE_SUPPLIER) {
> - if (link->flags & DL_FLAG_AUTOREMOVE_CONSUMER) {
> - link->flags &= ~DL_FLAG_AUTOREMOVE_CONSUMER;
> - link->flags |= DL_FLAG_AUTOREMOVE_SUPPLIER;
> - }
> - } else if (!(flags & DL_FLAG_AUTOREMOVE_CONSUMER)) {
> + link->flags &= ~DL_FLAG_AUTOREMOVE_CONSUMER;
> + link->flags &= ~DL_FLAG_AUTOPROBE_CONSUMER;
> + link->flags |= DL_FLAG_AUTOREMOVE_SUPPLIER;
> +
Trivial but this blank line seems unwanted variation in formatting.
> + } else if (flags & DL_FLAG_AUTOREMOVE_CONSUMER) {
> + link->flags &= ~DL_FLAG_AUTOREMOVE_SUPPLIER;
> + link->flags &= ~DL_FLAG_AUTOPROBE_CONSUMER;
> + link->flags |= DL_FLAG_AUTOREMOVE_CONSUMER;
> + } else {
> link->flags &= ~(DL_FLAG_AUTOREMOVE_CONSUMER |
> DL_FLAG_AUTOREMOVE_SUPPLIER);
> }
>
