Skip to contentSkip to conversation

Revert "OMAP: omap_device: add omap_device_is_valid()"

PATCH In review Kevin Hilman 2 participants 5 messages Sep 14, 2010 – Sep 15, 2010

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH v2 1/2 Revert "OMAP: omap_device: add omap_device_is_valid()"

From: Kevin Hilman <[email protected]>

This reverts commit 0007122ad85cc36b1c18c0b59344093ca210d206.

The dereference method of checking for a valid omap_device when wrapping a platform_device is rather unsafe and dangerous.

Instead, a better way of checking for a valid omap-device is to use a common parent device for all omap_devices, then a check can simply be made using the device parent. The only user of this API was the initial version of the runtime PM core for OMAP. This has now been switched to check device parent, so there are no more users of this API.

---
 arch/arm/plat-omap/include/plat/omap_device.h |    2 --
 arch/arm/plat-omap/omap_device.c              |   20 --------------------
 2 files changed, 0 insertions(+), 22 deletions(-)
arch/arm/plat-omap/include/plat/omap_device.h +0 -2
index 25cd9ac..bad4c3d 100644
@@ -62,7 +62,6 @@
  *
  */
 struct omap_device {
-	u32                             magic;
 	struct platform_device		pdev;
 	struct omap_hwmod		**hwmods;
 	struct omap_device_pm_latency	*pm_lats;
@@ -82,7 +81,6 @@ int omap_device_shutdown(struct platform_device *pdev);
 
 /* Core code interface */
 
-bool omap_device_is_valid(struct omap_device *od);
 int omap_device_count_resources(struct omap_device *od);
 int omap_device_fill_resources(struct omap_device *od, struct resource *res);
 
arch/arm/plat-omap/omap_device.c +0 -20
index d2b1609..7f05f49 100644
@@ -90,12 +90,6 @@
 #define USE_WAKEUP_LAT			0
 #define IGNORE_WAKEUP_LAT		1
 
-/*
- * OMAP_DEVICE_MAGIC: used to determine whether a struct omap_device
- * obtained via container_of() is in fact a struct omap_device
- */
-#define OMAP_DEVICE_MAGIC		 0xf00dcafe
-
 /* Private functions */
 
 /**
@@ -414,8 +408,6 @@ struct omap_device *omap_device_build_ss(const char *pdev_name, int pdev_id,
 	od->pm_lats = pm_lats;
 	od->pm_lats_cnt = pm_lats_cnt;
 
-	od->magic = OMAP_DEVICE_MAGIC;
-
 	if (is_early_device)
 		ret = omap_early_device_register(od);
 	else
@@ -627,18 +619,6 @@ int omap_device_align_pm_lat(struct platform_device *pdev,
 }
 
 /**
- * omap_device_is_valid - Check if pointer is a valid omap_device
- * @od: struct omap_device *
- *
- * Return whether struct omap_device pointer @od points to a valid
- * omap_device.
- */
-bool omap_device_is_valid(struct omap_device *od)
-{
-	return (od && od->magic == OMAP_DEVICE_MAGIC);
-}
-
-/**
  * omap_device_get_pwrdm - return the powerdomain * associated with @od
  * @od: struct omap_device *
  *
Signature · 1 line
1.7.2.1
#1 lore raw

PATCH v2 2/2 OMAP: omap_device: make all devices a child of a new parent device

From: Kevin Hilman <[email protected]>

In order to help differentiate omap_devices from normal platform_devices, make them all a parent of a new common parent device.

Then, in order to determine if a platform_device is also an omap_device, checking the parent is all that is needed.

Users of this feature are the runtime PM core for OMAP, where we need to know if a device being passed in is an omap_device or not in order to know whether to call the omap_device API with it.

In addition, all omap_devices will now show up under /sys/devices/omap instead of /sys/devices/platform

---
Changes since v1:
- renamed the device from omap_bus to omap_parent_device to be more clear that this is not a bus.

 arch/arm/plat-omap/include/plat/omap_device.h |    2 ++
 arch/arm/plat-omap/omap_device.c              |   12 ++++++++++++
 2 files changed, 14 insertions(+), 0 deletions(-)
arch/arm/plat-omap/include/plat/omap_device.h +2 -0
index bad4c3d..28e2d1a 100644
@@ -36,6 +36,8 @@
 
 #include <plat/omap_hwmod.h>
 
+extern struct device omap_device_parent;
+
 /* omap_device._state values */
 #define OMAP_DEVICE_STATE_UNKNOWN	0
 #define OMAP_DEVICE_STATE_ENABLED	1
arch/arm/plat-omap/omap_device.c +12 -0
index 7f05f49..8215b1b 100644
@@ -465,6 +465,7 @@ int omap_device_register(struct omap_device *od)
 {
 	pr_debug("omap_device: %s: registering\n", od->pdev.name);
 
+	od->pdev.dev.parent = &omap_device_parent;
 	return platform_device_register(&od->pdev);
 }
 
@@ -737,3 +738,14 @@ int omap_device_enable_clocks(struct omap_device *od)
 	/* XXX pass along return value here? */
 	return 0;
 }
+
+struct device omap_device_parent = {
+	.init_name	= "omap",
+	.parent         = &platform_bus,
+};
+
+static int __init omap_device_init(void)
+{
+	return device_register(&omap_device_parent);
+}
+core_initcall(omap_device_init);
Signature · 1 line
1.7.2.1
Acked-by on v2 2/2
#2 lore raw

Re: [PATCH v2 2/2] OMAP: omap_device: make all devices a child of a new parent device

Hi Kevin,

Quoted 9 lines · Kevin Hilman

From: Kevin Hilman <[email protected]>

In order to help differentiate omap_devices from normal platform_devices, make them all a parent of a new common parent device.

Then, in order to determine if a platform_device is also an omap_device, checking the parent is all that is needed.

Quoted 8 lines

Users of this feature are the runtime PM core for OMAP, where we need to know if a device being passed in is an omap_device or not in order to know whether to call the omap_device API with it.

In addition, all omap_devices will now show up under /sys/devices/omap instead of /sys/devices/platform

At least with the current state of the Linux kernel codebase, I think it would be better to have an omap_bus/omap_bus_type. But as we've discussed, that is a lot of work, and this solution seems to solve the immediate problem -- how to determine if a device is really an omap_device -- while being minimally invasive to the rest of the kernel code and device model. So, looks good to me for now,

and feel free to merge this and patch 1/2 through your tree...

- Paul

Quoted 52 lines

---
Changes since v1:
- renamed the device from omap_bus to omap_parent_device to be more clear that this is not a bus.

 arch/arm/plat-omap/include/plat/omap_device.h |    2 ++
 arch/arm/plat-omap/omap_device.c              |   12 ++++++++++++
 2 files changed, 14 insertions(+), 0 deletions(-)
arch/arm/plat-omap/include/plat/omap_device.h +2 -0
index bad4c3d..28e2d1a 100644
@@ -36,6 +36,8 @@
 
 #include <plat/omap_hwmod.h>
 
+extern struct device omap_device_parent;
+
 /* omap_device._state values */
 #define OMAP_DEVICE_STATE_UNKNOWN	0
 #define OMAP_DEVICE_STATE_ENABLED	1
arch/arm/plat-omap/omap_device.c +12 -0
index 7f05f49..8215b1b 100644
@@ -465,6 +465,7 @@ int omap_device_register(struct omap_device *od)
 {
 	pr_debug("omap_device: %s: registering\n", od->pdev.name);
 
+	od->pdev.dev.parent = &omap_device_parent;
 	return platform_device_register(&od->pdev);
 }
 
@@ -737,3 +738,14 @@ int omap_device_enable_clocks(struct omap_device *od)
 	/* XXX pass along return value here? */
 	return 0;
 }
+
+struct device omap_device_parent = {
+	.init_name	= "omap",
+	.parent         = &platform_bus,
+};
+
+static int __init omap_device_init(void)
+{
+	return device_register(&omap_device_parent);
+}
+core_initcall(omap_device_init);
Signature · 1 line
1.7.2.1
#3 lore raw

Re: [PATCH v2 2/2] OMAP: omap_device: make all devices a child of a new parent device

Quoted 29 lines · Paul Walmsley

Hi Kevin,

Quoted 9 lines · Kevin Hilman

From: Kevin Hilman <[email protected]>

In order to help differentiate omap_devices from normal platform_devices, make them all a parent of a new common parent device.

Then, in order to determine if a platform_device is also an omap_device, checking the parent is all that is needed.

Quoted 8 lines

Users of this feature are the runtime PM core for OMAP, where we need to know if a device being passed in is an omap_device or not in order to know whether to call the omap_device API with it.

In addition, all omap_devices will now show up under /sys/devices/omap instead of /sys/devices/platform

At least with the current state of the Linux kernel codebase, I think it would be better to have an omap_bus/omap_bus_type. But as we've discussed, that is a lot of work, and this solution seems to solve the immediate problem -- how to determine if a device is really an omap_device -- while being minimally invasive to the rest of the kernel code and device model. So, looks good to me for now,

Quoted 4 lines

and feel free to merge this and patch 1/2 through your tree...

OK, will do.

Thanks,

Kevin

Acked-by on v2 1/2
#4 lore raw
In reply to Kevin Hilman
Quoted 7 lines · Kevin Hilman

From: Kevin Hilman <[email protected]>

This reverts commit 0007122ad85cc36b1c18c0b59344093ca210d206.

The dereference method of checking for a valid omap_device when wrapping a platform_device is rather unsafe and dangerous.

Quoted 8 lines

Instead, a better way of checking for a valid omap-device is to use a common parent device for all omap_devices, then a check can simply be made using the device parent. The only user of this API was the initial version of the runtime PM core for OMAP. This has now been switched to check device parent, so there are no more users of this API.

Agreed, this is a much better approach.

- Paul