Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f67d115f authored by Adrian Bunk's avatar Adrian Bunk Committed by Greg Kroah-Hartman
Browse files

[PATCH] drivers/base/: proper prototypes 



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: default avatarAdrian Bunk <bunk@stusta.de>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent e485981e

drivers/base/base.h

+4 −0
Original line number Diff line number Diff line
@@ -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);

drivers/base/power/resume.c

+1 −2
Original line number Diff line number Diff line
@@ -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.

drivers/base/power/shutdown.c

+1 −1
Original line number Diff line number Diff line
@@ -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.

drivers/base/power/suspend.c

+1 −2
Original line number Diff line number Diff line
@@ -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

drivers/base/sys.c

+3 −0
Original line number Diff line number Diff line
@@ -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)