From: Adrian Bunk <bunk@stusta.de>
To: gregkh@suse.de
Cc: linux-kernel@vger.kernel.org
Subject: [2.6 patch] drivers/base/: proper prototypes
Date: Thu, 19 Jan 2006 02:32:42 +0100 [thread overview]
Message-ID: <20060119013242.GX19398@stusta.de> (raw)
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>
---
drivers/base/base.h | 6 ++++++
drivers/base/power/resume.c | 3 +--
drivers/base/power/shutdown.c | 2 +-
drivers/base/power/suspend.c | 3 +--
drivers/base/sys.c | 2 ++
5 files changed, 11 insertions(+), 5 deletions(-)
--- linux-2.6.16-rc1-mm1-full/drivers/base/base.h.old 2006-01-18 23:17:52.000000000 +0100
+++ linux-2.6.16-rc1-mm1-full/drivers/base/base.h 2006-01-18 23:41:33.000000000 +0100
@@ -1,6 +1,8 @@
/* initialisation functions */
+#include <linux/device.h>
+
extern int devices_init(void);
extern int buses_init(void);
extern int classes_init(void);
@@ -19,6 +21,10 @@
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);
--- linux-2.6.16-rc1-mm1-full/drivers/base/sys.c.old 2006-01-18 23:18:38.000000000 +0100
+++ linux-2.6.16-rc1-mm1-full/drivers/base/sys.c 2006-01-18 23:20:04.000000000 +0100
@@ -23,6 +23,8 @@
#include <linux/pm.h>
#include <asm/semaphore.h>
+#include "base.h"
+
extern struct subsystem devices_subsys;
#define to_sysdev(k) container_of(k, struct sys_device, kobj)
--- linux-2.6.16-rc1-mm1-full/drivers/base/power/shutdown.c.old 2006-01-18 23:18:56.000000000 +0100
+++ linux-2.6.16-rc1-mm1-full/drivers/base/power/shutdown.c 2006-01-18 23:43:45.000000000 +0100
@@ -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 @@
* they only get one called once when interrupts are disabled.
*/
-extern int sysdev_shutdown(void);
/**
* device_shutdown - call ->shutdown() on each device to shutdown.
--- linux-2.6.16-rc1-mm1-full/drivers/base/power/suspend.c.old 2006-01-18 23:20:16.000000000 +0100
+++ linux-2.6.16-rc1-mm1-full/drivers/base/power/suspend.c 2006-01-18 23:43:51.000000000 +0100
@@ -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
--- linux-2.6.16-rc1-mm1-full/drivers/base/power/resume.c.old 2006-01-18 23:20:26.000000000 +0100
+++ linux-2.6.16-rc1-mm1-full/drivers/base/power/resume.c 2006-01-18 23:43:58.000000000 +0100
@@ -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.
next reply other threads:[~2006-01-19 1:32 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-01-19 1:32 Adrian Bunk [this message]
2006-01-19 2:51 ` [2.6 patch] drivers/base/: proper prototypes Greg KH
2006-01-19 3:28 ` Adrian Bunk
2006-01-19 3:35 ` Greg KH
2006-01-19 3:40 ` Adrian Bunk
2006-01-19 4:07 ` Greg KH
2006-01-19 16:30 ` Adrian Bunk
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20060119013242.GX19398@stusta.de \
--to=bunk@stusta.de \
--cc=gregkh@suse.de \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).