superrob1500
/
mirror-linux
mirror of https://github.com/torvalds/linux
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Some long due cleanups and modernizations of the Versatile 

SoC drivers from Krzysztof:
 
 - Put OF handle
 - Use devres to avoid memory leaks
 - Enable compile testing
 -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCAAdFiEElDRnuGcz/wPCXQWMQRCzN7AZXXMFAmbRzGsACgkQQRCzN7AZ
 XXMVOg//StcurySV+cz7OpeqCrVvk3qZfu1rFR7o+U1yc8e9ZWLuJgE5Ah/ZmQo5
 hx8cHLO2yo1NkhNjCYcJ7diZvnq2mRsjRU+R8Hw3Ae7iN/BjDml3qGc0Xmkk3i+y
 G1I8o2z4oKhMW7ZutUQQGKCcazWH/E4SW7GBJu+jbytzQ5gue/tope54ifN08kYF
 ZOkxUdwXVmzxqMRj3WzHM+M3Execk/PQKEF0E1ihonfa1dAW6PRhZORjvC5ZO+r5
 JQCyUbUokD5vW9DyuqB6TgHhrUlA8wevG4V62bEXIc+a9SmHdmcXYc8gvrLtvDW0
 mvIfLhL38R2C/QbKCf46GzVHUt+TefvHduC8pB/ilvP9QPqk/FsJon/CocGii21b
 QEHRHmo9IxWiwTxu6n15e3rtPaubCLyZDwdXgmFpdb7/jT/QHh/DrBvo/L/Q5837
 oKbzbC3sum+VSWWPyjltzKHG+jyTzMYzYYWAKnl5gTIl0cS+GnKQRM7c2LXJUwf7
 1Hec1oalbLIvSlGblyAZlj+TlInG7T9SPVRejUaRQQuuvkjuh9boD27C0SHJmA+g
 oEsUeQMe6cm9rUTjeYTz0hififzy32jEth0SBDxT/ES80C/XRErBMCjdbHbQ8gBn
 IldZDCbAUX3vQ9LZi3mramPnDee1WRSXvzROfmeFTrzUzbIY6OA=
 =LG/2
 -----END PGP SIGNATURE-----
gpgsig -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEEiK/NIGsWEZVxh/FrYKtH/8kJUicFAmbVkMcACgkQYKtH/8kJ
 UicwUg//dVujh6bjjb1DpY4XdZyHBPbp0ab9drj6ld78Yqk7xSRKteGT7w4pBMA3
 3Up1r2gDDbCtZVfkVkKMAkrFIYUJe3rwSoiEcU+rH2ZNvwV1Bv+kNrKwxpHJaK6C
 1PhuIIT4aX/Oz3bcuwFMxQ9bN1JCGIe7TlgrA/t7M4ykSPQtYU1aZY1gBg5uba0A
 tgBO2Fs2E3m5h4xyihjHrfaGsJkIidXPQdEzsqqjoB0dFTpMYzFs0LcoplfSdSF9
 AqGtwUVJHzqgrrFCy9SArtzUBAkg4M4xUe+3+WYgpq5nZ23coCVjliPU2bcatMRQ
 xLopfCeaalvXDeKyu0TpU4o/IG5a8ZJcYW83AjGs5xG1GPFqHZhgB6YIDsSx2qLo
 lfzfeSwNfaQ865W2G9caam7RY9ziSuhWtbcIrlpa9KYKoTZcIHNy30BsJaF3pgUZ
 wz57jd8+5PGsXc607YjYmv/2TEdj6apKK3GP1nAHjD3qbOmtldZ4t+m50pi0Vga3
 G9pQW17dl4/rx4H/x91JqqzZhUUbXq4qgyC8MrObOVdO//wbFDW8/jvWP8LQfiXi
 aVpfJd3tkIwn2yS2CGDl+ZQFLnmB8koKFh1OASvvQEJzSXl8SYkYTjAchpD2HK1U
 JoFIcwB7x2OsNWnZ8RMCvnOUJ7SuHszsRZkV+s8LF+3iziHg1S4=
 =/uxG
 -----END PGP SIGNATURE-----

Merge tag 'versatile-soc-for-v6.12' of https://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-integrator into soc/drivers

Some long due cleanups and modernizations of the Versatile
SoC drivers from Krzysztof:

- Put OF handle
- Use devres to avoid memory leaks
- Enable compile testing

* tag 'versatile-soc-for-v6.12' of https://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-integrator:
  soc: versatile: enable compile testing
  soc: versatile: realview: fix soc_dev leak during device remove
  soc: versatile: realview: fix memory leak during device remove
  soc: versatile: integrator: fix OF node leak in probe() error path

Link: https://lore.kernel.org/r/CACRpkda244rFHnnXPDPOhmKiJsRP08tNCcfFzpH5zR2cx1DFpw@mail.gmail.com
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
pull/958/head
Arnd Bergmann 2024-09-02 10:17:33 +00:00
parent 9a2f5cbf8f 2f05726171
commit ef5651a4a0
4 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/soc/Makefile
View File

@ -32,5 +32,5 @@ obj-y += sunxi/
obj-$(CONFIG_ARCH_TEGRA) += tegra/
obj-y += ti/
obj-$(CONFIG_ARCH_U8500) += ux500/
obj-$(CONFIG_PLAT_VERSATILE) += versatile/
obj-y += versatile/
obj-y += xilinx/

4
drivers/soc/versatile/Kconfig
View File

@ -4,7 +4,7 @@
#
config SOC_INTEGRATOR_CM
bool "SoC bus device for the ARM Integrator platform core modules"
depends on ARCH_INTEGRATOR
depends on ARCH_INTEGRATOR || COMPILE_TEST
select SOC_BUS
help
Include support for the SoC bus on the ARM Integrator platform
@ -13,7 +13,7 @@ config SOC_INTEGRATOR_CM
config SOC_REALVIEW
bool "SoC bus device for the ARM RealView platforms"
depends on ARCH_REALVIEW
depends on ARCH_REALVIEW || COMPILE_TEST
select SOC_BUS
help
Include support for the SoC bus on the ARM RealView platforms

1
drivers/soc/versatile/soc-integrator.c
View File

@ -113,6 +113,7 @@ static int __init integrator_soc_init(void)
return -ENODEV;
syscon_regmap = syscon_node_to_regmap(np);
of_node_put(np);
if (IS_ERR(syscon_regmap))
return PTR_ERR(syscon_regmap);

20
drivers/soc/versatile/soc-realview.c
View File

@ -4,6 +4,7 @@
*
* Author: Linus Walleij <linus.walleij@linaro.org>
*/
#include <linux/device.h>
#include <linux/init.h>
#include <linux/io.h>
#include <linux/slab.h>
@ -81,6 +82,13 @@ static struct attribute *realview_attrs[] = {
ATTRIBUTE_GROUPS(realview);
static void realview_soc_socdev_release(void *data)
{
struct soc_device *soc_dev = data;
soc_device_unregister(soc_dev);
}
static int realview_soc_probe(struct platform_device *pdev)
{
struct regmap *syscon_regmap;
@ -93,7 +101,7 @@ static int realview_soc_probe(struct platform_device *pdev)
if (IS_ERR(syscon_regmap))
return PTR_ERR(syscon_regmap);
soc_dev_attr = kzalloc(sizeof(*soc_dev_attr), GFP_KERNEL);
soc_dev_attr = devm_kzalloc(&pdev->dev, sizeof(*soc_dev_attr), GFP_KERNEL);
if (!soc_dev_attr)
return -ENOMEM;
@ -106,10 +114,14 @@ static int realview_soc_probe(struct platform_device *pdev)
soc_dev_attr->family = "Versatile";
soc_dev_attr->custom_attr_group = realview_groups[0];
soc_dev = soc_device_register(soc_dev_attr);
if (IS_ERR(soc_dev)) {
kfree(soc_dev_attr);
if (IS_ERR(soc_dev))
return -ENODEV;
}
ret = devm_add_action_or_reset(&pdev->dev, realview_soc_socdev_release,
soc_dev);
if (ret)
return ret;
ret = regmap_read(syscon_regmap, REALVIEW_SYS_ID_OFFSET,
&realview_coreid);
if (ret)