Skip to content

Commit

Permalink
[PATCH] drivers/base/: proper prototypes
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Adrian Bunk authored and Greg Kroah-Hartman committed Feb 6, 2006
1 parent e485981 commit f67d115
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 5 deletions.
4 changes: 4 additions & 0 deletions drivers/base/base.h
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,10 @@ extern void bus_remove_driver(struct device_driver *);
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);
Expand Down
3 changes: 1 addition & 2 deletions drivers/base/power/resume.c
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion drivers/base/power/shutdown.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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.
Expand Down
3 changes: 1 addition & 2 deletions drivers/base/power/suspend.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 3 additions & 0 deletions drivers/base/sys.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit f67d115

Please sign in to comment.