1 files changed, 9 insertions, 29 deletions

diff --git a/Documentation/firmware_class/README b/Documentation/firmware_class/README
index 43fada989e6..7eceaff63f5 100644
--- a/Documentation/firmware_class/README
+++ b/Documentation/firmware_class/README
@@ -18,45 +18,32 @@
  High level behavior (mixed):
  ============================
 
- 1), kernel(driver):
-        - calls request_firmware(&fw_entry, $FIRMWARE, device)
-        - kernel searchs the fimware image with name $FIRMWARE directly
-        in the below search path of root filesystem:
-                User customized search path by module parameter 'path'[1]
-                "/lib/firmware/updates/" UTS_RELEASE,
-                "/lib/firmware/updates",
-                "/lib/firmware/" UTS_RELEASE,
-                "/lib/firmware"
-        - If found, goto 7), else goto 2)
-
-        [1], the 'path' is a string parameter which length should be less
-        than 256, user should pass 'firmware_class.path=$CUSTOMIZED_PATH'
-        if firmware_class is built in kernel(the general situation)
-
- 2), userspace:
+ kernel(driver): calls request_firmware(&fw_entry, $FIRMWARE, device)
+
+ userspace:
         - /sys/class/firmware/xxx/{loading,data} appear.
         - hotplug gets called with a firmware identifier in $FIRMWARE
           and the usual hotplug environment.
                 - hotplug: echo 1 > /sys/class/firmware/xxx/loading
 
- 3), kernel: Discard any previous partial load.
+ kernel: Discard any previous partial load.
 
- 4), userspace:
+ userspace:
                 - hotplug: cat appropriate_firmware_image > \
                                         /sys/class/firmware/xxx/data
 
- 5), kernel: grows a buffer in PAGE_SIZE increments to hold the image as it
+ kernel: grows a buffer in PAGE_SIZE increments to hold the image as it
          comes in.
 
- 6), userspace:
+ userspace:
                 - hotplug: echo 0 > /sys/class/firmware/xxx/loading
 
- 7), kernel: request_firmware() returns and the driver has the firmware
+ kernel: request_firmware() returns and the driver has the firmware
          image in fw_entry->{data,size}. If something went wrong
          request_firmware() returns non-zero and fw_entry is set to
          NULL.
 
- 8), kernel(driver): Driver code calls release_firmware(fw_entry) releasing
+ kernel(driver): Driver code calls release_firmware(fw_entry) releasing
                  the firmware image and any related resource.
 
  High level behavior (driver code):
@@ -119,10 +106,3 @@
    on the setup, so I think that the choice on what firmware to make
    persistent should be left to userspace.
 
- about firmware cache:
- --------------------
- After firmware cache mechanism is introduced during system sleep,
- request_firmware can be called safely inside device's suspend and
- resume callback, and callers need't cache the firmware by
- themselves any more for dealing with firmware loss during system
- resume.