[PATCH v2 5/6] OMAP: omap_device: Create a default omap_device_pm_latency
From: Kevin Hilman <hidden>
Date: 2011-09-16 16:41:41
Also in:
linux-omap
"Cousson, Benoit" [off-list ref] writes:
Hi Kevin, On 9/2/2011 4:25 PM, Cousson, Benoit wrote:quoted
Most devices are using the same default omap_device_pm_latency structure during device built. In order to avoid the duplication of the same structure everywhere, add a default structure that will be used if the device does not have an explicit one.[...]quoted
- od->pm_lats = pm_lats; - od->pm_lats_cnt = pm_lats_cnt; + if (pm_lats) { + od->pm_lats = pm_lats; + od->pm_lats_cnt = pm_lats_cnt; + } else { + od->pm_lats = omap_default_latency; + od->pm_lats_cnt = ARRAY_SIZE(omap_default_latency); + }Here is the fix for that part. I did the easy version :-). Splitting the structure in two parts will indeed require more work.
The kmemdup() method is fine with me.
I updated the for_3.2/1_omap_device_cleanup branch.
Thanks, I'll pick these into my branch (which is now renamed to for_3.2/omap_device-cleanup) Kevin
quoted hunk
Regards, Benoit --- From ad163000568dd61dee441473d0a576d84152da9e Mon Sep 17 00:00:00 2001 From: Benoit Cousson <redacted> Date: Tue, 9 Aug 2011 16:54:19 +0200 Subject: [PATCH v3 5/6] OMAP: omap_device: Create a default omap_device_pm_latency Most devices are using the same default omap_device_pm_latency structure during device built. In order to avoid the duplication of the same structure everywhere, add a default structure that will be used if the device does not have an explicit one. Next patches will clean the duplicated structures. Signed-off-by: Benoit Cousson <redacted> Cc: Kevin Hilman <redacted> Cc: Paul Walmsley <paul@pwsan.com> --- arch/arm/plat-omap/omap_device.c | 19 ++++++++++++++++++- 1 files changed, 18 insertions(+), 1 deletions(-)diff --git a/arch/arm/plat-omap/omap_device.c b/arch/arm/plat-omap/omap_device.c index 7b2cf62..54bbe7b 100644 --- a/arch/arm/plat-omap/omap_device.c +++ b/arch/arm/plat-omap/omap_device.c@@ -97,6 +97,14 @@ static int omap_device_register(struct platform_device *pdev); static int omap_early_device_register(struct platform_device *pdev); +static struct omap_device_pm_latency omap_default_latency[] = { + { + .deactivate_func = omap_device_idle_hwmods, + .activate_func = omap_device_enable_hwmods, + .flags = OMAP_DEVICE_LATENCY_AUTO_ADJUST, + } +}; + /* Private functions */ /**@@ -510,8 +518,17 @@ struct platform_device *omap_device_build_ss(const char *pdev_name, int pdev_id, if (ret) goto odbs_exit3; - od->pm_lats = pm_lats; + if (!pm_lats) { + pm_lats = omap_default_latency; + pm_lats_cnt = ARRAY_SIZE(omap_default_latency); + } + od->pm_lats_cnt = pm_lats_cnt; + od->pm_lats = kmemdup(pm_lats, + sizeof(struct omap_device_pm_latency) * pm_lats_cnt, + GFP_KERNEL); + if (!od->pm_lats) + goto odbs_exit3; for (i = 0; i < oh_cnt; i++) { hwmods[i]->od = od;