Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ee3748be authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'driver-core-4.17-rc3' of... 

Merge tag 'driver-core-4.17-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core

Pull driver core fixes from Greg Kroah-Hartman:
 "Here are some small driver core and firmware fixes for 4.17-rc3

  There's a kobject WARN() removal to make syzkaller a lot happier about
  some "normal" error paths that it keeps hitting, which should reduce
  the number of false-positives we have been getting recently.

  There's also some fimware test and documentation fixes, and the
  coredump() function signature change that needed to happen after -rc1
  before drivers started to take advantage of it.

  All of these have been in linux-next with no reported issues"

* tag 'driver-core-4.17-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core:
  firmware: some documentation fixes
  selftests:firmware: fixes a call to a wrong function name
  kobject: don't use WARN for registration failures
  firmware: Fix firmware documentation for recent file renames
  test_firmware: fix setting old custom fw path back on exit, second try
  test_firmware: Install all scripts
  drivers: change struct device_driver::coredump() return type to void
parents b52c85a7 b93815d0

Documentation/driver-api/firmware/request_firmware.rst

+8 −8
Original line number Diff line number Diff line
@@ -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
@@ -50,12 +50,12 @@ Special optimizations on reboot 
Some devices have an optimization in place to enable the firmware to be

retained during system reboot. When such optimizations are used the driver

author must ensure the firmware is still available on resume from suspend,

this can be done with firmware_request_cache() insted of requesting for the

firmare to be loaded.

this can be done with firmware_request_cache() instead of requesting for the

firmware 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

Documentation/driver-api/infrastructure.rst

+1 −1
Original line number Diff line number Diff line
@@ -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

Documentation/power/suspend-and-cpuhotplug.txt

+1 −1
Original line number Diff line number Diff line
@@ -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:

drivers/base/firmware_loader/fallback.c

+2 −2
Original line number Diff line number Diff line
@@ -537,8 +537,8 @@ fw_create_instance(struct firmware *firmware, const char *fw_name, 
}



/**

 * fw_load_sysfs_fallback - load a firmware via the syfs fallback mechanism

 * @fw_sysfs: firmware syfs information for the firmware to load

 * fw_load_sysfs_fallback - load a firmware via the sysfs fallback mechanism

 * @fw_sysfs: firmware sysfs information for the firmware to load

 * @opt_flags: flags of options, FW_OPT_*

 * @timeout: timeout to wait for the load

 *

drivers/base/firmware_loader/fallback.h

+1 −1
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ 
#include <linux/device.h>



/**

 * struct firmware_fallback_config - firmware fallback configuratioon settings

 * struct firmware_fallback_config - firmware fallback configuration settings

 *

 * Helps describe and fine tune the fallback mechanism.

 *