diff for duplicates of <4E73387B.2030403@ti.com> diff --git a/a/1.txt b/N1/1.txt index c3dbaad..d1f100f 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -26,62 +26,3 @@ Regards, Benoit --- ->From ad163000568dd61dee441473d0a576d84152da9e Mon Sep 17 00:00:00 2001 -From: Benoit Cousson <b-cousson@ti.com> -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 <b-cousson@ti.com> -Cc: Kevin Hilman <khilman@ti.com> -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; --- -1.7.0.4 diff --git a/a/content_digest b/N1/content_digest index 34469df..cae6107 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,15 +1,9 @@ "ref\01314973520-3585-1-git-send-email-b-cousson@ti.com\0" "ref\01314973520-3585-6-git-send-email-b-cousson@ti.com\0" - "From\0Cousson, Benoit <b-cousson@ti.com>\0" - "Subject\0Re: [PATCH v2 5/6] OMAP: omap_device: Create a default omap_device_pm_latency\0" + "From\0b-cousson@ti.com (Cousson, Benoit)\0" + "Subject\0[PATCH v2 5/6] OMAP: omap_device: Create a default omap_device_pm_latency\0" "Date\0Fri, 16 Sep 2011 13:52:27 +0200\0" - "To\0Cousson" - " Benoit <b-cousson@ti.com>\0" - "Cc\0Hilman" - Kevin <khilman@ti.com> - linux-omap@vger.kernel.org <linux-omap@vger.kernel.org> - linux-arm-kernel@lists.infradead.org <linux-arm-kernel@lists.infradead.org> - " Paul Walmsley <paul@pwsan.com>\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "Hi Kevin,\n" @@ -39,65 +33,6 @@ "Regards,\n" "Benoit\n" "\n" - "---\n" - ">From ad163000568dd61dee441473d0a576d84152da9e Mon Sep 17 00:00:00 2001\n" - "From: Benoit Cousson <b-cousson@ti.com>\n" - "Date: Tue, 9 Aug 2011 16:54:19 +0200\n" - "Subject: [PATCH v3 5/6] OMAP: omap_device: Create a default omap_device_pm_latency\n" - "\n" - "Most devices are using the same default omap_device_pm_latency structure\n" - "during device built. In order to avoid the duplication of the same\n" - "structure everywhere, add a default structure that will be used if\n" - "the device does not have an explicit one.\n" - "\n" - "Next patches will clean the duplicated structures.\n" - "\n" - "Signed-off-by: Benoit Cousson <b-cousson@ti.com>\n" - "Cc: Kevin Hilman <khilman@ti.com>\n" - "Cc: Paul Walmsley <paul@pwsan.com>\n" - "---\n" - " arch/arm/plat-omap/omap_device.c | 19 ++++++++++++++++++-\n" - " 1 files changed, 18 insertions(+), 1 deletions(-)\n" - "\n" - "diff --git a/arch/arm/plat-omap/omap_device.c b/arch/arm/plat-omap/omap_device.c\n" - "index 7b2cf62..54bbe7b 100644\n" - "--- a/arch/arm/plat-omap/omap_device.c\n" - "+++ b/arch/arm/plat-omap/omap_device.c\n" - "@@ -97,6 +97,14 @@\n" - " static int omap_device_register(struct platform_device *pdev);\n" - " static int omap_early_device_register(struct platform_device *pdev);\n" - " \n" - "+static struct omap_device_pm_latency omap_default_latency[] = {\n" - "+\t{\n" - "+\t\t.deactivate_func = omap_device_idle_hwmods,\n" - "+\t\t.activate_func = omap_device_enable_hwmods,\n" - "+\t\t.flags = OMAP_DEVICE_LATENCY_AUTO_ADJUST,\n" - "+\t}\n" - "+};\n" - "+\n" - " /* Private functions */\n" - " \n" - " /**\n" - "@@ -510,8 +518,17 @@ struct platform_device *omap_device_build_ss(const char *pdev_name, int pdev_id,\n" - " \tif (ret)\n" - " \t\tgoto odbs_exit3;\n" - " \n" - "-\tod->pm_lats = pm_lats;\n" - "+\tif (!pm_lats) {\n" - "+\t\tpm_lats = omap_default_latency;\n" - "+\t\tpm_lats_cnt = ARRAY_SIZE(omap_default_latency);\n" - "+\t}\n" - "+\n" - " \tod->pm_lats_cnt = pm_lats_cnt;\n" - "+\tod->pm_lats = kmemdup(pm_lats,\n" - "+\t\t\tsizeof(struct omap_device_pm_latency) * pm_lats_cnt,\n" - "+\t\t\tGFP_KERNEL);\n" - "+\tif (!od->pm_lats)\n" - "+\t\tgoto odbs_exit3;\n" - " \n" - " \tfor (i = 0; i < oh_cnt; i++) {\n" - " \t\thwmods[i]->od = od;\n" - "-- \n" - 1.7.0.4 + --- -30f95b2471411a0f40c9b30109779e19715f57be58af7830080fef5663fcba2b +03f47cf8f9726eac55c87ba9af4235915f26f7ace0569fec2a33a5cb8e03e8f0
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.