diff for duplicates of <1518108802.22495.207.camel@linux.intel.com> diff --git a/a/1.txt b/N1/1.txt index 3d9e52f..3ece5a1 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -14,7 +14,7 @@ On Thu, 2018-02-08 at 16:59 +0100, Rafael J. Wysocki wrote: Would the following work for you? --- 8< --- 8< --- 8< --- -From 03013c0c1e487cda4c0d8dc5065ed2f0031095de Mon Sep 17 00:00:00 2001 +>From 03013c0c1e487cda4c0d8dc5065ed2f0031095de Mon Sep 17 00:00:00 2001 From: Andy Shevchenko <andriy.shevchenko@linux.intel.com> Date: Thu, 1 Feb 2018 21:52:14 +0200 Subject: [PATCH 1/1] ACPI / bus: Do not traverse through non-existed @@ -40,6 +40,27 @@ Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> --------- 1 file changed, 41 insertions(+), 25 deletions(-) +diff --git a/drivers/acpi/bus.c b/drivers/acpi/bus.c +index 676c9788e1c8..33c5166e6028 100644 +--- a/drivers/acpi/bus.c ++++ b/drivers/acpi/bus.c +@@ -660,13 +660,15 @@ struct acpi_device *acpi_companion_match(const +struct device *dev) + * acpi_of_match_device - Match device object using the "compatible" +property. + * @adev: ACPI device object to match. + * @of_match_table: List of device IDs to match against. ++ * @of_id: OF ID if matched + * + * If @dev has an ACPI companion which has ACPI_DT_NAMESPACE_HID in its +list of + * identifiers and a _DSD object with the "compatible" property, use +that + * property to match against the given list of identifiers. + */ + static bool acpi_of_match_device(struct acpi_device *adev, +- const struct of_device_id +*of_match_table) + const struct of_device_id *of_match_table, + const struct of_device_id **of_id) @@ -184,25 +205,12 @@ NULL); + NULL, NULL); } EXPORT_SYMBOL_GPL(acpi_driver_match_device); + +-- +2.15.1 -diff --git a/drivers/acpi/bus.c b/drivers/acpi/bus.c -index 676c9788e1c8..33c5166e6028 100644 ---- a/drivers/acpi/bus.c -+++ b/drivers/acpi/bus.c -@@ -660,13 +660,15 @@ struct acpi_device *acpi_companion_match(const -struct device *dev) - * acpi_of_match_device - Match device object using the "compatible" -property. - * @adev: ACPI device object to match. - * @of_match_table: List of device IDs to match against. -+ * @of_id: OF ID if matched - * - * If @dev has an ACPI companion which has ACPI_DT_NAMESPACE_HID in its -list of - * identifiers and a _DSD object with the "compatible" property, use -that - * property to match against the given list of identifiers. - */ - static bool acpi_of_match_device(struct acpi_device *adev, -- const struct of_device_id -*of_match_table) + + +-- +Andy Shevchenko <andriy.shevchenko@linux.intel.com> +Intel Finland Oy diff --git a/a/content_digest b/N1/content_digest index 1a5995e..6a5c290 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,5 +1,8 @@ + "ref\020180207145610.88434-1-andriy.shevchenko@linux.intel.com\0" + "ref\020180207145610.88434-2-andriy.shevchenko@linux.intel.com\0" + "ref\0CAJZ5v0iEB74dPUN400pfB4+AV--NZj7hs6aZGiSoSiz5cTS37g@mail.gmail.com\0" "From\0Andy Shevchenko <andriy.shevchenko@linux.intel.com>\0" - "Subject\0[v3,2/5] ACPI / bus: Do not traverse through non-existed device table\0" + "Subject\0Re: [PATCH v3 2/5] ACPI / bus: Do not traverse through non-existed device table\0" "Date\0Thu, 08 Feb 2018 18:53:22 +0200\0" "To\0Rafael J. Wysocki <rafael@kernel.org>\0" "Cc\0dmaengine <dmaengine@vger.kernel.org>" @@ -27,7 +30,7 @@ "Would the following work for you?\n" "\n" "--- 8< --- 8< --- 8< ---\n" - "From 03013c0c1e487cda4c0d8dc5065ed2f0031095de Mon Sep 17 00:00:00 2001\n" + ">From 03013c0c1e487cda4c0d8dc5065ed2f0031095de Mon Sep 17 00:00:00 2001\n" "From: Andy Shevchenko <andriy.shevchenko@linux.intel.com>\n" "Date: Thu, 1 Feb 2018 21:52:14 +0200\n" "Subject: [PATCH 1/1] ACPI / bus: Do not traverse through non-existed\n" @@ -53,6 +56,27 @@ "---------\n" " 1 file changed, 41 insertions(+), 25 deletions(-)\n" "\n" + "diff --git a/drivers/acpi/bus.c b/drivers/acpi/bus.c\n" + "index 676c9788e1c8..33c5166e6028 100644\n" + "--- a/drivers/acpi/bus.c\n" + "+++ b/drivers/acpi/bus.c\n" + "@@ -660,13 +660,15 @@ struct acpi_device *acpi_companion_match(const\n" + "struct device *dev)\n" + " * acpi_of_match_device - Match device object using the \"compatible\"\n" + "property.\n" + " * @adev: ACPI device object to match.\n" + " * @of_match_table: List of device IDs to match against.\n" + "+ * @of_id: OF ID if matched\n" + " *\n" + " * If @dev has an ACPI companion which has ACPI_DT_NAMESPACE_HID in its\n" + "list of\n" + " * identifiers and a _DSD object with the \"compatible\" property, use\n" + "that\n" + " * property to match against the given list of identifiers.\n" + " */\n" + " static bool acpi_of_match_device(struct acpi_device *adev,\n" + "-\t\t\t\t const struct of_device_id\n" + "*of_match_table)\n" "+\t\t\t\t const struct of_device_id\n" "*of_match_table,\n" "+\t\t\t\t const struct of_device_id **of_id)\n" @@ -197,27 +221,14 @@ "+\t\t\t\t NULL, NULL);\n" " }\n" " EXPORT_SYMBOL_GPL(acpi_driver_match_device);\n" + " \n" + "-- \n" + "2.15.1\n" "\n" - "diff --git a/drivers/acpi/bus.c b/drivers/acpi/bus.c\n" - "index 676c9788e1c8..33c5166e6028 100644\n" - "--- a/drivers/acpi/bus.c\n" - "+++ b/drivers/acpi/bus.c\n" - "@@ -660,13 +660,15 @@ struct acpi_device *acpi_companion_match(const\n" - "struct device *dev)\n" - " * acpi_of_match_device - Match device object using the \"compatible\"\n" - "property.\n" - " * @adev: ACPI device object to match.\n" - " * @of_match_table: List of device IDs to match against.\n" - "+ * @of_id: OF ID if matched\n" - " *\n" - " * If @dev has an ACPI companion which has ACPI_DT_NAMESPACE_HID in its\n" - "list of\n" - " * identifiers and a _DSD object with the \"compatible\" property, use\n" - "that\n" - " * property to match against the given list of identifiers.\n" - " */\n" - " static bool acpi_of_match_device(struct acpi_device *adev,\n" - "-\t\t\t\t const struct of_device_id\n" - *of_match_table) + "\n" + "\n" + "-- \n" + "Andy Shevchenko <andriy.shevchenko@linux.intel.com>\n" + Intel Finland Oy -d1227a44eba6f6ffdb893aceef1923b7a08ca1f94a0c81cc85e128c8ca47a529 +35b9398fca75dba8e968d5ba4d1f709b82d7eab20e62ebf683e66136ddff47fd
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.