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

PCI: Remove "extern" from function declarations 



We had an inconsistent mix of using and omitting the "extern" keyword
on function declarations in header files.  This removes them all.

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

drivers/pci/hotplug/acpiphp.h

+13 −13
Original line number Diff line number Diff line
@@ -174,23 +174,23 @@ struct acpiphp_attention_info 
/* function prototypes */



/* acpiphp_core.c */

extern int acpiphp_register_attention(struct acpiphp_attention_info*info);

extern int acpiphp_unregister_attention(struct acpiphp_attention_info *info);

extern int acpiphp_register_hotplug_slot(struct acpiphp_slot *slot);

extern void acpiphp_unregister_hotplug_slot(struct acpiphp_slot *slot);

int acpiphp_register_attention(struct acpiphp_attention_info*info);

int acpiphp_unregister_attention(struct acpiphp_attention_info *info);

int acpiphp_register_hotplug_slot(struct acpiphp_slot *slot);

void acpiphp_unregister_hotplug_slot(struct acpiphp_slot *slot);



/* acpiphp_glue.c */

extern int acpiphp_glue_init (void);

extern void acpiphp_glue_exit (void);

int acpiphp_glue_init(void);

void acpiphp_glue_exit(void);

typedef int (*acpiphp_callback)(struct acpiphp_slot *slot, void *data);



extern int acpiphp_enable_slot (struct acpiphp_slot *slot);

extern int acpiphp_disable_slot (struct acpiphp_slot *slot);

extern int acpiphp_eject_slot (struct acpiphp_slot *slot);

extern u8 acpiphp_get_power_status (struct acpiphp_slot *slot);

extern u8 acpiphp_get_attention_status (struct acpiphp_slot *slot);

extern u8 acpiphp_get_latch_status (struct acpiphp_slot *slot);

extern u8 acpiphp_get_adapter_status (struct acpiphp_slot *slot);

int acpiphp_enable_slot(struct acpiphp_slot *slot);

int acpiphp_disable_slot(struct acpiphp_slot *slot);

int acpiphp_eject_slot(struct acpiphp_slot *slot);

u8 acpiphp_get_power_status(struct acpiphp_slot *slot);

u8 acpiphp_get_attention_status(struct acpiphp_slot *slot);

u8 acpiphp_get_latch_status(struct acpiphp_slot *slot);

u8 acpiphp_get_adapter_status(struct acpiphp_slot *slot);



/* variables */

extern bool acpiphp_debug;

drivers/pci/hotplug/cpci_hotplug.h

+18 −18
Original line number Diff line number Diff line
@@ -75,29 +75,29 @@ static inline const char *slot_name(struct slot *slot) 
	return hotplug_slot_name(slot->hotplug_slot);

}



extern int cpci_hp_register_controller(struct cpci_hp_controller *controller);

extern int cpci_hp_unregister_controller(struct cpci_hp_controller *controller);

extern int cpci_hp_register_bus(struct pci_bus *bus, u8 first, u8 last);

extern int cpci_hp_unregister_bus(struct pci_bus *bus);

extern int cpci_hp_start(void);

extern int cpci_hp_stop(void);

int cpci_hp_register_controller(struct cpci_hp_controller *controller);

int cpci_hp_unregister_controller(struct cpci_hp_controller *controller);

int cpci_hp_register_bus(struct pci_bus *bus, u8 first, u8 last);

int cpci_hp_unregister_bus(struct pci_bus *bus);

int cpci_hp_start(void);

int cpci_hp_stop(void);



/*

 * Internal function prototypes, these functions should not be used by

 * board/chassis drivers.

 */

extern u8 cpci_get_attention_status(struct slot *slot);

extern u8 cpci_get_latch_status(struct slot *slot);

extern u8 cpci_get_adapter_status(struct slot *slot);

extern u16 cpci_get_hs_csr(struct slot * slot);

extern int cpci_set_attention_status(struct slot *slot, int status);

extern int cpci_check_and_clear_ins(struct slot * slot);

extern int cpci_check_ext(struct slot * slot);

extern int cpci_clear_ext(struct slot * slot);

extern int cpci_led_on(struct slot * slot);

extern int cpci_led_off(struct slot * slot);

extern int cpci_configure_slot(struct slot *slot);

extern int cpci_unconfigure_slot(struct slot *slot);

u8 cpci_get_attention_status(struct slot *slot);

u8 cpci_get_latch_status(struct slot *slot);

u8 cpci_get_adapter_status(struct slot *slot);

u16 cpci_get_hs_csr(struct slot * slot);

int cpci_set_attention_status(struct slot *slot, int status);

int cpci_check_and_clear_ins(struct slot * slot);

int cpci_check_ext(struct slot * slot);

int cpci_clear_ext(struct slot * slot);

int cpci_led_on(struct slot * slot);

int cpci_led_off(struct slot * slot);

int cpci_configure_slot(struct slot *slot);

int cpci_unconfigure_slot(struct slot *slot);



#ifdef CONFIG_HOTPLUG_PCI_CPCI

int cpci_hotplug_init(int debug);

drivers/pci/hotplug/cpqphp.h

+32 −38
Original line number Diff line number Diff line
@@ -404,50 +404,44 @@ struct resource_lists { 




/* debugfs functions for the hotplug controller info */

extern void cpqhp_initialize_debugfs(void);

extern void cpqhp_shutdown_debugfs(void);

extern void cpqhp_create_debugfs_files(struct controller *ctrl);

extern void cpqhp_remove_debugfs_files(struct controller *ctrl);

void cpqhp_initialize_debugfs(void);

void cpqhp_shutdown_debugfs(void);

void cpqhp_create_debugfs_files(struct controller *ctrl);

void cpqhp_remove_debugfs_files(struct controller *ctrl);



/* controller functions */

extern void cpqhp_pushbutton_thread(unsigned long event_pointer);

extern irqreturn_t cpqhp_ctrl_intr(int IRQ, void *data);

extern int cpqhp_find_available_resources(struct controller *ctrl,

void cpqhp_pushbutton_thread(unsigned long event_pointer);

irqreturn_t cpqhp_ctrl_intr(int IRQ, void *data);

int cpqhp_find_available_resources(struct controller *ctrl,

				   void __iomem *rom_start);

extern int cpqhp_event_start_thread(void);

extern void cpqhp_event_stop_thread(void);

extern struct pci_func *cpqhp_slot_create(unsigned char busnumber);

extern struct pci_func *cpqhp_slot_find(unsigned char bus, unsigned char device,

int cpqhp_event_start_thread(void);

void cpqhp_event_stop_thread(void);

struct pci_func *cpqhp_slot_create(unsigned char busnumber);

struct pci_func *cpqhp_slot_find(unsigned char bus, unsigned char device,

				 unsigned char index);

extern int cpqhp_process_SI(struct controller *ctrl, struct pci_func *func);

extern int cpqhp_process_SS(struct controller *ctrl, struct pci_func *func);

extern int cpqhp_hardware_test(struct controller *ctrl, int test_num);

int cpqhp_process_SI(struct controller *ctrl, struct pci_func *func);

int cpqhp_process_SS(struct controller *ctrl, struct pci_func *func);

int cpqhp_hardware_test(struct controller *ctrl, int test_num);



/* resource functions */

extern int	cpqhp_resource_sort_and_combine	(struct pci_resource **head);

int	cpqhp_resource_sort_and_combine	(struct pci_resource **head);



/* pci functions */

extern int cpqhp_set_irq(u8 bus_num, u8 dev_num, u8 int_pin, u8 irq_num);

extern int cpqhp_get_bus_dev(struct controller *ctrl, u8 *bus_num, u8 *dev_num,

int cpqhp_set_irq(u8 bus_num, u8 dev_num, u8 int_pin, u8 irq_num);

int cpqhp_get_bus_dev(struct controller *ctrl, u8 *bus_num, u8 *dev_num,

		      u8 slot);

extern int cpqhp_save_config(struct controller *ctrl, int busnumber,

			     int is_hot_plug);

extern int cpqhp_save_base_addr_length(struct controller *ctrl,

				       struct pci_func *func);

extern int cpqhp_save_used_resources(struct controller *ctrl,

				     struct pci_func *func);

extern int cpqhp_configure_board(struct controller *ctrl,

				 struct pci_func *func);

extern int cpqhp_save_slot_config(struct controller *ctrl,

				  struct pci_func *new_slot);

extern int cpqhp_valid_replace(struct controller *ctrl, struct pci_func *func);

extern void cpqhp_destroy_board_resources(struct pci_func *func);

extern int cpqhp_return_board_resources	(struct pci_func *func,

int cpqhp_save_config(struct controller *ctrl, int busnumber, int is_hot_plug);

int cpqhp_save_base_addr_length(struct controller *ctrl, struct pci_func *func);

int cpqhp_save_used_resources(struct controller *ctrl, struct pci_func *func);

int cpqhp_configure_board(struct controller *ctrl, struct pci_func *func);

int cpqhp_save_slot_config(struct controller *ctrl, struct pci_func *new_slot);

int cpqhp_valid_replace(struct controller *ctrl, struct pci_func *func);

void cpqhp_destroy_board_resources(struct pci_func *func);

int cpqhp_return_board_resources(struct pci_func *func,

				 struct resource_lists *resources);

extern void cpqhp_destroy_resource_list(struct resource_lists *resources);

extern int cpqhp_configure_device(struct controller *ctrl,

				  struct pci_func *func);

extern int cpqhp_unconfigure_device(struct pci_func *func);

void cpqhp_destroy_resource_list(struct resource_lists *resources);

int cpqhp_configure_device(struct controller *ctrl, struct pci_func *func);

int cpqhp_unconfigure_device(struct pci_func *func);



/* Global variables */

extern int cpqhp_debug;

drivers/pci/hotplug/cpqphp_nvram.h

+6 −6
Original line number Diff line number Diff line
@@ -47,9 +47,9 @@ static inline int compaq_nvram_store (void __iomem *rom_start) 


#else



extern void compaq_nvram_init	(void __iomem *rom_start);

extern int compaq_nvram_load	(void __iomem *rom_start, struct controller *ctrl);

extern int compaq_nvram_store	(void __iomem *rom_start);

void compaq_nvram_init(void __iomem *rom_start);

int compaq_nvram_load(void __iomem *rom_start, struct controller *ctrl);

int compaq_nvram_store(void __iomem *rom_start);



#endif

drivers/pci/hotplug/ibmphp.h

+33 −33
Original line number Diff line number Diff line
@@ -275,17 +275,17 @@ extern struct list_head ibmphp_slot_head; 
* FUNCTION PROTOTYPES                                      *

***********************************************************/



extern void ibmphp_free_ebda_hpc_queue (void);

extern int ibmphp_access_ebda (void);

extern struct slot *ibmphp_get_slot_from_physical_num (u8);

extern int ibmphp_get_total_hp_slots (void);

extern void ibmphp_free_ibm_slot (struct slot *);

extern void ibmphp_free_bus_info_queue (void);

extern void ibmphp_free_ebda_pci_rsrc_queue (void);

extern struct bus_info *ibmphp_find_same_bus_num (u32);

extern int ibmphp_get_bus_index (u8);

extern u16 ibmphp_get_total_controllers (void);

extern int ibmphp_register_pci (void);

void ibmphp_free_ebda_hpc_queue(void);

int ibmphp_access_ebda(void);

struct slot *ibmphp_get_slot_from_physical_num(u8);

int ibmphp_get_total_hp_slots(void);

void ibmphp_free_ibm_slot(struct slot *);

void ibmphp_free_bus_info_queue(void);

void ibmphp_free_ebda_pci_rsrc_queue(void);

struct bus_info *ibmphp_find_same_bus_num(u32);

int ibmphp_get_bus_index(u8);

u16 ibmphp_get_total_controllers(void);

int ibmphp_register_pci(void);



/* passed parameters */

#define MEM		0
@@ -381,24 +381,24 @@ struct res_needed { 


/* functions */



extern int ibmphp_rsrc_init (void);

extern int ibmphp_add_resource (struct resource_node *);

extern int ibmphp_remove_resource (struct resource_node *);

extern int ibmphp_find_resource (struct bus_node *, u32, struct resource_node **, int);

extern int ibmphp_check_resource (struct resource_node *, u8);

extern int ibmphp_remove_bus (struct bus_node *, u8);

extern void ibmphp_free_resources (void);

extern int ibmphp_add_pfmem_from_mem (struct resource_node *);

extern struct bus_node *ibmphp_find_res_bus (u8);

extern void ibmphp_print_test (void);	/* for debugging purposes */

int ibmphp_rsrc_init(void);

int ibmphp_add_resource(struct resource_node *);

int ibmphp_remove_resource(struct resource_node *);

int ibmphp_find_resource(struct bus_node *, u32, struct resource_node **, int);

int ibmphp_check_resource(struct resource_node *, u8);

int ibmphp_remove_bus(struct bus_node *, u8);

void ibmphp_free_resources(void);

int ibmphp_add_pfmem_from_mem(struct resource_node *);

struct bus_node *ibmphp_find_res_bus(u8);

void ibmphp_print_test(void);	/* for debugging purposes */



extern void ibmphp_hpc_initvars (void);

extern int ibmphp_hpc_readslot (struct slot *, u8, u8 *);

extern int ibmphp_hpc_writeslot (struct slot *, u8);

extern void ibmphp_lock_operations (void);

extern void ibmphp_unlock_operations (void);

extern int ibmphp_hpc_start_poll_thread (void);

extern void ibmphp_hpc_stop_poll_thread (void);

void ibmphp_hpc_initvars(void);

int ibmphp_hpc_readslot(struct slot *, u8, u8 *);

int ibmphp_hpc_writeslot(struct slot *, u8);

void ibmphp_lock_operations(void);

void ibmphp_unlock_operations(void);

int ibmphp_hpc_start_poll_thread(void);

void ibmphp_hpc_stop_poll_thread(void);



//----------------------------------------------------------------------------
@@ -749,11 +749,11 @@ struct controller { 


/* Functions */



extern int ibmphp_init_devno (struct slot **);	/* This function is called from EBDA, so we need it not be static */

extern int ibmphp_do_disable_slot (struct slot *slot_cur);

extern int ibmphp_update_slot_info (struct slot *);	/* This function is called from HPC, so we need it to not be be static */

extern int ibmphp_configure_card (struct pci_func *, u8);

extern int ibmphp_unconfigure_card (struct slot **, int);

int ibmphp_init_devno(struct slot **);	/* This function is called from EBDA, so we need it not be static */

int ibmphp_do_disable_slot(struct slot *slot_cur);

int ibmphp_update_slot_info(struct slot *);	/* This function is called from HPC, so we need it to not be be static */

int ibmphp_configure_card(struct pci_func *, u8);

int ibmphp_unconfigure_card(struct slot **, int);

extern struct hotplug_slot_ops ibmphp_hotplug_slot_ops;



#endif				//__IBMPHP_H