diff options
| author | Randy Dunlap <randy.dunlap@oracle.com> | 2008-02-20 13:20:50 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2008-04-19 19:10:20 -0700 |
| commit | d289bf7bdd84d636054acb0b3d14a4708f8a8233 (patch) | |
| tree | 827bf43c58a95017b59eeac7deb5c3d5d760750e | |
| parent | 3612e06b2c1cec41e9a59da3eec673a206af4643 (diff) | |
| download | linux-stable-d289bf7bdd84d636054acb0b3d14a4708f8a8233.tar.gz | |
firmware: move firmware_class from Documentation/ to samples/
Move the firmware_class sample drivers to samples/ so that they are
buildable and can be maintained.
Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
Acked-by: Marcel Holtmann <marcel@holtmann.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| -rw-r--r-- | samples/firmware_class/firmware_sample_driver.c (renamed from Documentation/firmware_class/firmware_sample_driver.c) | 6 | ||||
| -rw-r--r-- | samples/firmware_class/firmware_sample_firmware_class.c (renamed from Documentation/firmware_class/firmware_sample_firmware_class.c) | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/Documentation/firmware_class/firmware_sample_driver.c b/samples/firmware_class/firmware_sample_driver.c index 6865cbe075ec..ff0f2f2bd1a8 100644 --- a/Documentation/firmware_class/firmware_sample_driver.c +++ b/samples/firmware_class/firmware_sample_driver.c @@ -40,7 +40,7 @@ static void sample_probe_default(void) "firmware_sample_driver: Firmware not available\n"); return; } - + sample_firmware_load(fw_entry->data, fw_entry->size); release_firmware(fw_entry); @@ -62,7 +62,7 @@ static void sample_probe_specific(void) "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 */ @@ -89,7 +89,7 @@ static void sample_probe_async(void) "my device pointer", sample_probe_async_cont); if(error){ - printk(KERN_ERR + printk(KERN_ERR "firmware_sample_driver:" " request_firmware_nowait failed\n"); } diff --git a/Documentation/firmware_class/firmware_sample_firmware_class.c b/samples/firmware_class/firmware_sample_firmware_class.c index 2de62854f0e5..2799c472133e 100644 --- a/Documentation/firmware_class/firmware_sample_firmware_class.c +++ b/samples/firmware_class/firmware_sample_firmware_class.c @@ -56,7 +56,7 @@ static ssize_t firmware_loading_store(struct class_device *class_dev, int prev_loading = fw_priv->loading; fw_priv->loading = simple_strtol(buf, NULL, 10); - + switch(fw_priv->loading){ case -1: /* abort load an panic */ @@ -152,7 +152,7 @@ static int fw_setup_class_device(struct class_device *class_dev, } goto out; - + error_remove_data: sysfs_remove_bin_file(&class_dev->kobj, &firmware_attr_data); error_unreg_class_dev: @@ -202,6 +202,6 @@ static void __exit firmware_sample_exit(void) kfree(fw_priv); kfree(class_dev); } + module_init(firmware_sample_init); module_exit(firmware_sample_exit); - |