Hello Stephen,
On Wed, Jun 12, 2024 at 12:36:40PM +1000, Stephen Rothwell wrote:
> Today's linux-next merge of the driver-core tree got a conflict in:
>
> drivers/fsi/fsi-occ.c
>
> between commit:
>
> 2d2bf1e680a9 ("fsi: occ: remove usage of the deprecated ida_simple_xx() API")
>
> from the mm-nonmm-unstable branch of the mm tree and commit:
>
> 29f102dbb11f ("fsi: occ: Convert to platform remove callback returning void")
>
> from the driver-core tree.
>
> I fixed it up (see below) and can carry the fix as necessary. This
> [...]
>
> diff --cc drivers/fsi/fsi-occ.c
> index f7157c1d77d8,21d2666c4195..000000000000
> --- a/drivers/fsi/fsi-occ.c
> +++ b/drivers/fsi/fsi-occ.c
> @@@ -718,9 -719,7 +718,7 @@@ static void occ_remove(struct platform_
> else
> device_for_each_child(&pdev->dev, NULL, occ_unregister_of_child);
>
> - ida_simple_remove(&occ_ida, occ->idx);
> + ida_free(&occ_ida, occ->idx);
> -
> - return 0;
> }
>
> static const struct of_device_id occ_match[] = {
that looks correct to me. Thanks for caring!
Best regards
Uwe
Attachment:
signature.asc
Description: PGP signature
