Skip to contentSkip to conversation

documentation: fix firmware_sample_firmware_class to build

PATCH In review Randy Dunlap 5 participants 12 messages Feb 19, 2008 – Feb 21, 2008

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 documentation: fix firmware_sample_firmware_class to build

From: Randy Dunlap <[email protected]>

Fix firmware_sample_firmware_class module to build without error. sysfs.h already has the function prototypes and has them correctly.

Documentation/firmware_class/firmware_sample_firmware_class.c:37: error: conflicting types for 'sysfs_remove_bin_file' include/linux/sysfs.h:100: error: previous declaration of 'sysfs_remove_bin_file' was here

---
 Documentation/firmware_class/firmware_sample_firmware_class.c |    3 ---
 1 file changed, 3 deletions(-)
Documentation/firmware_class/firmware_sample_firmware_class.c +0 -3
@@ -33,9 +33,6 @@ struct class_device_attribute *to_class_
 	return container_of(_attr,struct class_device_attribute,attr);
 }
 
-int sysfs_create_bin_file(struct kobject * kobj, struct bin_attribute * attr);
-int sysfs_remove_bin_file(struct kobject * kobj, struct bin_attribute * attr);
-
 struct firmware_priv {
 	char fw_id[FIRMWARE_NAME_MAX];
 	s32 loading:2;
#1 lore raw
Quoted 16 lines · Randy Dunlap

From: Randy Dunlap <[email protected]>

Fix firmware_sample_firmware_class module to build without error. sysfs.h already has the function prototypes and has them correctly.

Documentation/firmware_class/firmware_sample_firmware_class.c:37: error: conflicting types for 'sysfs_remove_bin_file' include/linux/sysfs.h:100: error: previous declaration of 'sysfs_remove_bin_file' was here

---
 Documentation/firmware_class/firmware_sample_firmware_class.c |    3 ---
 1 file changed, 3 deletions(-)

Documentation/firmware_class/firmware_sample_firmware_class.c struct class_device_attribute *to_class_ · line 38

Quoted 9 lines
Documentation/firmware_class/firmware_sample_firmware_class.c +0 -3
@@ -33,9 +33,6 @@ struct class_device_attribute *to_class_
 	return container_of(_attr,struct class_device_attribute,attr);
 }
 
-int sysfs_create_bin_file(struct kobject * kobj, struct bin_attribute * attr);
-int sysfs_remove_bin_file(struct kobject * kobj, struct bin_attribute * attr);
-
 struct firmware_priv {
 	char fw_id[FIRMWARE_NAME_MAX];
 	s32 loading:2;

You'll need this as well, for the !CONFIG_SYSFS case.

---
 include/linux/sysfs.h |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
include/linux/sysfs.h +2 -2
@@ -169,8 +169,8 @@ static inline int sysfs_create_bin_file(struct kobject *kobj,
 	return 0;
 }
 
-static inline int sysfs_remove_bin_file(struct kobject *kobj,
-					struct bin_attribute *attr)
+static inline void sysfs_remove_bin_file(struct kobject *kobj,
+					 struct bin_attribute *attr)
 {
 	return 0;
 }
#2 lore raw

Change sysfs_remove_bin_file() to have a return value of void in the !CONFIG_SYSFS case, matching the return value of the same function with the opposite configuration.

Also moves unnecessary ';' in empty void functions.

---
 include/linux/sysfs.h |   11 +++--------
 1 files changed, 3 insertions(+), 8 deletions(-)
include/linux/sysfs.h +3 -8
@@ -93,7 +93,7 @@ int __must_check sysfs_create_file(struct kobject *kobj,
 				   const struct attribute *attr);
 int __must_check sysfs_chmod_file(struct kobject *kobj, struct attribute *attr,
 				  mode_t mode);
-void sysfs_remove_file(struct kobject *kobj, const struct attribute *attr);
+void wsysfs_remove_file(struct kobject *kobj, const struct attribute *attr);
 
 int __must_check sysfs_create_bin_file(struct kobject *kobj,
 				       struct bin_attribute *attr);
@@ -131,7 +131,6 @@ static inline int sysfs_create_dir(struct kobject *kobj)
 
 static inline void sysfs_remove_dir(struct kobject *kobj)
 {
-	;
 }
 
 static inline int sysfs_rename_dir(struct kobject *kobj, const char *new_name)
@@ -160,7 +159,6 @@ static inline int sysfs_chmod_file(struct kobject *kobj,
 static inline void sysfs_remove_file(struct kobject *kobj,
 				     const struct attribute *attr)
 {
-	;
 }
 
 static inline int sysfs_create_bin_file(struct kobject *kobj,
@@ -169,10 +167,9 @@ static inline int sysfs_create_bin_file(struct kobject *kobj,
 	return 0;
 }
 
-static inline int sysfs_remove_bin_file(struct kobject *kobj,
-					struct bin_attribute *attr)
+static inline void sysfs_remove_bin_file(struct kobject *kobj,
+					 struct bin_attribute *attr)
 {
-	return 0;
 }
 
 static inline int sysfs_create_link(struct kobject *kobj,
@@ -183,7 +180,6 @@ static inline int sysfs_create_link(struct kobject *kobj,
 
 static inline void sysfs_remove_link(struct kobject *kobj, const char *name)
 {
-	;
 }
 
 static inline int sysfs_create_group(struct kobject *kobj,
@@ -195,7 +191,6 @@ static inline int sysfs_create_group(struct kobject *kobj,
 static inline void sysfs_remove_group(struct kobject *kobj,
 				      const struct attribute_group *grp)
 {
-	;
 }
 
 static inline int sysfs_add_file_to_group(struct kobject *kobj,
#3 lore raw
Quoted 16 lines · On Mon, 18 Feb 2008 16:51:31 -0800 (PST) David Rientjes wrote:

Change sysfs_remove_bin_file() to have a return value of void in the !CONFIG_SYSFS case, matching the return value of the same function with the opposite configuration.

Also moves unnecessary ';' in empty void functions.

---
 include/linux/sysfs.h |   11 +++--------
 1 files changed, 3 insertions(+), 8 deletions(-)

include/linux/sysfs.h int __must_check sysfs_create_file(struct kobject *kobj, · line 96

Quoted 5 lines
include/linux/sysfs.h +1 -1
@@ -93,7 +93,7 @@ int __must_check sysfs_create_file(struct kobject *kobj,
 				   const struct attribute *attr);
 int __must_check sysfs_chmod_file(struct kobject *kobj, struct attribute *attr,
 				  mode_t mode);
-void sysfs_remove_file(struct kobject *kobj, const struct attribute *attr);
+void wsysfs_remove_file(struct kobject *kobj, const struct attribute *attr);

Please explain the change above. I don't get it...

Quoted 41 lines
include/linux/sysfs.h +2 -6
 int __must_check sysfs_create_bin_file(struct kobject *kobj,
 				       struct bin_attribute *attr);
@@ -131,7 +131,6 @@ static inline int sysfs_create_dir(struct kobject *kobj)
 
 static inline void sysfs_remove_dir(struct kobject *kobj)
 {
-	;
 }
 
 static inline int sysfs_rename_dir(struct kobject *kobj, const char *new_name)
@@ -160,7 +159,6 @@ static inline int sysfs_chmod_file(struct kobject *kobj,
 static inline void sysfs_remove_file(struct kobject *kobj,
 				     const struct attribute *attr)
 {
-	;
 }
 
 static inline int sysfs_create_bin_file(struct kobject *kobj,
@@ -169,10 +167,9 @@ static inline int sysfs_create_bin_file(struct kobject *kobj,
 	return 0;
 }
 
-static inline int sysfs_remove_bin_file(struct kobject *kobj,
-					struct bin_attribute *attr)
+static inline void sysfs_remove_bin_file(struct kobject *kobj,
+					 struct bin_attribute *attr)
 {
-	return 0;
 }
 
 static inline int sysfs_create_link(struct kobject *kobj,
@@ -183,7 +180,6 @@ static inline int sysfs_create_link(struct kobject *kobj,
 
 static inline void sysfs_remove_link(struct kobject *kobj, const char *name)
 {
-	;
 }
 
 static inline int sysfs_create_group(struct kobject *kobj,

include/linux/sysfs.h static inline int sysfs_create_group(struct kobject *kobj, · line 196

Quoted 7 lines
include/linux/sysfs.h +0 -1
@@ -195,7 +191,6 @@ static inline int sysfs_create_group(struct kobject *kobj,
 static inline void sysfs_remove_group(struct kobject *kobj,
 				      const struct attribute_group *grp)
 {
-	;
 }
 
 static inline int sysfs_add_file_to_group(struct kobject *kobj,

---
~Randy

#4 lore raw

PATCH 1/1 sysfs: small header file cleanup

Convert sysfs_remove_bin_file() to have a return type of 'void' for !CONFIG_SYSFS configurations. Also removes unnecessary colons from empty void functions.

---
 include/linux/sysfs.h |    9 ++-------
 1 files changed, 2 insertions(+), 7 deletions(-)
include/linux/sysfs.h +2 -7
@@ -131,7 +131,6 @@ static inline int sysfs_create_dir(struct kobject *kobj)
 
 static inline void sysfs_remove_dir(struct kobject *kobj)
 {
-	;
 }
 
 static inline int sysfs_rename_dir(struct kobject *kobj, const char *new_name)
@@ -160,7 +159,6 @@ static inline int sysfs_chmod_file(struct kobject *kobj,
 static inline void sysfs_remove_file(struct kobject *kobj,
 				     const struct attribute *attr)
 {
-	;
 }
 
 static inline int sysfs_create_bin_file(struct kobject *kobj,
@@ -169,10 +167,9 @@ static inline int sysfs_create_bin_file(struct kobject *kobj,
 	return 0;
 }
 
-static inline int sysfs_remove_bin_file(struct kobject *kobj,
-					struct bin_attribute *attr)
+static inline void sysfs_remove_bin_file(struct kobject *kobj,
+					 struct bin_attribute *attr)
 {
-	return 0;
 }
 
 static inline int sysfs_create_link(struct kobject *kobj,
@@ -183,7 +180,6 @@ static inline int sysfs_create_link(struct kobject *kobj,
 
 static inline void sysfs_remove_link(struct kobject *kobj, const char *name)
 {
-	;
 }
 
 static inline int sysfs_create_group(struct kobject *kobj,
@@ -195,7 +191,6 @@ static inline int sysfs_create_group(struct kobject *kobj,
 static inline void sysfs_remove_group(struct kobject *kobj,
 				      const struct attribute_group *grp)
 {
-	;
 }
 
 static inline int sysfs_add_file_to_group(struct kobject *kobj,
author Reviewed-by on v1 1/1
#5 lore raw

Re: [patch] sysfs: small header file cleanup

Quoted 5 lines · David Rientjes

Convert sysfs_remove_bin_file() to have a return type of 'void' for !CONFIG_SYSFS configurations. Also removes unnecessary colons from empty void functions.

Cc Randy Dunlap <[email protected]>

Thanks, David.

Quoted 53 lines
---
 include/linux/sysfs.h |    9 ++-------
 1 files changed, 2 insertions(+), 7 deletions(-)
include/linux/sysfs.h +2 -7
@@ -131,7 +131,6 @@ static inline int sysfs_create_dir(struct kobject *kobj)
 
 static inline void sysfs_remove_dir(struct kobject *kobj)
 {
-	;
 }
 
 static inline int sysfs_rename_dir(struct kobject *kobj, const char *new_name)
@@ -160,7 +159,6 @@ static inline int sysfs_chmod_file(struct kobject *kobj,
 static inline void sysfs_remove_file(struct kobject *kobj,
 				     const struct attribute *attr)
 {
-	;
 }
 
 static inline int sysfs_create_bin_file(struct kobject *kobj,
@@ -169,10 +167,9 @@ static inline int sysfs_create_bin_file(struct kobject *kobj,
 	return 0;
 }
 
-static inline int sysfs_remove_bin_file(struct kobject *kobj,
-					struct bin_attribute *attr)
+static inline void sysfs_remove_bin_file(struct kobject *kobj,
+					 struct bin_attribute *attr)
 {
-	return 0;
 }
 
 static inline int sysfs_create_link(struct kobject *kobj,
@@ -183,7 +180,6 @@ static inline int sysfs_create_link(struct kobject *kobj,
 
 static inline void sysfs_remove_link(struct kobject *kobj, const char *name)
 {
-	;
 }
 
 static inline int sysfs_create_group(struct kobject *kobj,
@@ -195,7 +191,6 @@ static inline int sysfs_create_group(struct kobject *kobj,
 static inline void sysfs_remove_group(struct kobject *kobj,
 				      const struct attribute_group *grp)
 {
-	;
 }
 
 static inline int sysfs_add_file_to_group(struct kobject *kobj,
Signature · 1 line
~Randy
#6 lore raw
In reply to Randy Dunlap
Quoted 5 lines · Randy Dunlap

From: Randy Dunlap <[email protected]>

Fix firmware_sample_firmware_class module to build without error. sysfs.h already has the function prototypes and has them correctly.

Quoted 7 lines

Documentation/firmware_class/firmware_sample_firmware_class.c:37: error: conflicting types for 'sysfs_remove_bin_file' include/linux/sysfs.h:100: error: previous declaration of 'sysfs_remove_bin_file' was here

---
 Documentation/firmware_class/firmware_sample_firmware_class.c |    3 ---
 1 file changed, 3 deletions(-)

Can we move this file to the samples/ directory, so the build will catch stuff like this?

What's the final version of this patch?

thanks,

greg k-h

#7 lore raw
Quoted 14 lines · Greg KH
Quoted 5 lines · Randy Dunlap

From: Randy Dunlap <[email protected]>

Fix firmware_sample_firmware_class module to build without error. sysfs.h already has the function prototypes and has them correctly.

Quoted 7 lines

Documentation/firmware_class/firmware_sample_firmware_class.c:37: error: conflicting types for 'sysfs_remove_bin_file' include/linux/sysfs.h:100: error: previous declaration of 'sysfs_remove_bin_file' was here

---
 Documentation/firmware_class/firmware_sample_firmware_class.c |    3 ---
 1 file changed, 3 deletions(-)
Quoted 4 lines

Can we move this file to the samples/ directory, so the build will catch stuff like this?

What's the final version of this patch?

I've moved it to samples/, but it (still) has a build problem:

ERROR: "firmware_class" [samples/firmware_class/firmware_sample_firmware_class.ko] undefined!

Can you give me hint(s) about how to fix that?

Signature · 1 line
~Randy
#8 lore raw
Quoted 20 lines · Randy Dunlap
Quoted 11 lines · Greg KH
Quoted 10 lines · Randy Dunlap

From: Randy Dunlap <[email protected]>

Fix firmware_sample_firmware_class module to build without error. sysfs.h already has the function prototypes and has them correctly.

Documentation/firmware_class/firmware_sample_firmware_class.c:37: error:
conflicting types for 'sysfs_remove_bin_file' include/linux/sysfs.h:100: error: previous declaration of 'sysfs_remove_bin_file' was here

Quoted 7 lines
Quoted 4 lines
---
 Documentation/firmware_class/firmware_sample_firmware_class.c |    3 ---
 1 file changed, 3 deletions(-)

Can we move this file to the samples/ directory, so the build will catch stuff like this?
What's the final version of this patch?

Quoted 6 lines

I've moved it to samples/, but it (still) has a build problem:

ERROR: "firmware_class" [samples/firmware_class/firmware_sample_firmware_class.ko] undefined!

Can you give me hint(s) about how to fix that?

Ah, yeah, that class went away a while ago.

Care to send me the patch you have, and I'll be glad to fix it up and get it in?

thanks,

greg k-h

#9 lore raw

PATCH 1/2 firmware: move firmware_class from Documentation/ to samples/

From: Randy Dunlap <[email protected]>

Move the firmware_class sample drivers to samples/ so that they are buildable and can be maintained. Add Kconfig entry for firmware_class.

---
 Documentation/firmware_class/firmware_sample_driver.c         |  115 -----
 Documentation/firmware_class/firmware_sample_firmware_class.c |  207 ----------
 samples/Kconfig                                               |    8 
 samples/Makefile                                              |    2 
 samples/firmware_class/Makefile                               |    1 
 samples/firmware_class/firmware_sample_driver.c               |  115 +++++
 samples/firmware_class/firmware_sample_firmware_class.c       |  207 ++++++++++
 7 files changed, 332 insertions(+), 323 deletions(-)
Documentation/firmware_class/firmware_sample_driver.c deleted +0 -115
@@ -1,115 +0,0 @@
-/*
- * 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;
-	printk(KERN_INFO "firmware_sample_driver: a ghost device got inserted :)\n");
-
-        if(request_firmware(&fw_entry, "sample_driver_fw", &ghost_device)!=0)
-	{
-		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)
-{
-	/* 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");
-
-        if(request_firmware(NULL, "sample_driver_fw", &ghost_device)!=0)
-	{
-		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");
Documentation/firmware_class/firmware_sample_firmware_class.c deleted +0 -207

207 lines not on this page · raw message

samples/firmware_class/Makefile new file +1 -0
@@ -0,0 +1 @@
+obj-$(CONFIG_SAMPLE_FIRMWARE_CLASS) += firmware_sample_driver.o firmware_sample_firmware_class.o
samples/firmware_class/firmware_sample_driver.c new file +115 -0

115 lines not on this page · raw message

samples/firmware_class/firmware_sample_firmware_class.c new file +207 -0

207 lines not on this page · raw message

samples/Makefile +1 -1
@@ -1,3 +1,3 @@
 # Makefile for Linux samples code
 
-obj-$(CONFIG_SAMPLES)	+= markers/ kobject/
+obj-$(CONFIG_SAMPLES)	+= markers/ kobject/ firmware_class/
samples/Kconfig +8 -0
@@ -22,5 +22,13 @@ config SAMPLE_KOBJECT
 
 	  If in doubt, say "N" here.
 
+config SAMPLE_FIRMWARE_CLASS
+	tristate "Build firmware_class examples -- loadable modules only"
+	depends on FW_LOADER && m
+	help
+	  This build firmware_class example modules.
+
+	  If in doubt, say "N" here.
+
 endif # SAMPLES
 
#11 lore raw

patch firmware-move-firmware_class-from-documentation-to-samples.patch added to gregkh-2.6 tree

In reply to Randy Dunlap

This is a note to let you know that I've just added the patch titled

Subject: firmware: move firmware_class from Documentation/ to samples/

to my gregkh-2.6 tree. Its filename is

firmware-move-firmware_class-from-documentation-to-samples.patch

This tree can be found at
http://www.kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/patches/

Quoted 1 line

From [email protected] Wed Feb 20 14:33:28 2008

From: Randy Dunlap <[email protected]>
Date: Wed, 20 Feb 2008 13:20:50 -0800
Subject: firmware: move firmware_class from Documentation/ to samples/
To: Greg KH <[email protected]>
Cc: lkml <[email protected]>, akpm <[email protected]>
Message-ID: <[email protected]>

From: Randy Dunlap <[email protected]>

Move the firmware_class sample drivers to samples/ so that they are buildable and can be maintained.

---
 Documentation/firmware_class/firmware_sample_driver.c         |  115 -----
 Documentation/firmware_class/firmware_sample_firmware_class.c |  207 ----------
 samples/firmware_class/firmware_sample_driver.c               |  115 +++++
 samples/firmware_class/firmware_sample_firmware_class.c       |  207 ++++++++++
 4 files changed, 322 insertions(+), 322 deletions(-)
Documentation/firmware_class/firmware_sample_driver.c deleted +0 -115
@@ -1,115 +0,0 @@
-/*
- * 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;
-	printk(KERN_INFO "firmware_sample_driver: a ghost device got inserted :)\n");
-
-        if(request_firmware(&fw_entry, "sample_driver_fw", &ghost_device)!=0)
-	{
-		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)
-{
-	/* 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");
-
-        if(request_firmware(NULL, "sample_driver_fw", &ghost_device)!=0)
-	{
-		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");
Documentation/firmware_class/firmware_sample_firmware_class.c deleted +0 -207

207 lines not on this page · raw message

samples/firmware_class/firmware_sample_driver.c new file +115 -0

115 lines not on this page · raw message

samples/firmware_class/firmware_sample_firmware_class.c new file +207 -0

207 lines not on this page · raw message

Patches currently in gregkh-2.6 which might be from [email protected] are

driver/driver-core-fix-kernel-doc-function-parameters.patch driver/sysfs-small-header-file-cleanup-for-sysfs-n.patch driver/firmware-move-firmware_class-from-documentation-to-samples.patch pci/pci-kernel-doc-fix-pci-acpi-warning.patch usb/usb-convert-usb.h-struct-usb_device-to-kernel-doc.patch firmware-add-kconfig-and-makefile-to-build-the-firmware-samples.patch