From 1c1d5f2d95a16836ccbf9f364bc7533a24eb263d Mon Sep 17 00:00:00 2001
From: Ben Hutchings <ben@decadent.org.uk>
Date: Fri, 20 Apr 2018 00:57:50 +0100
Subject: [PATCH] Documentation: Update references to
 drivers/base/firmware_class.c

---
 debian/changelog                              |  1 +
 ...date-references-to-drivers-base-firm.patch | 76 +++++++++++++++++++
 debian/patches/series                         |  1 +
 3 files changed, 78 insertions(+)
 create mode 100644 debian/patches/bugfix/all/documentation-update-references-to-drivers-base-firm.patch

diff --git a/debian/changelog b/debian/changelog
index 35d286d8a..e13ae85c7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,7 @@ linux (4.17~rc1-1~exp1) UNRELEASED; urgency=medium
     listnewconfig now shows symbol values by default
   * debian/rules.real: Stop enabling verbose output for listnewconfig target
   * Documentation: typec.rst: Use literal-block element with ascii art
+  * Documentation: Update references to drivers/base/firmware_class.c
 
  -- Ben Hutchings <ben@decadent.org.uk>  Thu, 19 Apr 2018 21:37:24 +0100
 
diff --git a/debian/patches/bugfix/all/documentation-update-references-to-drivers-base-firm.patch b/debian/patches/bugfix/all/documentation-update-references-to-drivers-base-firm.patch
new file mode 100644
index 000000000..d83af6a37
--- /dev/null
+++ b/debian/patches/bugfix/all/documentation-update-references-to-drivers-base-firm.patch
@@ -0,0 +1,76 @@
+From: Ben Hutchings <ben@decadent.org.uk>
+Date: Fri, 20 Apr 2018 00:55:42 +0100
+Subject: Documentation: Update references to drivers/base/firmware_class.c
+
+This source file has been renamed in 4.17.
+
+Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
+---
+ Documentation/driver-api/firmware/request_firmware.rst | 10 +++++-----
+ Documentation/driver-api/infrastructure.rst            |  2 +-
+ Documentation/power/suspend-and-cpuhotplug.txt         |  2 +-
+ 3 files changed, 7 insertions(+), 7 deletions(-)
+
+--- a/Documentation/driver-api/firmware/request_firmware.rst
++++ b/Documentation/driver-api/firmware/request_firmware.rst
+@@ -17,17 +17,17 @@ an error is returned.
+ 
+ request_firmware
+ ----------------
+-.. kernel-doc:: drivers/base/firmware_class.c
++.. kernel-doc:: drivers/base/firmware_loader/main.c
+    :functions: request_firmware
+ 
+ request_firmware_direct
+ -----------------------
+-.. kernel-doc:: drivers/base/firmware_class.c
++.. kernel-doc:: drivers/base/firmware_loader/main.c
+    :functions: request_firmware_direct
+ 
+ request_firmware_into_buf
+ -------------------------
+-.. kernel-doc:: drivers/base/firmware_class.c
++.. kernel-doc:: drivers/base/firmware_loader/main.c
+    :functions: request_firmware_into_buf
+ 
+ Asynchronous firmware requests
+@@ -41,7 +41,7 @@ in atomic contexts.
+ 
+ request_firmware_nowait
+ -----------------------
+-.. kernel-doc:: drivers/base/firmware_class.c
++.. kernel-doc:: drivers/base/firmware_loader/main.c
+    :functions: request_firmware_nowait
+ 
+ Special optimizations on reboot
+@@ -55,7 +55,7 @@ firmare to be loaded.
+ 
+ firmware_request_cache()
+ -----------------------
+-.. kernel-doc:: drivers/base/firmware_class.c
++.. kernel-doc:: drivers/base/firmware_loader/main.c
+    :functions: firmware_request_cache
+ 
+ request firmware API expected driver use
+--- a/Documentation/driver-api/infrastructure.rst
++++ b/Documentation/driver-api/infrastructure.rst
+@@ -28,7 +28,7 @@ Device Drivers Base
+ .. kernel-doc:: drivers/base/node.c
+    :internal:
+ 
+-.. kernel-doc:: drivers/base/firmware_class.c
++.. kernel-doc:: drivers/base/firmware_loader/main.c
+    :export:
+ 
+ .. kernel-doc:: drivers/base/transport_class.c
+--- a/Documentation/power/suspend-and-cpuhotplug.txt
++++ b/Documentation/power/suspend-and-cpuhotplug.txt
+@@ -168,7 +168,7 @@ update on the CPUs, as discussed below:
+ 
+ [Please bear in mind that the kernel requests the microcode images from
+ userspace, using the request_firmware() function defined in
+-drivers/base/firmware_class.c]
++drivers/base/firmware_loader/main.c]
+ 
+ 
+ a. When all the CPUs are identical:
diff --git a/debian/patches/series b/debian/patches/series
index 4781a2d68..61820d86a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -80,6 +80,7 @@ bugfix/all/kbuild-include-addtree-remove-quotes-before-matching-path.patch
 debian/revert-objtool-fix-config_stack_validation-y-warning.patch
 bugfix/all/i40e-build-for-64-bit-targets-only.patch
 bugfix/all/documentation-typec.rst-use-literal-block-element-wi.patch
+bugfix/all/documentation-update-references-to-drivers-base-firm.patch
 
 # Miscellaneous features