aboutsummaryrefslogtreecommitdiffstats
path: root/driver
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@suse.de>2006-01-19 17:33:49 -0800
committerGreg Kroah-Hartman <gregkh@suse.de>2006-01-19 17:33:49 -0800
commit358c5e469c3bb46cab6536de47f6795bc07a1712 (patch)
treeb90bf82c9e47309a37d5bf027d87415e08374af8 /driver
parent8489d6d662aa163a88869780af7e4d4dd05c8edd (diff)
downloadpatches-358c5e469c3bb46cab6536de47f6795bc07a1712.tar.gz
new patches added
Diffstat (limited to 'driver')
-rw-r--r--driver/drivers-base-proper-prototypes.patch103
1 files changed, 103 insertions, 0 deletions
diff --git a/driver/drivers-base-proper-prototypes.patch b/driver/drivers-base-proper-prototypes.patch
new file mode 100644
index 0000000000000..1bcbde27c3e43
--- /dev/null
+++ b/driver/drivers-base-proper-prototypes.patch
@@ -0,0 +1,103 @@
+From bunk@stusta.de Thu Jan 19 08:30:23 2006
+Date: Thu, 19 Jan 2006 17:30:17 +0100
+From: Adrian Bunk <bunk@stusta.de>
+To: Greg KH <gregkh@suse.de>
+Subject: drivers/base/: proper prototypes
+Message-ID: <20060119163017.GQ19398@stusta.de>
+Content-Disposition: inline
+
+This patch contains the following changes:
+- move prototypes to base.h
+- sys.c should #include "base.h" for getting the prototype of it's
+ global function system_bus_init()
+
+Note that hidden in this patch there's a bugfix:
+
+Caller and callee disagreed regarding the return type of
+sysdev_shutdown().
+
+
+Signed-off-by: Adrian Bunk <bunk@stusta.de>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+---
+ drivers/base/base.h | 4 ++++
+ drivers/base/power/resume.c | 3 +--
+ drivers/base/power/shutdown.c | 2 +-
+ drivers/base/power/suspend.c | 3 +--
+ drivers/base/sys.c | 3 +++
+ 5 files changed, 10 insertions(+), 5 deletions(-)
+
+--- gregkh-2.6.orig/drivers/base/base.h
++++ gregkh-2.6/drivers/base/base.h
+@@ -19,6 +19,10 @@ extern void bus_remove_driver(struct dev
+ extern void driver_detach(struct device_driver * drv);
+ extern int driver_probe_device(struct device_driver *, struct device *);
+
++extern void sysdev_shutdown(void);
++extern int sysdev_suspend(pm_message_t state);
++extern int sysdev_resume(void);
++
+ static inline struct class_device *to_class_dev(struct kobject *obj)
+ {
+ return container_of(obj, struct class_device, kobj);
+--- gregkh-2.6.orig/drivers/base/sys.c
++++ gregkh-2.6/drivers/base/sys.c
+@@ -21,8 +21,11 @@
+ #include <linux/slab.h>
+ #include <linux/string.h>
+ #include <linux/pm.h>
++#include <linux/device.h>
+ #include <asm/semaphore.h>
+
++#include "base.h"
++
+ extern struct subsystem devices_subsys;
+
+ #define to_sysdev(k) container_of(k, struct sys_device, kobj)
+--- gregkh-2.6.orig/drivers/base/power/shutdown.c
++++ gregkh-2.6/drivers/base/power/shutdown.c
+@@ -12,6 +12,7 @@
+ #include <linux/device.h>
+ #include <asm/semaphore.h>
+
++#include "../base.h"
+ #include "power.h"
+
+ #define to_dev(node) container_of(node, struct device, kobj.entry)
+@@ -28,7 +29,6 @@ extern struct subsystem devices_subsys;
+ * they only get one called once when interrupts are disabled.
+ */
+
+-extern int sysdev_shutdown(void);
+
+ /**
+ * device_shutdown - call ->shutdown() on each device to shutdown.
+--- gregkh-2.6.orig/drivers/base/power/suspend.c
++++ gregkh-2.6/drivers/base/power/suspend.c
+@@ -9,10 +9,9 @@
+ */
+
+ #include <linux/device.h>
++#include "../base.h"
+ #include "power.h"
+
+-extern int sysdev_suspend(pm_message_t state);
+-
+ /*
+ * The entries in the dpm_active list are in a depth first order, simply
+ * because children are guaranteed to be discovered after parents, and
+--- gregkh-2.6.orig/drivers/base/power/resume.c
++++ gregkh-2.6/drivers/base/power/resume.c
+@@ -9,10 +9,9 @@
+ */
+
+ #include <linux/device.h>
++#include "../base.h"
+ #include "power.h"
+
+-extern int sysdev_resume(void);
+-
+
+ /**
+ * resume_device - Restore state for one device.