Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-2.6: (36 commits)
  SCSI: convert struct class_device to struct device
  DRM: remove unused dev_class
  IB: rename "dev" to "srp_dev" in srp_host structure
  IB: convert struct class_device to struct device
  memstick: convert struct class_device to struct device
  driver core: replace remaining __FUNCTION__ occurrences
  sysfs: refill attribute buffer when reading from offset 0
  PM: Remove destroy_suspended_device()
  Firmware: add iSCSI iBFT Support
  PM: Remove legacy PM (fix)
  Kobject: Replace list_for_each() with list_for_each_entry().
  SYSFS: Explicitly include required header file slab.h.
  Driver core: make device_is_registered() work for class devices
  PM: Convert wakeup flag accessors to inline functions
  PM: Make wakeup flags available whenever CONFIG_PM is set
  PM: Fix misuse of wakeup flag accessors in serial core
  Driver core: Call device_pm_add() after bus_add_device() in device_add()
  PM: Handle device registrations during suspend/resume
  block: send disk "change" event for rescan_partitions()
  sysdev: detect multiple driver registrations
  ...

Fixed trivial conflict in include/linux/memory.h due to semaphore header
file change (made irrelevant by the change to mutex).

1 files changed, 120 insertions, 0 deletions

diff --git a/samples/firmware_class/firmware_sample_driver.c b/samples/firmware_class/firmware_sample_driver.c
new file mode 100644
index 000000000000..165cff98032e
--- /dev/null
+++ b/samples/firmware_class/firmware_sample_driver.c
@@ -0,0 +1,120 @@
+/*
+ * firmware_sample_driver.c -
+ *
+ * Copyright (c) 2003 Manuel Estrada Sainz
+ *
+ * Sample code on how to use request_firmware() from drivers.
+ *
+ */
+
+#include <linux/module.h>
+#include <linux/kernel.h>
+#include <linux/init.h>
+#include <linux/device.h>
+#include <linux/string.h>
+#include <linux/firmware.h>
+
+static struct device ghost_device = {
+        .bus_id    = "ghost0",
+};
+
+
+static void sample_firmware_load(char *firmware, int size)
+{
+        u8 buf[size+1];
+        memcpy(buf, firmware, size);
+        buf[size] = '\0';
+        printk(KERN_INFO "firmware_sample_driver: firmware: %s\n", buf);
+}
+
+static void sample_probe_default(void)
+{
+        /* uses the default method to get the firmware */
+        const struct firmware *fw_entry;
+        int retval;
+
+        printk(KERN_INFO "firmware_sample_driver: "
+                "a ghost device got inserted :)\n");
+
+        retval = request_firmware(&fw_entry, "sample_driver_fw", &ghost_device);
+        if (retval) {
+                printk(KERN_ERR
+                       "firmware_sample_driver: Firmware not available\n");
+                return;
+        }
+
+        sample_firmware_load(fw_entry->data, fw_entry->size);
+
+        release_firmware(fw_entry);
+
+        /* finish setting up the device */
+}
+
+static void sample_probe_specific(void)
+{
+        int retval;
+        /* Uses some specific hotplug support to get the firmware from
+         * userspace  directly into the hardware, or via some sysfs file */
+
+        /* NOTE: This currently doesn't work */
+
+        printk(KERN_INFO "firmware_sample_driver: "
+                "a ghost device got inserted :)\n");
+
+        retval = request_firmware(NULL, "sample_driver_fw", &ghost_device);
+        if (retval) {
+                printk(KERN_ERR
+                       "firmware_sample_driver: Firmware load failed\n");
+                return;
+        }
+
+        /* request_firmware blocks until userspace finished, so at
+         * this point the firmware should be already in the device */
+
+        /* finish setting up the device */
+}
+static void sample_probe_async_cont(const struct firmware *fw, void *context)
+{
+        if (!fw) {
+                printk(KERN_ERR
+                       "firmware_sample_driver: firmware load failed\n");
+                return;
+        }
+
+        printk(KERN_INFO "firmware_sample_driver: device pointer \"%s\"\n",
+               (char *)context);
+        sample_firmware_load(fw->data, fw->size);
+}
+
+static void sample_probe_async(void)
+{
+        /* Let's say that I can't sleep */
+        int error;
+        error = request_firmware_nowait(THIS_MODULE, FW_ACTION_NOHOTPLUG,
+                                        "sample_driver_fw", &ghost_device,
+                                        "my device pointer",
+                                        sample_probe_async_cont);
+        if (error)
+                printk(KERN_ERR "firmware_sample_driver:"
+                       " request_firmware_nowait failed\n");
+}
+
+static int sample_init(void)
+{
+        device_initialize(&ghost_device);
+        /* since there is no real hardware insertion I just call the
+         * sample probe functions here */
+        sample_probe_specific();
+        sample_probe_default();
+        sample_probe_async();
+        return 0;
+}
+
+static void __exit sample_exit(void)
+{
+}
+
+module_init(sample_init);
+module_exit(sample_exit);
+
+MODULE_LICENSE("GPL");