Skip to contentSkip to conversation

ARM: OMAP2+: omap-device cleanups

PATCH In review Johan Hovold 2 participants 4 messages Mar 3, 2022 – Apr 21, 2022

Subsystems (3)
Arm (32-bit) Arm sub-architectures OMAP2+ support
lore
Share & tools
lore

Johan Hovold

author
#0 lore raw

cover ARM: OMAP2+: omap-device cleanups

When fixing some platform-device leaks to due to missing error handling, I stumbled over the omap_device_register() helper which is no longer used and can be removed.

Johan

Johan Hovold (2):
ARM: OMAP2+: drop omap_device_register() helper
ARM: OMAP2+: drop hwmod-clock helper comment

 arch/arm/mach-omap2/omap_device.c | 20 --------------------
 arch/arm/mach-omap2/omap_device.h |  1 -
 2 files changed, 21 deletions(-)
Signature · 1 line
2.34.1
author
#1 lore raw

PATCH 1/2 ARM: OMAP2+: drop omap_device_register() helper

The omap_device_register() helper is unused since commit 82f12e64a019 ("ARM: OMAP2+: Drop legacy init for sdma") and can be removed.

Signed-off-by Johan Hovold <[email protected]>
---
 arch/arm/mach-omap2/omap_device.c | 17 -----------------
 arch/arm/mach-omap2/omap_device.h |  1 -
 2 files changed, 18 deletions(-)
arch/arm/mach-omap2/omap_device.c +0 -17
index 56d6814bec26..3cfa7b01a24b 100644
@@ -473,23 +473,6 @@ struct dev_pm_domain omap_device_pm_domain = {
 	}
 };
 
-/**
- * omap_device_register - register an omap_device with one omap_hwmod
- * @pdev: the platform device (omap_device) to register.
- *
- * Register the omap_device structure.  This currently just calls
- * platform_device_register() on the underlying platform_device.
- * Returns the return value of platform_device_register().
- */
-int omap_device_register(struct platform_device *pdev)
-{
-	pr_debug("omap_device: %s: registering\n", pdev->name);
-
-	dev_pm_domain_set(&pdev->dev, &omap_device_pm_domain);
-	return platform_device_add(pdev);
-}
-
-
 /* Public functions for use by device drivers through struct platform_data */
 
 /**
arch/arm/mach-omap2/omap_device.h +0 -1
index f77e76a7841a..d607532cf5e0 100644
@@ -71,7 +71,6 @@ int omap_device_idle(struct platform_device *pdev);
 struct omap_device *omap_device_alloc(struct platform_device *pdev,
 				      struct omap_hwmod **ohs, int oh_cnt);
 void omap_device_delete(struct omap_device *od);
-int omap_device_register(struct platform_device *pdev);
 
 struct device *omap_device_get_by_hwmod_name(const char *oh_name);
Signature · 1 line
2.34.1
author
#2 lore raw

PATCH 2/2 ARM: OMAP2+: drop hwmod-clock helper comment

In reply to Johan Hovold

Since commit a4f6cdb0672f ("ARM: OMAP: omap_device: Add omap_device_[alloc|delete] for DT integration"), _add_hwmod_clocks_clkdev() is called from omap_device_alloc().

Drop the outdated comment referring to how this function was used ten odd years ago.

Signed-off-by Johan Hovold <[email protected]>
---
 arch/arm/mach-omap2/omap_device.c | 3 ---
 1 file changed, 3 deletions(-)
arch/arm/mach-omap2/omap_device.c +0 -3
index 3cfa7b01a24b..8b3701901991 100644
@@ -96,9 +96,6 @@ static void _add_clkdev(struct omap_device *od, const char *clk_alias,
  * omap_device, this function adds an entry in the clkdev table of the
  * form <dev-id=dev_name, con-id=role> if it does not exist already.
  *
- * The function is called from inside omap_device_build_ss(), after
- * omap_device_register.
- *
  * This allows drivers to get a pointer to its optional clocks based on its role
  * by calling clk_get(<dev*>, <role>).
  * In the case of the main clock, a "fck" alias is used.
Signature · 1 line
2.34.1
maintainer
#3 lore raw
In reply to Johan Hovold
Quoted 3 lines · Johan Hovold

When fixing some platform-device leaks to due to missing error handling, I stumbled over the omap_device_register() helper which is no longer used and can be removed.

Thanks applying these into omap-for-v5.19/soc.

Tony