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

Commit c3139ba2 authored by Bjorn Helgaas's avatar Bjorn Helgaas
Browse files

PCI: Move cpci_hotplug_init() proto to header file 



cpci_hotplug_init() and cpci_hotplug_exit() are defined in
cpci_hotplug_core.c but had extern declarations in pci_hotplug_core.c.
This puts the declarations in a header file included both places so
the compiler can help keep everything consistent.

Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
parent 9738abed

drivers/pci/hotplug/cpci_hotplug.h

+8 −0
Original line number Diff line number Diff line
@@ -99,4 +99,12 @@ extern int cpci_led_off(struct slot * slot); 
extern int cpci_configure_slot(struct slot *slot);

extern int cpci_unconfigure_slot(struct slot *slot);



#ifdef CONFIG_HOTPLUG_PCI_CPCI

int cpci_hotplug_init(int debug);

void cpci_hotplug_exit(void);

#else

static inline int cpci_hotplug_init(int debug) { return 0; }

static inline void cpci_hotplug_exit(void) { }

#endif



#endif	/* _CPCI_HOTPLUG_H */

drivers/pci/hotplug/pci_hotplug_core.c

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

#include <asm/uaccess.h>

#include "../pci.h"

#include "cpci_hotplug.h"



#define MY_NAME	"pci_hotplug"
@@ -63,14 +64,6 @@ static bool debug; 
static LIST_HEAD(pci_hotplug_slot_list);

static DEFINE_MUTEX(pci_hp_mutex);



#ifdef CONFIG_HOTPLUG_PCI_CPCI

extern int cpci_hotplug_init(int debug);

extern void cpci_hotplug_exit(void);

#else

static inline int cpci_hotplug_init(int debug) { return 0; }

static inline void cpci_hotplug_exit(void) { }

#endif



/* Weee, fun with macros... */

#define GET_STATUS(name,type)	\

static int get_##name (struct hotplug_slot *slot, type *value)		\