aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRandy Dunlap <randy.dunlap@oracle.com>2008-02-20 16:20:50 -0500
committerGreg Kroah-Hartman <gregkh@suse.de>2008-04-19 22:10:20 -0400
commitd289bf7bdd84d636054acb0b3d14a4708f8a8233 (patch)
tree827bf43c58a95017b59eeac7deb5c3d5d760750e
parent3612e06b2c1cec41e9a59da3eec673a206af4643 (diff)
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)
40 "firmware_sample_driver: Firmware not available\n"); 40 "firmware_sample_driver: Firmware not available\n");
41 return; 41 return;
42 } 42 }
43 43
44 sample_firmware_load(fw_entry->data, fw_entry->size); 44 sample_firmware_load(fw_entry->data, fw_entry->size);
45 45
46 release_firmware(fw_entry); 46 release_firmware(fw_entry);
@@ -62,7 +62,7 @@ static void sample_probe_specific(void)
62 "firmware_sample_driver: Firmware load failed\n"); 62 "firmware_sample_driver: Firmware load failed\n");
63 return; 63 return;
64 } 64 }
65 65
66 /* request_firmware blocks until userspace finished, so at 66 /* request_firmware blocks until userspace finished, so at
67 * this point the firmware should be already in the device */ 67 * this point the firmware should be already in the device */
68 68
@@ -89,7 +89,7 @@ static void sample_probe_async(void)
89 "my device pointer", 89 "my device pointer",
90 sample_probe_async_cont); 90 sample_probe_async_cont);
91 if(error){ 91 if(error){
92 printk(KERN_ERR 92 printk(KERN_ERR
93 "firmware_sample_driver:" 93 "firmware_sample_driver:"
94 " request_firmware_nowait failed\n"); 94 " request_firmware_nowait failed\n");
95 } 95 }
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,
56 int prev_loading = fw_priv->loading; 56 int prev_loading = fw_priv->loading;
57 57
58 fw_priv->loading = simple_strtol(buf, NULL, 10); 58 fw_priv->loading = simple_strtol(buf, NULL, 10);
59 59
60 switch(fw_priv->loading){ 60 switch(fw_priv->loading){
61 case -1: 61 case -1:
62 /* abort load an panic */ 62 /* abort load an panic */
@@ -152,7 +152,7 @@ static int fw_setup_class_device(struct class_device *class_dev,
152 } 152 }
153 153
154 goto out; 154 goto out;
155 155
156error_remove_data: 156error_remove_data:
157 sysfs_remove_bin_file(&class_dev->kobj, &firmware_attr_data); 157 sysfs_remove_bin_file(&class_dev->kobj, &firmware_attr_data);
158error_unreg_class_dev: 158error_unreg_class_dev:
@@ -202,6 +202,6 @@ static void __exit firmware_sample_exit(void)
202 kfree(fw_priv); 202 kfree(fw_priv);
203 kfree(class_dev); 203 kfree(class_dev);
204} 204}
205
205module_init(firmware_sample_init); 206module_init(firmware_sample_init);
206module_exit(firmware_sample_exit); 207module_exit(firmware_sample_exit);
207