i.MX SoC changes for 6.9:

- Remove usage of the deprecated ida_simple_xx() API from MMDC code.
 -----BEGIN PGP SIGNATURE-----
 
 iQFIBAABCgAyFiEEFmJXigPl4LoGSz08UFdYWoewfM4FAmXb7FsUHHNoYXduZ3Vv
 QGtlcm5lbC5vcmcACgkQUFdYWoewfM52CwgAt3G49utgmhzToxuln4QDASMigX5t
 cbyyvngQzf121ZZt9CRBirZqn/b9AQQbVJRnyAlq0eYDRDxv613mo9zEPD8sECcG
 IR9oT0YXBPQTSR4n6B90lFJzRL2OAnoHY6fHE0qPc8/GqkzHqfxEQg0xMIZtYE52
 I7tcyVONmjVHnUJUD+fR8tdWT8vefABScnFElzSGtDMvBvb19XgRiAyCIh7xn4Av
 agR3zbj8whCdnwQ+32bDded4hD4s3ZqRtcAI5L5clhTJfOeCisfOVj5mKrGvS3KT
 naEZ4jFbBRR5JJGCWX+ixkZC0KDDSngRtoADatBVeOeVnoe4TukoQeGr9w==
 =9yZ+
 -----END PGP SIGNATURE-----
gpgsig -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEEiK/NIGsWEZVxh/FrYKtH/8kJUicFAmXl1vMACgkQYKtH/8kJ
 Uid+LQ/+J7pEyILiF5fR5hjP25bTyyIS6YVhwgW9NiIy/q1TSmmzBPc5y3dsurB1
 gOYX97nLB+jdoOGDfRk2eWuiY31SYNHiOAYFTjQZd2aehXdRlfbgc4MfMzVkh+DL
 C1zO2iIGP/kuSVtM+X996md30j/8ppaKRiMBAY9qCXBLLHbKb97k+8tCV95jVF+6
 9KxQtvOl5qMbDAq2pdm8IjG3bx5kOturzjgZtD/y5DQyfd2vTaNxZJqYpT6e2hkG
 SmzfxWwylYD6NgwsjWDiD7qUn6xo5CL9HY+HmYSntE4s7Oxjv/0GxVzLkbs/x0ry
 cTtFKg+STGE/3pf5JZy0fu7r63mOM+b1M+GPo4zuAUqflCB5bjvJwsFuuJw9Gbb6
 h3zyyNi1SrF6F2haJNWzZ+OC044i3Sx7kCEUmUSjfZkwBRSWz6QeCEBts61drzf9
 AFAXo+MVQ03wNRJz8bND0fJTHwNG/HRAlrECkn8oGPIBqau4TOJ0zK07jCGlafQL
 6Jb6sIokx/I67mdcIUWtQheY5pl0SD4u09XwH1IKWOmDxViIg+6wv6ngivHRI+P6
 NlX6PCcl2iJdO9ugUHtIFtZzucnWQj0e7CeGzQkw41OEJaKjOWt8bclVews6NpXS
 6dPBid5yzLvZ28ejQoAZq4ukCs73XPN+Xp/+K0yCHL7kNK1ZfYQ=
 =a3V0
 -----END PGP SIGNATURE-----

Merge tag 'imx-soc-6.9' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into soc/arm

i.MX SoC changes for 6.9:

- Remove usage of the deprecated ida_simple_xx() API from MMDC code.

* tag 'imx-soc-6.9' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux:
  ARM: imx: Remove usage of the deprecated ida_simple_xx() API

Link: https://lore.kernel.org/r/20240226034147.233993-1-shawnguo2@yeah.net
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
Arnd Bergmann 2024-03-04 15:13:06 +01:00
commit d741a2d863

View File

@ -452,7 +452,7 @@ static int mmdc_pmu_init(struct mmdc_pmu *pmu_mmdc,
.active_events = 0,
};
pmu_mmdc->id = ida_simple_get(&mmdc_ida, 0, 0, GFP_KERNEL);
pmu_mmdc->id = ida_alloc(&mmdc_ida, GFP_KERNEL);
return pmu_mmdc->id;
}
@ -461,7 +461,7 @@ static void imx_mmdc_remove(struct platform_device *pdev)
{
struct mmdc_pmu *pmu_mmdc = platform_get_drvdata(pdev);
ida_simple_remove(&mmdc_ida, pmu_mmdc->id);
ida_free(&mmdc_ida, pmu_mmdc->id);
cpuhp_state_remove_instance_nocalls(cpuhp_mmdc_state, &pmu_mmdc->node);
perf_pmu_unregister(&pmu_mmdc->pmu);
iounmap(pmu_mmdc->mmdc_base);
@ -529,7 +529,7 @@ static int imx_mmdc_perf_init(struct platform_device *pdev, void __iomem *mmdc_b
cpuhp_state_remove_instance_nocalls(cpuhp_mmdc_state, &pmu_mmdc->node);
hrtimer_cancel(&pmu_mmdc->hrtimer);
pmu_release_id:
ida_simple_remove(&mmdc_ida, pmu_mmdc->id);
ida_free(&mmdc_ida, pmu_mmdc->id);
pmu_free:
kfree(pmu_mmdc);
return ret;