Skip to content

Commit

Permalink
Revert "OMAP: omap_device: add omap_device_is_valid()"
Browse files Browse the repository at this point in the history
This reverts commit 0007122.

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.

Acked-by: Paul Walmsley <paul@pwsan.com>
Signed-off-by: Kevin Hilman <khilman@deeprootsystems.com>
  • Loading branch information
Kevin Hilman committed Sep 24, 2010
1 parent 6f7f63c commit a1ed40c
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 22 deletions.
2 changes: 0 additions & 2 deletions arch/arm/plat-omap/include/plat/omap_device.h
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,6 @@
*
*/
struct omap_device {
u32 magic;
struct platform_device pdev;
struct omap_hwmod **hwmods;
struct omap_device_pm_latency *pm_lats;
Expand All @@ -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);

Expand Down
20 changes: 0 additions & 20 deletions arch/arm/plat-omap/omap_device.c
Original file line number Diff line number Diff line change
Expand Up @@ -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 */

/**
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -626,18 +618,6 @@ int omap_device_align_pm_lat(struct platform_device *pdev,
return ret;
}

/**
* 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 *
Expand Down

0 comments on commit a1ed40c

Please sign in to comment.