Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/juhl/trivial

[safe/jmp/linux-2.6] / samples / firmware_class / firmware_sample_driver.c

diff --git a/Documentation/firmware_class/firmware_sample_driver.c b/samples/firmware_class/firmware_sample_driver.c
similarity index 76%
rename from Documentation/firmware_class/firmware_sample_driver.c
rename to samples/firmware_class/firmware_sample_driver.c
index 600cdd9..11114f3 100644 (file)
--- a/Documentation/firmware_class/firmware_sample_driver.c
+++ b/samples/firmware_class/firmware_sample_driver.c
@@ -12,8 +12,7 @@
 #include <linux/init.h>
 #include <linux/device.h>
 #include <linux/string.h>
-
-#include "linux/firmware.h"
+#include <linux/firmware.h>
 
 static struct device ghost_device = {
        .bus_id    = "ghost0",
@@ -31,41 +30,50 @@ static void sample_firmware_load(char *firmware, int size)
 static void sample_probe_default(void)
 {
        /* uses the default method to get the firmware */
-        const struct firmware *fw_entry;
-       printk(KERN_INFO "firmware_sample_driver: a ghost device got inserted :)\n");
+       const struct firmware *fw_entry;
+       int retval;
+
+       printk(KERN_INFO "firmware_sample_driver: "
+               "a ghost device got inserted :)\n");
 
-        if (request_firmware(&fw_entry, "sample_driver_fw", &ghost_device)!=0) {
+       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");
+       printk(KERN_INFO "firmware_sample_driver: "
+               "a ghost device got inserted :)\n");
 
-        if (request_firmware(NULL, "sample_driver_fw", &ghost_device)!=0) {
+       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) {
@@ -78,18 +86,18 @@ static void sample_probe_async_cont(const struct firmware *fw, void *context)
               (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) {
+       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)
@@ -107,7 +115,7 @@ static void __exit sample_exit(void)
 {
 }
 
-module_init (sample_init);
-module_exit (sample_exit);
+module_init(sample_init);
+module_exit(sample_exit);
 
 MODULE_LICENSE("GPL");