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

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

Driver core: proper prototype for drivers/base/init.c:driver_init() 



Add a prototype for driver_init() in include/linux/device.h.

Also remove a static function of the same name in drivers/acpi/ibm_acpi.c to
ibm_acpi_driver_init() to fix the namespace collision.

Signed-off-by: default avatarAdrian Bunk <bunk@stusta.de>
Acked-by: default avatarHenrique de Moraes Holschuh <hmh@hmh.eng.br>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 542cfce6

drivers/acpi/ibm_acpi.c

+2 −2
Original line number Diff line number Diff line
@@ -352,7 +352,7 @@ static char *next_cmd(char **cmds) 
	return start;

}



static int driver_init(void)

static int ibm_acpi_driver_init(void)

{

	printk(IBM_INFO "%s v%s\n", IBM_DESC, IBM_VERSION);

	printk(IBM_INFO "%s\n", IBM_URL);
@@ -1605,7 +1605,7 @@ static int fan_write(char *buf) 
static struct ibm_struct ibms[] = {

	{

	 .name = "driver",

	 .init = driver_init,

	 .init = ibm_acpi_driver_init,

	 .read = driver_read,

	 },

	{

include/linux/device.h

+2 −0
Original line number Diff line number Diff line
@@ -433,6 +433,8 @@ static inline int device_is_registered(struct device *dev) 
	return dev->is_registered;

}



void driver_init(void);



/*

 * High level routines for use by the bus drivers

 */

init/main.c

+1 −1
Original line number Diff line number Diff line
@@ -53,6 +53,7 @@ 
#include <linux/utsrelease.h>

#include <linux/pid_namespace.h>

#include <linux/compile.h>

#include <linux/device.h>



#include <asm/io.h>

#include <asm/bugs.h>
@@ -94,7 +95,6 @@ extern void pidmap_init(void); 
extern void prio_tree_init(void);

extern void radix_tree_init(void);

extern void free_initmem(void);

extern void driver_init(void);

extern void prepare_namespace(void);

#ifdef	CONFIG_ACPI

extern void acpi_early_init(void);