2 files changed, 0 insertions, 28 deletions

diff --git a/Documentation/firmware_class/README b/Documentation/firmware_class/README
index 43e836c07ae8..e9cc8bb26f7d 100644
--- a/Documentation/firmware_class/README
+++ b/Documentation/firmware_class/README
@@ -105,20 +105,3 @@
    on the setup, so I think that the choice on what firmware to make
    persistent should be left to userspace.
 
- - Why register_firmware()+__init can be useful:
-        - For boot devices needing firmware.
-        - To make the transition easier:
-                The firmware can be declared __init and register_firmware()
-                called on module_init. Then the firmware is warranted to be
-                there even if "firmware hotplug userspace" is not there yet or
-                it doesn't yet provide the needed firmware.
-                Once the firmware is widely available in userspace, it can be
-                removed from the kernel. Or made optional (CONFIG_.*_FIRMWARE).
-
-        In either case, if firmware hotplug support is there, it can move the
-        firmware out of kernel memory into the real filesystem for later
-        usage.
-
-        Note: If persistence is implemented on top of initramfs,
-        register_firmware() may not be appropriate.
-
diff --git a/Documentation/firmware_class/firmware_sample_driver.c b/Documentation/firmware_class/firmware_sample_driver.c
index ad3edaba4533..87feccdb5c9f 100644
--- a/Documentation/firmware_class/firmware_sample_driver.c
+++ b/Documentation/firmware_class/firmware_sample_driver.c
@@ -5,8 +5,6 @@
  *
  * Sample code on how to use request_firmware() from drivers.
  *
- * Note that register_firmware() is currently useless.
- *
  */
 
 #include <linux/module.h>
@@ -17,11 +15,6 @@
 
 #include "linux/firmware.h"
 
-#define WE_CAN_NEED_FIRMWARE_BEFORE_USERSPACE_IS_AVAILABLE
-#ifdef WE_CAN_NEED_FIRMWARE_BEFORE_USERSPACE_IS_AVAILABLE
-char __init inkernel_firmware[] = "let's say that this is firmware\n";
-#endif
-
 static struct device ghost_device = {
         .bus_id    = "ghost0",
 };
@@ -104,10 +97,6 @@ static void sample_probe_async(void)
 
 static int sample_init(void)
 {
-#ifdef WE_CAN_NEED_FIRMWARE_BEFORE_USERSPACE_IS_AVAILABLE
-        register_firmware("sample_driver_fw", inkernel_firmware,
-                          sizeof(inkernel_firmware));
-#endif
         device_initialize(&ghost_device);
         /* since there is no real hardware insertion I just call the
          * sample probe functions here */