diff for duplicates of <20131031062959.454193773@linux.com> diff --git a/a/1.txt b/N1/1.txt index 4eb3609..ace7226 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -1,97 +1,3 @@ -From: Domenico Andreoli <domenico.andreoli@linux.com> - -Proof of concept: vexpress as provider of reset hooks. - -Enum consolidation. - -Cc: Russell King <linux@arm.linux.org.uk> -Cc: Arnd Bergmann <arnd@arndb.de> -Cc: Olof Johansson <olof@lixom.net> -Cc: linux-arm-kernel@lists.infradead.org -Signed-off-by: Domenico Andreoli <domenico.andreoli@linux.com> ---- - drivers/power/reset/vexpress-poweroff.c | 31 +++++++++++++------------------ - 1 file changed, 13 insertions(+), 18 deletions(-) - -Index: b/drivers/power/reset/vexpress-poweroff.c -=================================================================== ---- a/drivers/power/reset/vexpress-poweroff.c -+++ b/drivers/power/reset/vexpress-poweroff.c -@@ -17,6 +17,7 @@ - #include <linux/platform_device.h> - #include <linux/stat.h> - #include <linux/vexpress.h> -+#include <linux/machine_reset.h> - - #include <asm/system_misc.h> - -@@ -75,58 +76,52 @@ DEVICE_ATTR(active, S_IRUGO | S_IWUSR, v - vexpress_reset_active_store); - - --enum vexpress_reset_func { FUNC_RESET, FUNC_SHUTDOWN, FUNC_REBOOT }; -- - static struct of_device_id vexpress_reset_of_match[] = { - { - .compatible = "arm,vexpress-reset", -- .data = (void *)FUNC_RESET, -+ .data = (void *) RESET_RESTART, - }, { - .compatible = "arm,vexpress-shutdown", -- .data = (void *)FUNC_SHUTDOWN -+ .data = (void *) RESET_POWER_OFF, - }, { - .compatible = "arm,vexpress-reboot", -- .data = (void *)FUNC_REBOOT -+ .data = (void *) RESET_RESTART, - }, - {} - }; - - static int vexpress_reset_probe(struct platform_device *pdev) - { -- enum vexpress_reset_func func; -+ enum reset_func func; - const struct of_device_id *match = - of_match_device(vexpress_reset_of_match, &pdev->dev); - - if (match) -- func = (enum vexpress_reset_func)match->data; -+ func = (enum reset_func) match->data; - else - func = pdev->id_entry->driver_data; - - switch (func) { -- case FUNC_SHUTDOWN: -+ case RESET_POWER_OFF: - vexpress_power_off_device = &pdev->dev; - pm_power_off = vexpress_power_off; - break; -- case FUNC_RESET: -- if (!vexpress_restart_device) -- vexpress_restart_device = &pdev->dev; -- arm_pm_restart = vexpress_restart; -- device_create_file(&pdev->dev, &dev_attr_active); -- break; -- case FUNC_REBOOT: -+ case RESET_RESTART: - vexpress_restart_device = &pdev->dev; - arm_pm_restart = vexpress_restart; - device_create_file(&pdev->dev, &dev_attr_active); - break; -+ default: -+ return -EINVAL; - }; - - return 0; - } - - static const struct platform_device_id vexpress_reset_id_table[] = { -- { .name = "vexpress-reset", .driver_data = FUNC_RESET, }, -- { .name = "vexpress-shutdown", .driver_data = FUNC_SHUTDOWN, }, -- { .name = "vexpress-reboot", .driver_data = FUNC_REBOOT, }, -+ { .name = "vexpress-reset", .driver_data = RESET_RESTART, }, -+ { .name = "vexpress-shutdown", .driver_data = RESET_POWER_OFF, }, -+ { .name = "vexpress-reboot", .driver_data = RESET_RESTART, }, - {} - }; +An embedded and charset-unspecified text was scrubbed... +Name: arm-machine-reset-vexpress-enum.patch +URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20131031/786483ca/attachment.ksh> diff --git a/a/content_digest b/N1/content_digest index 5c4519f..7848b3e 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,114 +1,12 @@ "ref\020131031062708.520968323@linux.com\0" - "From\0Domenico Andreoli <domenico.andreoli@linux.com>\0" + "From\0domenico.andreoli@linux.com (Domenico Andreoli)\0" "Subject\0[PATCH 05/11] ARM: vexpress: consolidate machine reset func\0" "Date\0Thu, 31 Oct 2013 07:27:13 +0100\0" - "To\0linux-arch@vger.kernel.org\0" - "Cc\0linux-arm-kernel@lists.infradead.org" - linux-mips@lvger.kernel.org - Russell King <linux@arm.linux.org.uk> - Arnd Bergmann <arnd@arndb.de> - Olof Johansson <olof@lixom.net> - Ralf Baechle <ralf@linux-mips.org> - " Domenico Andreoli <domenico.andreoli@linux.com>\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" - "fn\0arm-machine-reset-vexpress-enum.patch\0" "b\0" - "From: Domenico Andreoli <domenico.andreoli@linux.com>\n" - "\n" - "Proof of concept: vexpress as provider of reset hooks.\n" - "\n" - "Enum consolidation.\n" - "\n" - "Cc: Russell King <linux@arm.linux.org.uk>\n" - "Cc: Arnd Bergmann <arnd@arndb.de>\n" - "Cc: Olof Johansson <olof@lixom.net>\n" - "Cc: linux-arm-kernel@lists.infradead.org\n" - "Signed-off-by: Domenico Andreoli <domenico.andreoli@linux.com>\n" - "---\n" - " drivers/power/reset/vexpress-poweroff.c | 31 +++++++++++++------------------\n" - " 1 file changed, 13 insertions(+), 18 deletions(-)\n" - "\n" - "Index: b/drivers/power/reset/vexpress-poweroff.c\n" - "===================================================================\n" - "--- a/drivers/power/reset/vexpress-poweroff.c\n" - "+++ b/drivers/power/reset/vexpress-poweroff.c\n" - "@@ -17,6 +17,7 @@\n" - " #include <linux/platform_device.h>\n" - " #include <linux/stat.h>\n" - " #include <linux/vexpress.h>\n" - "+#include <linux/machine_reset.h>\n" - " \n" - " #include <asm/system_misc.h>\n" - " \n" - "@@ -75,58 +76,52 @@ DEVICE_ATTR(active, S_IRUGO | S_IWUSR, v\n" - " \t\tvexpress_reset_active_store);\n" - " \n" - " \n" - "-enum vexpress_reset_func { FUNC_RESET, FUNC_SHUTDOWN, FUNC_REBOOT };\n" - "-\n" - " static struct of_device_id vexpress_reset_of_match[] = {\n" - " \t{\n" - " \t\t.compatible = \"arm,vexpress-reset\",\n" - "-\t\t.data = (void *)FUNC_RESET,\n" - "+\t\t.data = (void *) RESET_RESTART,\n" - " \t}, {\n" - " \t\t.compatible = \"arm,vexpress-shutdown\",\n" - "-\t\t.data = (void *)FUNC_SHUTDOWN\n" - "+\t\t.data = (void *) RESET_POWER_OFF,\n" - " \t}, {\n" - " \t\t.compatible = \"arm,vexpress-reboot\",\n" - "-\t\t.data = (void *)FUNC_REBOOT\n" - "+\t\t.data = (void *) RESET_RESTART,\n" - " \t},\n" - " \t{}\n" - " };\n" - " \n" - " static int vexpress_reset_probe(struct platform_device *pdev)\n" - " {\n" - "-\tenum vexpress_reset_func func;\n" - "+\tenum reset_func func;\n" - " \tconst struct of_device_id *match =\n" - " \t\t\tof_match_device(vexpress_reset_of_match, &pdev->dev);\n" - " \n" - " \tif (match)\n" - "-\t\tfunc = (enum vexpress_reset_func)match->data;\n" - "+\t\tfunc = (enum reset_func) match->data;\n" - " \telse\n" - " \t\tfunc = pdev->id_entry->driver_data;\n" - " \n" - " \tswitch (func) {\n" - "-\tcase FUNC_SHUTDOWN:\n" - "+\tcase RESET_POWER_OFF:\n" - " \t\tvexpress_power_off_device = &pdev->dev;\n" - " \t\tpm_power_off = vexpress_power_off;\n" - " \t\tbreak;\n" - "-\tcase FUNC_RESET:\n" - "-\t\tif (!vexpress_restart_device)\n" - "-\t\t\tvexpress_restart_device = &pdev->dev;\n" - "-\t\tarm_pm_restart = vexpress_restart;\n" - "-\t\tdevice_create_file(&pdev->dev, &dev_attr_active);\n" - "-\t\tbreak;\n" - "-\tcase FUNC_REBOOT:\n" - "+\tcase RESET_RESTART:\n" - " \t\tvexpress_restart_device = &pdev->dev;\n" - " \t\tarm_pm_restart = vexpress_restart;\n" - " \t\tdevice_create_file(&pdev->dev, &dev_attr_active);\n" - " \t\tbreak;\n" - "+\tdefault:\n" - "+\t\treturn -EINVAL;\n" - " \t};\n" - " \n" - " \treturn 0;\n" - " }\n" - " \n" - " static const struct platform_device_id vexpress_reset_id_table[] = {\n" - "-\t{ .name = \"vexpress-reset\", .driver_data = FUNC_RESET, },\n" - "-\t{ .name = \"vexpress-shutdown\", .driver_data = FUNC_SHUTDOWN, },\n" - "-\t{ .name = \"vexpress-reboot\", .driver_data = FUNC_REBOOT, },\n" - "+\t{ .name = \"vexpress-reset\", .driver_data = RESET_RESTART, },\n" - "+\t{ .name = \"vexpress-shutdown\", .driver_data = RESET_POWER_OFF, },\n" - "+\t{ .name = \"vexpress-reboot\", .driver_data = RESET_RESTART, },\n" - " \t{}\n" - }; + "An embedded and charset-unspecified text was scrubbed...\n" + "Name: arm-machine-reset-vexpress-enum.patch\n" + URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20131031/786483ca/attachment.ksh> -b1efe5dd2e379df5ce41f33bf3a93bc02091dbd7544619505b35bcf99f3d68a4 +9320a0c6e4fa1f351319305fad474b96f5693cf047850968c91c801421c042c3
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.