Skip to content

cloud-kernel
cloud-kernel

openanolis / cloud-kernel
12 个月 前同步成功

通知 150
Star 36
Fork 7
cloud-kernel
cloud-kernel

体验新版 GitCode，发现更多精彩内容 >>

提交 723ec4d0 编写于 作者: B Bjorn Helgaas
浏览文件
操作

Merge branch 'pci/cleanup' into next 

* pci/cleanup:
  PCI: Remove "extern" from function declarations
  PCI: Warn about failures instead of "must_check" functions
  PCI: Remove __must_check from definitions
  PCI: Remove unused variables
  PCI: Move cpci_hotplug_init() proto to header file
  PCI: Make local functions/structs static
  PCI: Fix missing prototype for pcie_port_acpi_setup()

Conflicts:
	drivers/pci/hotplug/acpiphp.h
	include/linux/pci.h
上级 a3b6bbd5 f39d5b72
隐藏空白更改
内联 并排
Showing with 310 addition and 321 deletion
drivers/pci/bus.c
浏览文件 @ 723ec4d0
...@@ -202,6 +202,9 @@ void pci_bus_add_devices(const struct pci_bus *bus) ...@@ -202,6 +202,9 @@ void pci_bus_add_devices(const struct pci_bus *bus)
if (dev->is_added) if (dev->is_added)
continue; continue;
retval = pci_bus_add_device(dev); retval = pci_bus_add_device(dev);
if (retval)
dev_err(&dev->dev, "Error adding device (%d)\n",
retval);
} }
list_for_each_entry(dev, &bus->devices, bus_list) { list_for_each_entry(dev, &bus->devices, bus_list) {
......
drivers/pci/hotplug/acpiphp.h
浏览文件 @ 723ec4d0
...@@ -170,21 +170,21 @@ struct acpiphp_attention_info ...@@ -170,21 +170,21 @@ struct acpiphp_attention_info
/* function prototypes */ /* function prototypes */
/* acpiphp_core.c */ /* acpiphp_core.c */
extern int acpiphp_register_attention(struct acpiphp_attention_info*info); int acpiphp_register_attention(struct acpiphp_attention_info*info);
extern int acpiphp_unregister_attention(struct acpiphp_attention_info *info); int acpiphp_unregister_attention(struct acpiphp_attention_info *info);
extern int acpiphp_register_hotplug_slot(struct acpiphp_slot *slot); int acpiphp_register_hotplug_slot(struct acpiphp_slot *slot);
extern void acpiphp_unregister_hotplug_slot(struct acpiphp_slot *slot); void acpiphp_unregister_hotplug_slot(struct acpiphp_slot *slot);
/* acpiphp_glue.c */ /* acpiphp_glue.c */
typedef int (*acpiphp_callback)(struct acpiphp_slot *slot, void *data); typedef int (*acpiphp_callback)(struct acpiphp_slot *slot, void *data);
extern int acpiphp_enable_slot (struct acpiphp_slot *slot); int acpiphp_enable_slot(struct acpiphp_slot *slot);
extern int acpiphp_disable_slot (struct acpiphp_slot *slot); int acpiphp_disable_slot(struct acpiphp_slot *slot);
extern int acpiphp_eject_slot (struct acpiphp_slot *slot); int acpiphp_eject_slot(struct acpiphp_slot *slot);
extern u8 acpiphp_get_power_status (struct acpiphp_slot *slot); u8 acpiphp_get_power_status(struct acpiphp_slot *slot);
extern u8 acpiphp_get_attention_status (struct acpiphp_slot *slot); u8 acpiphp_get_attention_status(struct acpiphp_slot *slot);
extern u8 acpiphp_get_latch_status (struct acpiphp_slot *slot); u8 acpiphp_get_latch_status(struct acpiphp_slot *slot);
extern u8 acpiphp_get_adapter_status (struct acpiphp_slot *slot); u8 acpiphp_get_adapter_status(struct acpiphp_slot *slot);
/* variables */ /* variables */
extern bool acpiphp_debug; extern bool acpiphp_debug;
......
drivers/pci/hotplug/cpci_hotplug.h
浏览文件 @ 723ec4d0
...@@ -75,28 +75,36 @@ static inline const char *slot_name(struct slot *slot) ...@@ -75,28 +75,36 @@ static inline const char *slot_name(struct slot *slot)
return hotplug_slot_name(slot->hotplug_slot); return hotplug_slot_name(slot->hotplug_slot);
} }
extern int cpci_hp_register_controller(struct cpci_hp_controller *controller); int cpci_hp_register_controller(struct cpci_hp_controller *controller);
extern int cpci_hp_unregister_controller(struct cpci_hp_controller *controller); int cpci_hp_unregister_controller(struct cpci_hp_controller *controller);
extern int cpci_hp_register_bus(struct pci_bus *bus, u8 first, u8 last); int cpci_hp_register_bus(struct pci_bus *bus, u8 first, u8 last);
extern int cpci_hp_unregister_bus(struct pci_bus *bus); int cpci_hp_unregister_bus(struct pci_bus *bus);
extern int cpci_hp_start(void); int cpci_hp_start(void);
extern int cpci_hp_stop(void); int cpci_hp_stop(void);
/* /*
* Internal function prototypes, these functions should not be used by * Internal function prototypes, these functions should not be used by
* board/chassis drivers. * board/chassis drivers.
*/ */
extern u8 cpci_get_attention_status(struct slot *slot); u8 cpci_get_attention_status(struct slot *slot);
extern u8 cpci_get_latch_status(struct slot *slot); u8 cpci_get_latch_status(struct slot *slot);
extern u8 cpci_get_adapter_status(struct slot *slot); u8 cpci_get_adapter_status(struct slot *slot);
extern u16 cpci_get_hs_csr(struct slot * slot); u16 cpci_get_hs_csr(struct slot * slot);
extern int cpci_set_attention_status(struct slot *slot, int status); int cpci_set_attention_status(struct slot *slot, int status);
extern int cpci_check_and_clear_ins(struct slot * slot); int cpci_check_and_clear_ins(struct slot * slot);
extern int cpci_check_ext(struct slot * slot); int cpci_check_ext(struct slot * slot);
extern int cpci_clear_ext(struct slot * slot); int cpci_clear_ext(struct slot * slot);
extern int cpci_led_on(struct slot * slot); int cpci_led_on(struct slot * slot);
extern int cpci_led_off(struct slot * slot); int cpci_led_off(struct slot * slot);
extern int cpci_configure_slot(struct slot *slot); int cpci_configure_slot(struct slot *slot);
extern int cpci_unconfigure_slot(struct slot *slot); 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 */ #endif /* _CPCI_HOTPLUG_H */
drivers/pci/hotplug/cpqphp.h
浏览文件 @ 723ec4d0
...@@ -404,50 +404,44 @@ struct resource_lists { ...@@ -404,50 +404,44 @@ struct resource_lists {
/* debugfs functions for the hotplug controller info */ /* debugfs functions for the hotplug controller info */
extern void cpqhp_initialize_debugfs(void); void cpqhp_initialize_debugfs(void);
extern void cpqhp_shutdown_debugfs(void); void cpqhp_shutdown_debugfs(void);
extern void cpqhp_create_debugfs_files(struct controller *ctrl); void cpqhp_create_debugfs_files(struct controller *ctrl);
extern void cpqhp_remove_debugfs_files(struct controller *ctrl); void cpqhp_remove_debugfs_files(struct controller *ctrl);
/* controller functions */ /* controller functions */
extern void cpqhp_pushbutton_thread(unsigned long event_pointer); void cpqhp_pushbutton_thread(unsigned long event_pointer);
extern irqreturn_t cpqhp_ctrl_intr(int IRQ, void *data); irqreturn_t cpqhp_ctrl_intr(int IRQ, void *data);
extern int cpqhp_find_available_resources(struct controller *ctrl, int cpqhp_find_available_resources(struct controller *ctrl,
void __iomem *rom_start); void __iomem *rom_start);
extern int cpqhp_event_start_thread(void); int cpqhp_event_start_thread(void);
extern void cpqhp_event_stop_thread(void); void cpqhp_event_stop_thread(void);
extern struct pci_func *cpqhp_slot_create(unsigned char busnumber); struct pci_func *cpqhp_slot_create(unsigned char busnumber);
extern struct pci_func *cpqhp_slot_find(unsigned char bus, unsigned char device, struct pci_func *cpqhp_slot_find(unsigned char bus, unsigned char device,
unsigned char index); unsigned char index);
extern int cpqhp_process_SI(struct controller *ctrl, struct pci_func *func); int cpqhp_process_SI(struct controller *ctrl, struct pci_func *func);
extern int cpqhp_process_SS(struct controller *ctrl, struct pci_func *func); int cpqhp_process_SS(struct controller *ctrl, struct pci_func *func);
extern int cpqhp_hardware_test(struct controller *ctrl, int test_num); int cpqhp_hardware_test(struct controller *ctrl, int test_num);
/* resource functions */ /* 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 */ /* pci functions */
extern int cpqhp_set_irq(u8 bus_num, u8 dev_num, u8 int_pin, u8 irq_num); 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_get_bus_dev(struct controller *ctrl, u8 *bus_num, u8 *dev_num,
u8 slot); u8 slot);
extern int cpqhp_save_config(struct controller *ctrl, int busnumber, int cpqhp_save_config(struct controller *ctrl, int busnumber, int is_hot_plug);
int is_hot_plug); int cpqhp_save_base_addr_length(struct controller *ctrl, struct pci_func *func);
extern int cpqhp_save_base_addr_length(struct controller *ctrl, int cpqhp_save_used_resources(struct controller *ctrl, struct pci_func *func);
struct pci_func *func); int cpqhp_configure_board(struct controller *ctrl, struct pci_func *func);
extern int cpqhp_save_used_resources(struct controller *ctrl, int cpqhp_save_slot_config(struct controller *ctrl, struct pci_func *new_slot);
struct pci_func *func); int cpqhp_valid_replace(struct controller *ctrl, struct pci_func *func);
extern int cpqhp_configure_board(struct controller *ctrl, void cpqhp_destroy_board_resources(struct pci_func *func);
struct pci_func *func); int cpqhp_return_board_resources(struct pci_func *func,
extern int cpqhp_save_slot_config(struct controller *ctrl, struct resource_lists *resources);
struct pci_func *new_slot); void cpqhp_destroy_resource_list(struct resource_lists *resources);
extern int cpqhp_valid_replace(struct controller *ctrl, struct pci_func *func); int cpqhp_configure_device(struct controller *ctrl, struct pci_func *func);
extern void cpqhp_destroy_board_resources(struct pci_func *func); int cpqhp_unconfigure_device(struct pci_func *func);
extern 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);
/* Global variables */ /* Global variables */
extern int cpqhp_debug; extern int cpqhp_debug;
......
drivers/pci/hotplug/cpqphp_nvram.h
浏览文件 @ 723ec4d0
...@@ -30,26 +30,26 @@ ...@@ -30,26 +30,26 @@
#ifndef CONFIG_HOTPLUG_PCI_COMPAQ_NVRAM #ifndef CONFIG_HOTPLUG_PCI_COMPAQ_NVRAM
static inline void compaq_nvram_init (void __iomem *rom_start) static inline void compaq_nvram_init(void __iomem *rom_start)
{ {
return; return;
} }
static inline int compaq_nvram_load (void __iomem *rom_start, struct controller *ctrl) static inline int compaq_nvram_load(void __iomem *rom_start, struct controller *ctrl)
{ {
return 0; return 0;
} }
static inline int compaq_nvram_store (void __iomem *rom_start) static inline int compaq_nvram_store(void __iomem *rom_start)
{ {
return 0; return 0;
} }
#else #else
extern void compaq_nvram_init (void __iomem *rom_start); void compaq_nvram_init(void __iomem *rom_start);
extern int compaq_nvram_load (void __iomem *rom_start, struct controller *ctrl); int compaq_nvram_load(void __iomem *rom_start, struct controller *ctrl);
extern int compaq_nvram_store (void __iomem *rom_start); int compaq_nvram_store(void __iomem *rom_start);
#endif #endif
......
drivers/pci/hotplug/ibmphp.h
浏览文件 @ 723ec4d0
...@@ -275,17 +275,17 @@ extern struct list_head ibmphp_slot_head; ...@@ -275,17 +275,17 @@ extern struct list_head ibmphp_slot_head;
* FUNCTION PROTOTYPES * * FUNCTION PROTOTYPES *
***********************************************************/ ***********************************************************/
extern void ibmphp_free_ebda_hpc_queue (void); void ibmphp_free_ebda_hpc_queue(void);
extern int ibmphp_access_ebda (void); int ibmphp_access_ebda(void);
extern struct slot *ibmphp_get_slot_from_physical_num (u8); struct slot *ibmphp_get_slot_from_physical_num(u8);
extern int ibmphp_get_total_hp_slots (void); int ibmphp_get_total_hp_slots(void);
extern void ibmphp_free_ibm_slot (struct slot *); void ibmphp_free_ibm_slot(struct slot *);
extern void ibmphp_free_bus_info_queue (void); void ibmphp_free_bus_info_queue(void);
extern void ibmphp_free_ebda_pci_rsrc_queue (void); void ibmphp_free_ebda_pci_rsrc_queue(void);
extern struct bus_info *ibmphp_find_same_bus_num (u32); struct bus_info *ibmphp_find_same_bus_num(u32);
extern int ibmphp_get_bus_index (u8); int ibmphp_get_bus_index(u8);
extern u16 ibmphp_get_total_controllers (void); u16 ibmphp_get_total_controllers(void);
extern int ibmphp_register_pci (void); int ibmphp_register_pci(void);
/* passed parameters */ /* passed parameters */
#define MEM 0 #define MEM 0
...@@ -381,24 +381,24 @@ struct res_needed { ...@@ -381,24 +381,24 @@ struct res_needed {
/* functions */ /* functions */
extern int ibmphp_rsrc_init (void); int ibmphp_rsrc_init(void);
extern int ibmphp_add_resource (struct resource_node *); int ibmphp_add_resource(struct resource_node *);
extern int ibmphp_remove_resource (struct resource_node *); int ibmphp_remove_resource(struct resource_node *);
extern int ibmphp_find_resource (struct bus_node *, u32, struct resource_node **, int); int ibmphp_find_resource(struct bus_node *, u32, struct resource_node **, int);
extern int ibmphp_check_resource (struct resource_node *, u8); int ibmphp_check_resource(struct resource_node *, u8);
extern int ibmphp_remove_bus (struct bus_node *, u8); int ibmphp_remove_bus(struct bus_node *, u8);
extern void ibmphp_free_resources (void); void ibmphp_free_resources(void);
extern int ibmphp_add_pfmem_from_mem (struct resource_node *); int ibmphp_add_pfmem_from_mem(struct resource_node *);
extern struct bus_node *ibmphp_find_res_bus (u8); struct bus_node *ibmphp_find_res_bus(u8);
extern void ibmphp_print_test (void); /* for debugging purposes */ void ibmphp_print_test(void); /* for debugging purposes */
extern void ibmphp_hpc_initvars (void); void ibmphp_hpc_initvars(void);
extern int ibmphp_hpc_readslot (struct slot *, u8, u8 *); int ibmphp_hpc_readslot(struct slot *, u8, u8 *);
extern int ibmphp_hpc_writeslot (struct slot *, u8); int ibmphp_hpc_writeslot(struct slot *, u8);
extern void ibmphp_lock_operations (void); void ibmphp_lock_operations(void);
extern void ibmphp_unlock_operations (void); void ibmphp_unlock_operations(void);
extern int ibmphp_hpc_start_poll_thread (void); int ibmphp_hpc_start_poll_thread(void);
extern void ibmphp_hpc_stop_poll_thread (void); void ibmphp_hpc_stop_poll_thread(void);
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
...@@ -749,11 +749,11 @@ struct controller { ...@@ -749,11 +749,11 @@ struct controller {
/* Functions */ /* Functions */
extern int ibmphp_init_devno (struct slot **); /* This function is called from EBDA, so we need it not be static */ 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); 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 */ 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); int ibmphp_configure_card(struct pci_func *, u8);
extern int ibmphp_unconfigure_card (struct slot **, int); int ibmphp_unconfigure_card(struct slot **, int);
extern struct hotplug_slot_ops ibmphp_hotplug_slot_ops; extern struct hotplug_slot_ops ibmphp_hotplug_slot_ops;
#endif //__IBMPHP_H #endif //__IBMPHP_H
......
drivers/pci/hotplug/pci_hotplug_core.c
浏览文件 @ 723ec4d0
...@@ -41,6 +41,7 @@ ...@@ -41,6 +41,7 @@
#include <linux/pci_hotplug.h> #include <linux/pci_hotplug.h>
#include <asm/uaccess.h> #include <asm/uaccess.h>
#include "../pci.h" #include "../pci.h"
#include "cpci_hotplug.h"
#define MY_NAME "pci_hotplug" #define MY_NAME "pci_hotplug"
...@@ -63,14 +64,6 @@ static bool debug; ...@@ -63,14 +64,6 @@ static bool debug;
static LIST_HEAD(pci_hotplug_slot_list); static LIST_HEAD(pci_hotplug_slot_list);
static DEFINE_MUTEX(pci_hp_mutex); 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... */ /* Weee, fun with macros... */
#define GET_STATUS(name,type) \ #define GET_STATUS(name,type) \
static int get_##name (struct hotplug_slot *slot, type *value) \ static int get_##name (struct hotplug_slot *slot, type *value) \
...@@ -524,13 +517,11 @@ int pci_hp_deregister(struct hotplug_slot *hotplug) ...@@ -524,13 +517,11 @@ int pci_hp_deregister(struct hotplug_slot *hotplug)
* *
* Returns 0 if successful, anything else for an error. * Returns 0 if successful, anything else for an error.
*/ */
int __must_check pci_hp_change_slot_info(struct hotplug_slot *hotplug, int pci_hp_change_slot_info(struct hotplug_slot *hotplug,
struct hotplug_slot_info *info) struct hotplug_slot_info *info)
{ {
struct pci_slot *slot;
if (!hotplug || !info) if (!hotplug || !info)
return -ENODEV; return -ENODEV;
slot = hotplug->pci_slot;
memcpy(hotplug->info, info, sizeof(struct hotplug_slot_info)); memcpy(hotplug->info, info, sizeof(struct hotplug_slot_info));
......
drivers/pci/hotplug/pciehp.h
浏览文件 @ 723ec4d0
...@@ -127,15 +127,15 @@ struct controller { ...@@ -127,15 +127,15 @@ struct controller {
#define NO_CMD_CMPL(ctrl) ((ctrl)->slot_cap & PCI_EXP_SLTCAP_NCCS) #define NO_CMD_CMPL(ctrl) ((ctrl)->slot_cap & PCI_EXP_SLTCAP_NCCS)
#define PSN(ctrl) ((ctrl)->slot_cap >> 19) #define PSN(ctrl) ((ctrl)->slot_cap >> 19)
extern int pciehp_sysfs_enable_slot(struct slot *slot); int pciehp_sysfs_enable_slot(struct slot *slot);
extern int pciehp_sysfs_disable_slot(struct slot *slot); int pciehp_sysfs_disable_slot(struct slot *slot);
extern u8 pciehp_handle_attention_button(struct slot *p_slot); u8 pciehp_handle_attention_button(struct slot *p_slot);
extern u8 pciehp_handle_switch_change(struct slot *p_slot); u8 pciehp_handle_switch_change(struct slot *p_slot);
extern u8 pciehp_handle_presence_change(struct slot *p_slot); u8 pciehp_handle_presence_change(struct slot *p_slot);
extern u8 pciehp_handle_power_fault(struct slot *p_slot); u8 pciehp_handle_power_fault(struct slot *p_slot);
extern int pciehp_configure_device(struct slot *p_slot); int pciehp_configure_device(struct slot *p_slot);
extern int pciehp_unconfigure_device(struct slot *p_slot); int pciehp_unconfigure_device(struct slot *p_slot);
extern void pciehp_queue_pushbutton_work(struct work_struct *work); void pciehp_queue_pushbutton_work(struct work_struct *work);
struct controller *pcie_init(struct pcie_device *dev); struct controller *pcie_init(struct pcie_device *dev);
int pcie_init_notification(struct controller *ctrl); int pcie_init_notification(struct controller *ctrl);
int pciehp_enable_slot(struct slot *p_slot); int pciehp_enable_slot(struct slot *p_slot);
...@@ -166,8 +166,8 @@ static inline const char *slot_name(struct slot *slot) ...@@ -166,8 +166,8 @@ static inline const char *slot_name(struct slot *slot)
#include <acpi/acpi_bus.h> #include <acpi/acpi_bus.h>
#include <linux/pci-acpi.h> #include <linux/pci-acpi.h>
extern void __init pciehp_acpi_slot_detection_init(void); void __init pciehp_acpi_slot_detection_init(void);
extern int pciehp_acpi_slot_detection_check(struct pci_dev *dev); int pciehp_acpi_slot_detection_check(struct pci_dev *dev);
static inline void pciehp_firmware_init(void) static inline void pciehp_firmware_init(void)
{ {
......
drivers/pci/hotplug/rpadlpar.h
浏览文件 @ 723ec4d0
...@@ -15,10 +15,10 @@ ...@@ -15,10 +15,10 @@
#ifndef _RPADLPAR_IO_H_ #ifndef _RPADLPAR_IO_H_
#define _RPADLPAR_IO_H_ #define _RPADLPAR_IO_H_
extern int dlpar_sysfs_init(void); int dlpar_sysfs_init(void);
extern void dlpar_sysfs_exit(void); void dlpar_sysfs_exit(void);
extern int dlpar_add_slot(char *drc_name); int dlpar_add_slot(char *drc_name);
extern int dlpar_remove_slot(char *drc_name); int dlpar_remove_slot(char *drc_name);
#endif #endif
drivers/pci/hotplug/rpaphp.h
浏览文件 @ 723ec4d0
...@@ -86,18 +86,18 @@ extern struct list_head rpaphp_slot_head; ...@@ -86,18 +86,18 @@ extern struct list_head rpaphp_slot_head;
/* function prototypes */ /* function prototypes */
/* rpaphp_pci.c */ /* rpaphp_pci.c */
extern int rpaphp_enable_slot(struct slot *slot); int rpaphp_enable_slot(struct slot *slot);
extern int rpaphp_get_sensor_state(struct slot *slot, int *state); int rpaphp_get_sensor_state(struct slot *slot, int *state);
/* rpaphp_core.c */ /* rpaphp_core.c */
extern int rpaphp_add_slot(struct device_node *dn); int rpaphp_add_slot(struct device_node *dn);
extern int rpaphp_get_drc_props(struct device_node *dn, int *drc_index, int rpaphp_get_drc_props(struct device_node *dn, int *drc_index,
char **drc_name, char **drc_type, int *drc_power_domain); char **drc_name, char **drc_type, int *drc_power_domain);
/* rpaphp_slot.c */ /* rpaphp_slot.c */
extern void dealloc_slot_struct(struct slot *slot); void dealloc_slot_struct(struct slot *slot);
extern struct slot *alloc_slot_struct(struct device_node *dn, int drc_index, char *drc_name, int power_domain); struct slot *alloc_slot_struct(struct device_node *dn, int drc_index, char *drc_name, int power_domain);
extern int rpaphp_register_slot(struct slot *slot); int rpaphp_register_slot(struct slot *slot);
extern int rpaphp_deregister_slot(struct slot *slot); int rpaphp_deregister_slot(struct slot *slot);
#endif /* _PPC64PHP_H */ #endif /* _PPC64PHP_H */
drivers/pci/hotplug/shpchp.h
浏览文件 @ 723ec4d0
...@@ -168,19 +168,19 @@ struct controller { ...@@ -168,19 +168,19 @@ struct controller {
#define WRONG_BUS_FREQUENCY 0x0000000D #define WRONG_BUS_FREQUENCY 0x0000000D
#define POWER_FAILURE 0x0000000E #define POWER_FAILURE 0x0000000E
extern int __must_check shpchp_create_ctrl_files(struct controller *ctrl); int __must_check shpchp_create_ctrl_files(struct controller *ctrl);
extern void shpchp_remove_ctrl_files(struct controller *ctrl); void shpchp_remove_ctrl_files(struct controller *ctrl);
extern int shpchp_sysfs_enable_slot(struct slot *slot); int shpchp_sysfs_enable_slot(struct slot *slot);
extern int shpchp_sysfs_disable_slot(struct slot *slot); int shpchp_sysfs_disable_slot(struct slot *slot);
extern u8 shpchp_handle_attention_button(u8 hp_slot, struct controller *ctrl); u8 shpchp_handle_attention_button(u8 hp_slot, struct controller *ctrl);
extern u8 shpchp_handle_switch_change(u8 hp_slot, struct controller *ctrl); u8 shpchp_handle_switch_change(u8 hp_slot, struct controller *ctrl);
extern u8 shpchp_handle_presence_change(u8 hp_slot, struct controller *ctrl); u8 shpchp_handle_presence_change(u8 hp_slot, struct controller *ctrl);
extern u8 shpchp_handle_power_fault(u8 hp_slot, struct controller *ctrl); u8 shpchp_handle_power_fault(u8 hp_slot, struct controller *ctrl);
extern int shpchp_configure_device(struct slot *p_slot); int shpchp_configure_device(struct slot *p_slot);
extern int shpchp_unconfigure_device(struct slot *p_slot); int shpchp_unconfigure_device(struct slot *p_slot);
extern void cleanup_slots(struct controller *ctrl); void cleanup_slots(struct controller *ctrl);
extern void shpchp_queue_pushbutton_work(struct work_struct *work); void shpchp_queue_pushbutton_work(struct work_struct *work);
extern int shpc_init( struct controller *ctrl, struct pci_dev *pdev); int shpc_init( struct controller *ctrl, struct pci_dev *pdev);
static inline const char *slot_name(struct slot *slot) static inline const char *slot_name(struct slot *slot)
{ {
......
drivers/pci/hotplug/shpchp_sysfs.c
浏览文件 @ 723ec4d0
...@@ -85,7 +85,7 @@ static ssize_t show_ctrl (struct device *dev, struct device_attribute *attr, cha ...@@ -85,7 +85,7 @@ static ssize_t show_ctrl (struct device *dev, struct device_attribute *attr, cha
} }
static DEVICE_ATTR (ctrl, S_IRUGO, show_ctrl, NULL); static DEVICE_ATTR (ctrl, S_IRUGO, show_ctrl, NULL);
int __must_check shpchp_create_ctrl_files (struct controller *ctrl) int shpchp_create_ctrl_files (struct controller *ctrl)
{ {
return device_create_file (&ctrl->pci_dev->dev, &dev_attr_ctrl); return device_create_file (&ctrl->pci_dev->dev, &dev_attr_ctrl);
} }
......
drivers/pci/msi.c
浏览文件 @ 723ec4d0
...@@ -484,12 +484,12 @@ static struct msi_attribute mode_attribute = ...@@ -484,12 +484,12 @@ static struct msi_attribute mode_attribute =
__ATTR(mode, S_IRUGO, show_msi_mode, NULL); __ATTR(mode, S_IRUGO, show_msi_mode, NULL);
struct attribute *msi_irq_default_attrs[] = { static struct attribute *msi_irq_default_attrs[] = {
&mode_attribute.attr, &mode_attribute.attr,
NULL NULL
}; };
void msi_kobj_release(struct kobject *kobj) static void msi_kobj_release(struct kobject *kobj)
{ {
struct msi_desc *entry = to_msi_desc(kobj); struct msi_desc *entry = to_msi_desc(kobj);
......
drivers/pci/pci.c
浏览文件 @ 723ec4d0
...@@ -2619,7 +2619,7 @@ void pci_release_selected_regions(struct pci_dev *pdev, int bars) ...@@ -2619,7 +2619,7 @@ void pci_release_selected_regions(struct pci_dev *pdev, int bars)
pci_release_region(pdev, i); pci_release_region(pdev, i);
} }
int __pci_request_selected_regions(struct pci_dev *pdev, int bars, static int __pci_request_selected_regions(struct pci_dev *pdev, int bars,
const char *res_name, int excl) const char *res_name, int excl)
{ {
int i; int i;
...@@ -3699,7 +3699,7 @@ static DEFINE_SPINLOCK(resource_alignment_lock); ...@@ -3699,7 +3699,7 @@ static DEFINE_SPINLOCK(resource_alignment_lock);
* RETURNS: Resource alignment if it is specified. * RETURNS: Resource alignment if it is specified.
* Zero if it is not specified. * Zero if it is not specified.
*/ */
resource_size_t pci_specified_resource_alignment(struct pci_dev *dev) static resource_size_t pci_specified_resource_alignment(struct pci_dev *dev)
{ {
int seg, bus, slot, func, align_order, count; int seg, bus, slot, func, align_order, count;
resource_size_t align = 0; resource_size_t align = 0;
...@@ -3812,7 +3812,7 @@ void pci_reassigndev_resource_alignment(struct pci_dev *dev) ...@@ -3812,7 +3812,7 @@ void pci_reassigndev_resource_alignment(struct pci_dev *dev)
} }
} }
ssize_t pci_set_resource_alignment_param(const char *buf, size_t count) static ssize_t pci_set_resource_alignment_param(const char *buf, size_t count)
{ {
if (count > RESOURCE_ALIGNMENT_PARAM_SIZE - 1) if (count > RESOURCE_ALIGNMENT_PARAM_SIZE - 1)
count = RESOURCE_ALIGNMENT_PARAM_SIZE - 1; count = RESOURCE_ALIGNMENT_PARAM_SIZE - 1;
...@@ -3823,7 +3823,7 @@ ssize_t pci_set_resource_alignment_param(const char *buf, size_t count) ...@@ -3823,7 +3823,7 @@ ssize_t pci_set_resource_alignment_param(const char *buf, size_t count)
return count; return count;
} }
ssize_t pci_get_resource_alignment_param(char *buf, size_t size) static ssize_t pci_get_resource_alignment_param(char *buf, size_t size)
{ {
size_t count; size_t count;
spin_lock(&resource_alignment_lock); spin_lock(&resource_alignment_lock);
......
drivers/pci/pci.h
浏览文件 @ 723ec4d0
...@@ -8,26 +8,25 @@ ...@@ -8,26 +8,25 @@
/* Functions internal to the PCI core code */ /* Functions internal to the PCI core code */
extern int pci_create_sysfs_dev_files(struct pci_dev *pdev); int pci_create_sysfs_dev_files(struct pci_dev *pdev);
extern void pci_remove_sysfs_dev_files(struct pci_dev *pdev); void pci_remove_sysfs_dev_files(struct pci_dev *pdev);
#if !defined(CONFIG_DMI) && !defined(CONFIG_ACPI) #if !defined(CONFIG_DMI) && !defined(CONFIG_ACPI)
static inline void pci_create_firmware_label_files(struct pci_dev *pdev) static inline void pci_create_firmware_label_files(struct pci_dev *pdev)
{ return; } { return; }
static inline void pci_remove_firmware_label_files(struct pci_dev *pdev) static inline void pci_remove_firmware_label_files(struct pci_dev *pdev)
{ return; } { return; }
#else #else
extern void pci_create_firmware_label_files(struct pci_dev *pdev); void pci_create_firmware_label_files(struct pci_dev *pdev);
extern void pci_remove_firmware_label_files(struct pci_dev *pdev); void pci_remove_firmware_label_files(struct pci_dev *pdev);
#endif #endif
extern void pci_cleanup_rom(struct pci_dev *dev); void pci_cleanup_rom(struct pci_dev *dev);
#ifdef HAVE_PCI_MMAP #ifdef HAVE_PCI_MMAP
enum pci_mmap_api { enum pci_mmap_api {
PCI_MMAP_SYSFS, /* mmap on /sys/bus/pci/devices/<BDF>/resource<N> */ PCI_MMAP_SYSFS, /* mmap on /sys/bus/pci/devices/<BDF>/resource<N> */
PCI_MMAP_PROCFS /* mmap on /proc/bus/pci/<BDF> */ PCI_MMAP_PROCFS /* mmap on /proc/bus/pci/<BDF> */
}; };
extern int pci_mmap_fits(struct pci_dev *pdev, int resno, int pci_mmap_fits(struct pci_dev *pdev, int resno, struct vm_area_struct *vmai,
struct vm_area_struct *vmai, enum pci_mmap_api mmap_api);
enum pci_mmap_api mmap_api);
#endif #endif
int pci_probe_reset_function(struct pci_dev *dev); int pci_probe_reset_function(struct pci_dev *dev);
...@@ -60,17 +59,17 @@ struct pci_platform_pm_ops { ...@@ -60,17 +59,17 @@ struct pci_platform_pm_ops {
int (*run_wake)(struct pci_dev *dev, bool enable); int (*run_wake)(struct pci_dev *dev, bool enable);
}; };
extern int pci_set_platform_pm(struct pci_platform_pm_ops *ops); int pci_set_platform_pm(struct pci_platform_pm_ops *ops);
extern void pci_update_current_state(struct pci_dev *dev, pci_power_t state); void pci_update_current_state(struct pci_dev *dev, pci_power_t state);
extern void pci_power_up(struct pci_dev *dev); void pci_power_up(struct pci_dev *dev);
extern void pci_disable_enabled_device(struct pci_dev *dev); void pci_disable_enabled_device(struct pci_dev *dev);
extern int pci_finish_runtime_suspend(struct pci_dev *dev); int pci_finish_runtime_suspend(struct pci_dev *dev);
extern int __pci_pme_wakeup(struct pci_dev *dev, void *ign); int __pci_pme_wakeup(struct pci_dev *dev, void *ign);
extern void pci_wakeup_bus(struct pci_bus *bus); void pci_wakeup_bus(struct pci_bus *bus);
extern void pci_config_pm_runtime_get(struct pci_dev *dev); void pci_config_pm_runtime_get(struct pci_dev *dev);
extern void pci_config_pm_runtime_put(struct pci_dev *dev); void pci_config_pm_runtime_put(struct pci_dev *dev);
extern void pci_pm_init(struct pci_dev *dev); void pci_pm_init(struct pci_dev *dev);
extern void pci_allocate_cap_save_buffers(struct pci_dev *dev); void pci_allocate_cap_save_buffers(struct pci_dev *dev);
void pci_free_cap_save_buffers(struct pci_dev *dev); void pci_free_cap_save_buffers(struct pci_dev *dev);
static inline void pci_wakeup_event(struct pci_dev *dev) static inline void pci_wakeup_event(struct pci_dev *dev)
...@@ -96,7 +95,7 @@ struct pci_vpd { ...@@ -96,7 +95,7 @@ struct pci_vpd {
struct bin_attribute *attr; /* descriptor for sysfs VPD entry */ struct bin_attribute *attr; /* descriptor for sysfs VPD entry */
}; };
extern int pci_vpd_pci22_init(struct pci_dev *dev); int pci_vpd_pci22_init(struct pci_dev *dev);
static inline void pci_vpd_release(struct pci_dev *dev) static inline void pci_vpd_release(struct pci_dev *dev)
{ {
if (dev->vpd) if (dev->vpd)
...@@ -105,9 +104,9 @@ static inline void pci_vpd_release(struct pci_dev *dev) ...@@ -105,9 +104,9 @@ static inline void pci_vpd_release(struct pci_dev *dev)
/* PCI /proc functions */ /* PCI /proc functions */
#ifdef CONFIG_PROC_FS #ifdef CONFIG_PROC_FS
extern int pci_proc_attach_device(struct pci_dev *dev); int pci_proc_attach_device(struct pci_dev *dev);
extern int pci_proc_detach_device(struct pci_dev *dev); int pci_proc_detach_device(struct pci_dev *dev);
extern int pci_proc_detach_bus(struct pci_bus *bus); int pci_proc_detach_bus(struct pci_bus *bus);
#else #else
static inline int pci_proc_attach_device(struct pci_dev *dev) { return 0; } static inline int pci_proc_attach_device(struct pci_dev *dev) { return 0; }
static inline int pci_proc_detach_device(struct pci_dev *dev) { return 0; } static inline int pci_proc_detach_device(struct pci_dev *dev) { return 0; }
...@@ -118,8 +117,8 @@ static inline int pci_proc_detach_bus(struct pci_bus *bus) { return 0; } ...@@ -118,8 +117,8 @@ static inline int pci_proc_detach_bus(struct pci_bus *bus) { return 0; }
int pci_hp_add_bridge(struct pci_dev *dev); int pci_hp_add_bridge(struct pci_dev *dev);
#ifdef HAVE_PCI_LEGACY #ifdef HAVE_PCI_LEGACY
extern void pci_create_legacy_files(struct pci_bus *bus); void pci_create_legacy_files(struct pci_bus *bus);
extern void pci_remove_legacy_files(struct pci_bus *bus); void pci_remove_legacy_files(struct pci_bus *bus);
#else #else
static inline void pci_create_legacy_files(struct pci_bus *bus) { return; } static inline void pci_create_legacy_files(struct pci_bus *bus) { return; }
static inline void pci_remove_legacy_files(struct pci_bus *bus) { return; } static inline void pci_remove_legacy_files(struct pci_bus *bus) { return; }
...@@ -134,7 +133,7 @@ extern unsigned int pci_pm_d3_delay; ...@@ -134,7 +133,7 @@ extern unsigned int pci_pm_d3_delay;
#ifdef CONFIG_PCI_MSI #ifdef CONFIG_PCI_MSI
void pci_no_msi(void); void pci_no_msi(void);
extern void pci_msi_init_pci_dev(struct pci_dev *dev); void pci_msi_init_pci_dev(struct pci_dev *dev);
#else #else
static inline void pci_no_msi(void) { } static inline void pci_no_msi(void) { }
static inline void pci_msi_init_pci_dev(struct pci_dev *dev) { } static inline void pci_msi_init_pci_dev(struct pci_dev *dev) { }
...@@ -198,12 +197,11 @@ enum pci_bar_type { ...@@ -198,12 +197,11 @@ enum pci_bar_type {
bool pci_bus_read_dev_vendor_id(struct pci_bus *bus, int devfn, u32 *pl, bool pci_bus_read_dev_vendor_id(struct pci_bus *bus, int devfn, u32 *pl,
int crs_timeout); int crs_timeout);
extern int pci_setup_device(struct pci_dev *dev); int pci_setup_device(struct pci_dev *dev);
extern int __pci_read_base(struct pci_dev *dev, enum pci_bar_type type, int __pci_read_base(struct pci_dev *dev, enum pci_bar_type type,
struct resource *res, unsigned int reg); struct resource *res, unsigned int reg);
extern int pci_resource_bar(struct pci_dev *dev, int resno, int pci_resource_bar(struct pci_dev *dev, int resno, enum pci_bar_type *type);
enum pci_bar_type *type); void pci_configure_ari(struct pci_dev *dev);
extern void pci_configure_ari(struct pci_dev *dev);
/** /**
* pci_ari_enabled - query ARI forwarding status * pci_ari_enabled - query ARI forwarding status
...@@ -217,7 +215,7 @@ static inline int pci_ari_enabled(struct pci_bus *bus) ...@@ -217,7 +215,7 @@ static inline int pci_ari_enabled(struct pci_bus *bus)
} }
void pci_reassigndev_resource_alignment(struct pci_dev *dev); void pci_reassigndev_resource_alignment(struct pci_dev *dev);
extern void pci_disable_bridge_window(struct pci_dev *dev); void pci_disable_bridge_window(struct pci_dev *dev);
/* Single Root I/O Virtualization */ /* Single Root I/O Virtualization */
struct pci_sriov { struct pci_sriov {
...@@ -241,7 +239,7 @@ struct pci_sriov { ...@@ -241,7 +239,7 @@ struct pci_sriov {
}; };
#ifdef CONFIG_PCI_ATS #ifdef CONFIG_PCI_ATS
extern void pci_restore_ats_state(struct pci_dev *dev); void pci_restore_ats_state(struct pci_dev *dev);
#else #else
static inline void pci_restore_ats_state(struct pci_dev *dev) static inline void pci_restore_ats_state(struct pci_dev *dev)
{ {
...@@ -249,14 +247,13 @@ static inline void pci_restore_ats_state(struct pci_dev *dev) ...@@ -249,14 +247,13 @@ static inline void pci_restore_ats_state(struct pci_dev *dev)
#endif /* CONFIG_PCI_ATS */ #endif /* CONFIG_PCI_ATS */
#ifdef CONFIG_PCI_IOV #ifdef CONFIG_PCI_IOV
extern int pci_iov_init(struct pci_dev *dev); int pci_iov_init(struct pci_dev *dev);
extern void pci_iov_release(struct pci_dev *dev); void pci_iov_release(struct pci_dev *dev);
extern int pci_iov_resource_bar(struct pci_dev *dev, int resno, int pci_iov_resource_bar(struct pci_dev *dev, int resno,
enum pci_bar_type *type); enum pci_bar_type *type);
extern resource_size_t pci_sriov_resource_alignment(struct pci_dev *dev, resource_size_t pci_sriov_resource_alignment(struct pci_dev *dev, int resno);
int resno); void pci_restore_iov_state(struct pci_dev *dev);
extern void pci_restore_iov_state(struct pci_dev *dev); int pci_iov_bus_range(struct pci_bus *bus);
extern int pci_iov_bus_range(struct pci_bus *bus);
#else #else
static inline int pci_iov_init(struct pci_dev *dev) static inline int pci_iov_init(struct pci_dev *dev)
...@@ -282,10 +279,10 @@ static inline int pci_iov_bus_range(struct pci_bus *bus) ...@@ -282,10 +279,10 @@ static inline int pci_iov_bus_range(struct pci_bus *bus)
#endif /* CONFIG_PCI_IOV */ #endif /* CONFIG_PCI_IOV */
extern unsigned long pci_cardbus_resource_alignment(struct resource *); unsigned long pci_cardbus_resource_alignment(struct resource *);
static inline resource_size_t pci_resource_alignment(struct pci_dev *dev, static inline resource_size_t pci_resource_alignment(struct pci_dev *dev,
struct resource *res) struct resource *res)
{ {
#ifdef CONFIG_PCI_IOV #ifdef CONFIG_PCI_IOV
int resno = res - dev->resource; int resno = res - dev->resource;
...@@ -298,7 +295,7 @@ static inline resource_size_t pci_resource_alignment(struct pci_dev *dev, ...@@ -298,7 +295,7 @@ static inline resource_size_t pci_resource_alignment(struct pci_dev *dev,
return resource_alignment(res); return resource_alignment(res);
} }
extern void pci_enable_acs(struct pci_dev *dev); void pci_enable_acs(struct pci_dev *dev);
struct pci_dev_reset_methods { struct pci_dev_reset_methods {
u16 vendor; u16 vendor;
...@@ -307,7 +304,7 @@ struct pci_dev_reset_methods { ...@@ -307,7 +304,7 @@ struct pci_dev_reset_methods {
}; };
#ifdef CONFIG_PCI_QUIRKS #ifdef CONFIG_PCI_QUIRKS
extern int pci_dev_specific_reset(struct pci_dev *dev, int probe); int pci_dev_specific_reset(struct pci_dev *dev, int probe);
#else #else
static inline int pci_dev_specific_reset(struct pci_dev *dev, int probe) static inline int pci_dev_specific_reset(struct pci_dev *dev, int probe)
{ {
......
drivers/pci/pcie/aer/aer_inject.c
浏览文件 @ 723ec4d0
...@@ -212,8 +212,8 @@ static int pci_read_aer(struct pci_bus *bus, unsigned int devfn, int where, ...@@ -212,8 +212,8 @@ static int pci_read_aer(struct pci_bus *bus, unsigned int devfn, int where,
return ops->read(bus, devfn, where, size, val); return ops->read(bus, devfn, where, size, val);
} }
int pci_write_aer(struct pci_bus *bus, unsigned int devfn, int where, int size, static int pci_write_aer(struct pci_bus *bus, unsigned int devfn, int where,
u32 val) int size, u32 val)
{ {
u32 *sim; u32 *sim;
struct aer_error *err; struct aer_error *err;
......
drivers/pci/pcie/aer/aerdrv.h
浏览文件 @ 723ec4d0
...@@ -110,15 +110,15 @@ static inline pci_ers_result_t merge_result(enum pci_ers_result orig, ...@@ -110,15 +110,15 @@ static inline pci_ers_result_t merge_result(enum pci_ers_result orig,
} }
extern struct bus_type pcie_port_bus_type; extern struct bus_type pcie_port_bus_type;
extern void aer_do_secondary_bus_reset(struct pci_dev *dev); void aer_do_secondary_bus_reset(struct pci_dev *dev);
extern int aer_init(struct pcie_device *dev); int aer_init(struct pcie_device *dev);
extern void aer_isr(struct work_struct *work); void aer_isr(struct work_struct *work);
extern void aer_print_error(struct pci_dev *dev, struct aer_err_info *info); void aer_print_error(struct pci_dev *dev, struct aer_err_info *info);
extern void aer_print_port_info(struct pci_dev *dev, struct aer_err_info *info); void aer_print_port_info(struct pci_dev *dev, struct aer_err_info *info);
extern irqreturn_t aer_irq(int irq, void *context); irqreturn_t aer_irq(int irq, void *context);
#ifdef CONFIG_ACPI_APEI #ifdef CONFIG_ACPI_APEI
extern int pcie_aer_get_firmware_first(struct pci_dev *pci_dev); int pcie_aer_get_firmware_first(struct pci_dev *pci_dev);
#else #else
static inline int pcie_aer_get_firmware_first(struct pci_dev *pci_dev) static inline int pcie_aer_get_firmware_first(struct pci_dev *pci_dev)
{ {
......
drivers/pci/pcie/portdrv.h
浏览文件 @ 723ec4d0
...@@ -21,18 +21,18 @@ ...@@ -21,18 +21,18 @@
#define get_descriptor_id(type, service) (((type - 4) << 4) | service) #define get_descriptor_id(type, service) (((type - 4) << 4) | service)
extern struct bus_type pcie_port_bus_type; extern struct bus_type pcie_port_bus_type;
extern int pcie_port_device_register(struct pci_dev *dev); int pcie_port_device_register(struct pci_dev *dev);
#ifdef CONFIG_PM #ifdef CONFIG_PM
extern int pcie_port_device_suspend(struct device *dev); int pcie_port_device_suspend(struct device *dev);
extern int pcie_port_device_resume(struct device *dev); int pcie_port_device_resume(struct device *dev);
#endif #endif
extern void pcie_port_device_remove(struct pci_dev *dev); void pcie_port_device_remove(struct pci_dev *dev);
extern int __must_check pcie_port_bus_register(void); int __must_check pcie_port_bus_register(void);
extern void pcie_port_bus_unregister(void); void pcie_port_bus_unregister(void);
struct pci_dev; struct pci_dev;
extern void pcie_clear_root_pme_status(struct pci_dev *dev); void pcie_clear_root_pme_status(struct pci_dev *dev);
#ifdef CONFIG_HOTPLUG_PCI_PCIE #ifdef CONFIG_HOTPLUG_PCI_PCIE
extern bool pciehp_msi_disabled; extern bool pciehp_msi_disabled;
...@@ -59,7 +59,7 @@ static inline bool pcie_pme_no_msi(void) ...@@ -59,7 +59,7 @@ static inline bool pcie_pme_no_msi(void)
return pcie_pme_msi_disabled; return pcie_pme_msi_disabled;
} }
extern void pcie_pme_interrupt_enable(struct pci_dev *dev, bool enable); void pcie_pme_interrupt_enable(struct pci_dev *dev, bool enable);
#else /* !CONFIG_PCIE_PME */ #else /* !CONFIG_PCIE_PME */
static inline void pcie_pme_disable_msi(void) {} static inline void pcie_pme_disable_msi(void) {}
static inline bool pcie_pme_no_msi(void) { return false; } static inline bool pcie_pme_no_msi(void) { return false; }
...@@ -67,7 +67,7 @@ static inline void pcie_pme_interrupt_enable(struct pci_dev *dev, bool en) {} ...@@ -67,7 +67,7 @@ static inline void pcie_pme_interrupt_enable(struct pci_dev *dev, bool en) {}
#endif /* !CONFIG_PCIE_PME */ #endif /* !CONFIG_PCIE_PME */
#ifdef CONFIG_ACPI #ifdef CONFIG_ACPI
extern int pcie_port_acpi_setup(struct pci_dev *port, int *mask); int pcie_port_acpi_setup(struct pci_dev *port, int *mask);
static inline int pcie_port_platform_notify(struct pci_dev *port, int *mask) static inline int pcie_port_platform_notify(struct pci_dev *port, int *mask)
{ {
......
drivers/pci/pcie/portdrv_acpi.c
浏览文件 @ 723ec4d0
...@@ -17,6 +17,7 @@ ...@@ -17,6 +17,7 @@
#include "aer/aerdrv.h" #include "aer/aerdrv.h"
#include "../pci.h" #include "../pci.h"
#include "portdrv.h"
/** /**
* pcie_port_acpi_setup - Request the BIOS to release control of PCIe services. * pcie_port_acpi_setup - Request the BIOS to release control of PCIe services.
......
drivers/pci/pcie/portdrv_pci.c
浏览文件 @ 723ec4d0
...@@ -272,11 +272,9 @@ static pci_ers_result_t pcie_portdrv_error_detected(struct pci_dev *dev, ...@@ -272,11 +272,9 @@ static pci_ers_result_t pcie_portdrv_error_detected(struct pci_dev *dev,
enum pci_channel_state error) enum pci_channel_state error)
{ {
struct aer_broadcast_data data = {error, PCI_ERS_RESULT_CAN_RECOVER}; struct aer_broadcast_data data = {error, PCI_ERS_RESULT_CAN_RECOVER};
int ret;
/* can not fail */
ret = device_for_each_child(&dev->dev, &data, error_detected_iter);
/* get true return value from &data */
device_for_each_child(&dev->dev, &data, error_detected_iter);
return data.result; return data.result;
} }
...@@ -308,10 +306,9 @@ static int mmio_enabled_iter(struct device *device, void *data) ...@@ -308,10 +306,9 @@ static int mmio_enabled_iter(struct device *device, void *data)
static pci_ers_result_t pcie_portdrv_mmio_enabled(struct pci_dev *dev) static pci_ers_result_t pcie_portdrv_mmio_enabled(struct pci_dev *dev)
{ {
pci_ers_result_t status = PCI_ERS_RESULT_RECOVERED; pci_ers_result_t status = PCI_ERS_RESULT_RECOVERED;
int retval;
/* get true return value from &status */ /* get true return value from &status */
retval = device_for_each_child(&dev->dev, &status, mmio_enabled_iter); device_for_each_child(&dev->dev, &status, mmio_enabled_iter);
return status; return status;
} }
...@@ -343,7 +340,6 @@ static int slot_reset_iter(struct device *device, void *data) ...@@ -343,7 +340,6 @@ static int slot_reset_iter(struct device *device, void *data)
static pci_ers_result_t pcie_portdrv_slot_reset(struct pci_dev *dev) static pci_ers_result_t pcie_portdrv_slot_reset(struct pci_dev *dev)
{ {
pci_ers_result_t status = PCI_ERS_RESULT_RECOVERED; pci_ers_result_t status = PCI_ERS_RESULT_RECOVERED;
int retval;
/* If fatal, restore cfg space for possible link reset at upstream */ /* If fatal, restore cfg space for possible link reset at upstream */
if (dev->error_state == pci_channel_io_frozen) { if (dev->error_state == pci_channel_io_frozen) {
...@@ -354,8 +350,7 @@ static pci_ers_result_t pcie_portdrv_slot_reset(struct pci_dev *dev) ...@@ -354,8 +350,7 @@ static pci_ers_result_t pcie_portdrv_slot_reset(struct pci_dev *dev)
} }
/* get true return value from &status */ /* get true return value from &status */
retval = device_for_each_child(&dev->dev, &status, slot_reset_iter); device_for_each_child(&dev->dev, &status, slot_reset_iter);
return status; return status;
} }
...@@ -381,9 +376,7 @@ static int resume_iter(struct device *device, void *data) ...@@ -381,9 +376,7 @@ static int resume_iter(struct device *device, void *data)
static void pcie_portdrv_err_resume(struct pci_dev *dev) static void pcie_portdrv_err_resume(struct pci_dev *dev)
{ {
int retval; device_for_each_child(&dev->dev, NULL, resume_iter);
/* nothing to do with error value, if it ever happens */
retval = device_for_each_child(&dev->dev, NULL, resume_iter);
} }
/* /*
......
drivers/pci/setup-bus.c
浏览文件 @ 723ec4d0
...@@ -1044,7 +1044,7 @@ static void pci_bus_size_cardbus(struct pci_bus *bus, ...@@ -1044,7 +1044,7 @@ static void pci_bus_size_cardbus(struct pci_bus *bus,
; ;
} }
void __ref __pci_bus_size_bridges(struct pci_bus *bus, static void __ref __pci_bus_size_bridges(struct pci_bus *bus,
struct list_head *realloc_head) struct list_head *realloc_head)
{ {
struct pci_dev *dev; struct pci_dev *dev;
...@@ -1545,6 +1545,8 @@ void pci_assign_unassigned_bridge_resources(struct pci_dev *bridge) ...@@ -1545,6 +1545,8 @@ void pci_assign_unassigned_bridge_resources(struct pci_dev *bridge)
enable_all: enable_all:
retval = pci_reenable_device(bridge); retval = pci_reenable_device(bridge);
if (retval)
dev_err(&bridge->dev, "Error reenabling bridge (%d)\n", retval);
pci_set_master(bridge); pci_set_master(bridge);
pci_enable_bridges(parent); pci_enable_bridges(parent);
} }
......
drivers/pci/setup-res.c
浏览文件 @ 723ec4d0
...@@ -261,7 +261,6 @@ int pci_assign_resource(struct pci_dev *dev, int resno) ...@@ -261,7 +261,6 @@ int pci_assign_resource(struct pci_dev *dev, int resno)
{ {
struct resource *res = dev->resource + resno; struct resource *res = dev->resource + resno;
resource_size_t align, size; resource_size_t align, size;
struct pci_bus *bus;
int ret; int ret;
align = pci_resource_alignment(dev, res); align = pci_resource_alignment(dev, res);
...@@ -271,7 +270,6 @@ int pci_assign_resource(struct pci_dev *dev, int resno) ...@@ -271,7 +270,6 @@ int pci_assign_resource(struct pci_dev *dev, int resno)
return -EINVAL; return -EINVAL;
} }
bus = dev->bus;
size = resource_size(res); size = resource_size(res);
ret = _pci_assign_resource(dev, resno, size, align); ret = _pci_assign_resource(dev, resno, size, align);
......
drivers/pci/slot.c
浏览文件 @ 723ec4d0
...@@ -377,14 +377,17 @@ void pci_hp_create_module_link(struct pci_slot *pci_slot) ...@@ -377,14 +377,17 @@ void pci_hp_create_module_link(struct pci_slot *pci_slot)
{ {
struct hotplug_slot *slot = pci_slot->hotplug; struct hotplug_slot *slot = pci_slot->hotplug;
struct kobject *kobj = NULL; struct kobject *kobj = NULL;
int no_warn; int ret;
if (!slot || !slot->ops) if (!slot || !slot->ops)
return; return;
kobj = kset_find_obj(module_kset, slot->ops->mod_name); kobj = kset_find_obj(module_kset, slot->ops->mod_name);
if (!kobj) if (!kobj)
return; return;
no_warn = sysfs_create_link(&pci_slot->kobj, kobj, "module"); ret = sysfs_create_link(&pci_slot->kobj, kobj, "module");
if (ret)
dev_err(&pci_slot->bus->dev, "Error creating sysfs link (%d)\n",
ret);
kobject_put(kobj); kobject_put(kobj);
} }
EXPORT_SYMBOL_GPL(pci_hp_create_module_link); EXPORT_SYMBOL_GPL(pci_hp_create_module_link);
......
include/linux/pci-aspm.h
浏览文件 @ 723ec4d0
...@@ -23,14 +23,14 @@ ...@@ -23,14 +23,14 @@
#define PCIE_LINK_STATE_CLKPM 4 #define PCIE_LINK_STATE_CLKPM 4
#ifdef CONFIG_PCIEASPM #ifdef CONFIG_PCIEASPM
extern void pcie_aspm_init_link_state(struct pci_dev *pdev); void pcie_aspm_init_link_state(struct pci_dev *pdev);
extern void pcie_aspm_exit_link_state(struct pci_dev *pdev); void pcie_aspm_exit_link_state(struct pci_dev *pdev);
extern void pcie_aspm_pm_state_change(struct pci_dev *pdev); void pcie_aspm_pm_state_change(struct pci_dev *pdev);
extern void pcie_aspm_powersave_config_link(struct pci_dev *pdev); void pcie_aspm_powersave_config_link(struct pci_dev *pdev);
extern void pci_disable_link_state(struct pci_dev *pdev, int state); void pci_disable_link_state(struct pci_dev *pdev, int state);
extern void pci_disable_link_state_locked(struct pci_dev *pdev, int state); void pci_disable_link_state_locked(struct pci_dev *pdev, int state);
extern void pcie_clear_aspm(struct pci_bus *bus); void pcie_clear_aspm(struct pci_bus *bus);
extern void pcie_no_aspm(void); void pcie_no_aspm(void);
#else #else
static inline void pcie_aspm_init_link_state(struct pci_dev *pdev) static inline void pcie_aspm_init_link_state(struct pci_dev *pdev)
{ {
...@@ -56,8 +56,8 @@ static inline void pcie_no_aspm(void) ...@@ -56,8 +56,8 @@ static inline void pcie_no_aspm(void)
#endif #endif
#ifdef CONFIG_PCIEASPM_DEBUG /* this depends on CONFIG_PCIEASPM */ #ifdef CONFIG_PCIEASPM_DEBUG /* this depends on CONFIG_PCIEASPM */
extern void pcie_aspm_create_sysfs_dev_files(struct pci_dev *pdev); void pcie_aspm_create_sysfs_dev_files(struct pci_dev *pdev);
extern void pcie_aspm_remove_sysfs_dev_files(struct pci_dev *pdev); void pcie_aspm_remove_sysfs_dev_files(struct pci_dev *pdev);
#else #else
static inline void pcie_aspm_create_sysfs_dev_files(struct pci_dev *pdev) static inline void pcie_aspm_create_sysfs_dev_files(struct pci_dev *pdev)
{ {
......
include/linux/pci-ats.h
浏览文件 @ 723ec4d0
...@@ -14,9 +14,9 @@ struct pci_ats { ...@@ -14,9 +14,9 @@ struct pci_ats {
#ifdef CONFIG_PCI_ATS #ifdef CONFIG_PCI_ATS
extern int pci_enable_ats(struct pci_dev *dev, int ps); int pci_enable_ats(struct pci_dev *dev, int ps);
extern void pci_disable_ats(struct pci_dev *dev); void pci_disable_ats(struct pci_dev *dev);
extern int pci_ats_queue_depth(struct pci_dev *dev); int pci_ats_queue_depth(struct pci_dev *dev);
/** /**
* pci_ats_enabled - query the ATS status * pci_ats_enabled - query the ATS status
...@@ -54,12 +54,12 @@ static inline int pci_ats_enabled(struct pci_dev *dev) ...@@ -54,12 +54,12 @@ static inline int pci_ats_enabled(struct pci_dev *dev)
#ifdef CONFIG_PCI_PRI #ifdef CONFIG_PCI_PRI
extern int pci_enable_pri(struct pci_dev *pdev, u32 reqs); int pci_enable_pri(struct pci_dev *pdev, u32 reqs);
extern void pci_disable_pri(struct pci_dev *pdev); void pci_disable_pri(struct pci_dev *pdev);
extern bool pci_pri_enabled(struct pci_dev *pdev); bool pci_pri_enabled(struct pci_dev *pdev);
extern int pci_reset_pri(struct pci_dev *pdev); int pci_reset_pri(struct pci_dev *pdev);
extern bool pci_pri_stopped(struct pci_dev *pdev); bool pci_pri_stopped(struct pci_dev *pdev);
extern int pci_pri_status(struct pci_dev *pdev); int pci_pri_status(struct pci_dev *pdev);
#else /* CONFIG_PCI_PRI */ #else /* CONFIG_PCI_PRI */
...@@ -95,10 +95,10 @@ static inline int pci_pri_status(struct pci_dev *pdev) ...@@ -95,10 +95,10 @@ static inline int pci_pri_status(struct pci_dev *pdev)
#ifdef CONFIG_PCI_PASID #ifdef CONFIG_PCI_PASID
extern int pci_enable_pasid(struct pci_dev *pdev, int features); int pci_enable_pasid(struct pci_dev *pdev, int features);
extern void pci_disable_pasid(struct pci_dev *pdev); void pci_disable_pasid(struct pci_dev *pdev);
extern int pci_pasid_features(struct pci_dev *pdev); int pci_pasid_features(struct pci_dev *pdev);
extern int pci_max_pasids(struct pci_dev *pdev); int pci_max_pasids(struct pci_dev *pdev);
#else /* CONFIG_PCI_PASID */ #else /* CONFIG_PCI_PASID */
......
include/linux/pci.h
浏览文件 @ 723ec4d0
...@@ -363,7 +363,7 @@ static inline struct pci_dev *pci_physfn(struct pci_dev *dev) ...@@ -363,7 +363,7 @@ static inline struct pci_dev *pci_physfn(struct pci_dev *dev)
return dev; return dev;
} }
extern struct pci_dev *alloc_pci_dev(void); struct pci_dev *alloc_pci_dev(void);
#define to_pci_dev(n) container_of(n, struct pci_dev, dev) #define to_pci_dev(n) container_of(n, struct pci_dev, dev)
#define for_each_pci_dev(d) while ((d = pci_get_device(PCI_ANY_ID, PCI_ANY_ID, d)) != NULL) #define for_each_pci_dev(d) while ((d = pci_get_device(PCI_ANY_ID, PCI_ANY_ID, d)) != NULL)
...@@ -519,10 +519,10 @@ struct pci_ops { ...@@ -519,10 +519,10 @@ struct pci_ops {
* ACPI needs to be able to access PCI config space before we've done a * ACPI needs to be able to access PCI config space before we've done a
* PCI bus scan and created pci_bus structures. * PCI bus scan and created pci_bus structures.
*/ */
extern int raw_pci_read(unsigned int domain, unsigned int bus, int raw_pci_read(unsigned int domain, unsigned int bus, unsigned int devfn,
unsigned int devfn, int reg, int len, u32 *val); int reg, int len, u32 *val);
extern int raw_pci_write(unsigned int domain, unsigned int bus, int raw_pci_write(unsigned int domain, unsigned int bus, unsigned int devfn,
unsigned int devfn, int reg, int len, u32 val); int reg, int len, u32 val);
struct pci_bus_region { struct pci_bus_region {
resource_size_t start; resource_size_t start;
...@@ -673,7 +673,7 @@ struct pci_driver { ...@@ -673,7 +673,7 @@ struct pci_driver {
/* these external functions are only available when PCI support is enabled */ /* these external functions are only available when PCI support is enabled */
#ifdef CONFIG_PCI #ifdef CONFIG_PCI
extern void pcie_bus_configure_settings(struct pci_bus *bus, u8 smpss); void pcie_bus_configure_settings(struct pci_bus *bus, u8 smpss);
enum pcie_bus_config_types { enum pcie_bus_config_types {
PCIE_BUS_TUNE_OFF, PCIE_BUS_TUNE_OFF,
...@@ -690,7 +690,7 @@ extern struct bus_type pci_bus_type; ...@@ -690,7 +690,7 @@ extern struct bus_type pci_bus_type;
* code, or pci core code. */ * code, or pci core code. */
extern struct list_head pci_root_buses; /* list of all known PCI buses */ extern struct list_head pci_root_buses; /* list of all known PCI buses */
/* Some device drivers need know if pci is initiated */ /* Some device drivers need know if pci is initiated */
extern int no_pci_devices(void); int no_pci_devices(void);
void pcibios_resource_survey_bus(struct pci_bus *bus); void pcibios_resource_survey_bus(struct pci_bus *bus);
void pcibios_add_bus(struct pci_bus *bus); void pcibios_add_bus(struct pci_bus *bus);
...@@ -716,7 +716,7 @@ void pcibios_resource_to_bus(struct pci_dev *dev, struct pci_bus_region *region, ...@@ -716,7 +716,7 @@ void pcibios_resource_to_bus(struct pci_dev *dev, struct pci_bus_region *region,
void pcibios_bus_to_resource(struct pci_dev *dev, struct resource *res, void pcibios_bus_to_resource(struct pci_dev *dev, struct resource *res,
struct pci_bus_region *region); struct pci_bus_region *region);
void pcibios_scan_specific_bus(int busn); void pcibios_scan_specific_bus(int busn);
extern struct pci_bus *pci_find_bus(int domain, int busnr); struct pci_bus *pci_find_bus(int domain, int busnr);
void pci_bus_add_devices(const struct pci_bus *bus); void pci_bus_add_devices(const struct pci_bus *bus);
struct pci_bus *pci_scan_bus_parented(struct device *parent, int bus, struct pci_bus *pci_scan_bus_parented(struct device *parent, int bus,
struct pci_ops *ops, void *sysdata); struct pci_ops *ops, void *sysdata);
...@@ -749,14 +749,14 @@ struct resource *pci_find_parent_resource(const struct pci_dev *dev, ...@@ -749,14 +749,14 @@ struct resource *pci_find_parent_resource(const struct pci_dev *dev,
u8 pci_swizzle_interrupt_pin(const struct pci_dev *dev, u8 pin); u8 pci_swizzle_interrupt_pin(const struct pci_dev *dev, u8 pin);
int pci_get_interrupt_pin(struct pci_dev *dev, struct pci_dev **bridge); int pci_get_interrupt_pin(struct pci_dev *dev, struct pci_dev **bridge);
u8 pci_common_swizzle(struct pci_dev *dev, u8 *pinp); u8 pci_common_swizzle(struct pci_dev *dev, u8 *pinp);
extern struct pci_dev *pci_dev_get(struct pci_dev *dev); struct pci_dev *pci_dev_get(struct pci_dev *dev);
extern void pci_dev_put(struct pci_dev *dev); void pci_dev_put(struct pci_dev *dev);
extern void pci_remove_bus(struct pci_bus *b); void pci_remove_bus(struct pci_bus *b);
extern void pci_stop_and_remove_bus_device(struct pci_dev *dev); void pci_stop_and_remove_bus_device(struct pci_dev *dev);
void pci_stop_root_bus(struct pci_bus *bus); void pci_stop_root_bus(struct pci_bus *bus);
void pci_remove_root_bus(struct pci_bus *bus); void pci_remove_root_bus(struct pci_bus *bus);
void pci_setup_cardbus(struct pci_bus *bus); void pci_setup_cardbus(struct pci_bus *bus);
extern void pci_sort_breadthfirst(void); void pci_sort_breadthfirst(void);
#define dev_is_pci(d) ((d)->bus == &pci_bus_type) #define dev_is_pci(d) ((d)->bus == &pci_bus_type)
#define dev_is_pf(d) ((dev_is_pci(d) ? to_pci_dev(d)->is_physfn : false)) #define dev_is_pf(d) ((dev_is_pci(d) ? to_pci_dev(d)->is_physfn : false))
#define dev_num_vf(d) ((dev_is_pci(d) ? pci_num_vf(to_pci_dev(d)) : 0)) #define dev_num_vf(d) ((dev_is_pci(d) ? pci_num_vf(to_pci_dev(d)) : 0))
...@@ -1158,18 +1158,17 @@ static inline int pci_msi_enabled(void) ...@@ -1158,18 +1158,17 @@ static inline int pci_msi_enabled(void)
return 0; return 0;
} }
#else #else
extern int pci_enable_msi_block(struct pci_dev *dev, unsigned int nvec); int pci_enable_msi_block(struct pci_dev *dev, unsigned int nvec);
extern int pci_enable_msi_block_auto(struct pci_dev *dev, unsigned int *maxvec); int pci_enable_msi_block_auto(struct pci_dev *dev, unsigned int *maxvec);
extern void pci_msi_shutdown(struct pci_dev *dev); void pci_msi_shutdown(struct pci_dev *dev);
extern void pci_disable_msi(struct pci_dev *dev); void pci_disable_msi(struct pci_dev *dev);
extern int pci_msix_table_size(struct pci_dev *dev); int pci_msix_table_size(struct pci_dev *dev);
extern int pci_enable_msix(struct pci_dev *dev, int pci_enable_msix(struct pci_dev *dev, struct msix_entry *entries, int nvec);
struct msix_entry *entries, int nvec); void pci_msix_shutdown(struct pci_dev *dev);
extern void pci_msix_shutdown(struct pci_dev *dev); void pci_disable_msix(struct pci_dev *dev);
extern void pci_disable_msix(struct pci_dev *dev); void msi_remove_pci_irq_vectors(struct pci_dev *dev);
extern void msi_remove_pci_irq_vectors(struct pci_dev *dev); void pci_restore_msi_state(struct pci_dev *dev);
extern void pci_restore_msi_state(struct pci_dev *dev); int pci_msi_enabled(void);
extern int pci_msi_enabled(void);
#endif #endif
#ifdef CONFIG_PCIEPORTBUS #ifdef CONFIG_PCIEPORTBUS
...@@ -1184,8 +1183,8 @@ extern bool pcie_ports_auto; ...@@ -1184,8 +1183,8 @@ extern bool pcie_ports_auto;
static inline int pcie_aspm_enabled(void) { return 0; } static inline int pcie_aspm_enabled(void) { return 0; }
static inline bool pcie_aspm_support_enabled(void) { return false; } static inline bool pcie_aspm_support_enabled(void) { return false; }
#else #else
extern int pcie_aspm_enabled(void); int pcie_aspm_enabled(void);
extern bool pcie_aspm_support_enabled(void); bool pcie_aspm_support_enabled(void);
#endif #endif
#ifdef CONFIG_PCIEAER #ifdef CONFIG_PCIEAER
...@@ -1203,8 +1202,8 @@ static inline void pcie_set_ecrc_checking(struct pci_dev *dev) ...@@ -1203,8 +1202,8 @@ static inline void pcie_set_ecrc_checking(struct pci_dev *dev)
} }
static inline void pcie_ecrc_get_policy(char *str) {}; static inline void pcie_ecrc_get_policy(char *str) {};
#else #else
extern void pcie_set_ecrc_checking(struct pci_dev *dev); void pcie_set_ecrc_checking(struct pci_dev *dev);
extern void pcie_ecrc_get_policy(char *str); void pcie_ecrc_get_policy(char *str);
#endif #endif
#define pci_enable_msi(pdev) pci_enable_msi_block(pdev, 1) #define pci_enable_msi(pdev) pci_enable_msi_block(pdev, 1)
...@@ -1215,9 +1214,9 @@ int ht_create_irq(struct pci_dev *dev, int idx); ...@@ -1215,9 +1214,9 @@ int ht_create_irq(struct pci_dev *dev, int idx);
void ht_destroy_irq(unsigned int irq); void ht_destroy_irq(unsigned int irq);
#endif /* CONFIG_HT_IRQ */ #endif /* CONFIG_HT_IRQ */
extern void pci_cfg_access_lock(struct pci_dev *dev); void pci_cfg_access_lock(struct pci_dev *dev);
extern bool pci_cfg_access_trylock(struct pci_dev *dev); bool pci_cfg_access_trylock(struct pci_dev *dev);
extern void pci_cfg_access_unlock(struct pci_dev *dev); void pci_cfg_access_unlock(struct pci_dev *dev);
/* /*
* PCI domain support. Sometimes called PCI segment (eg by ACPI), * PCI domain support. Sometimes called PCI segment (eg by ACPI),
...@@ -1242,7 +1241,7 @@ static inline int pci_proc_domain(struct pci_bus *bus) ...@@ -1242,7 +1241,7 @@ static inline int pci_proc_domain(struct pci_bus *bus)
/* some architectures require additional setup to direct VGA traffic */ /* some architectures require additional setup to direct VGA traffic */
typedef int (*arch_set_vga_state_t)(struct pci_dev *pdev, bool decode, typedef int (*arch_set_vga_state_t)(struct pci_dev *pdev, bool decode,
unsigned int command_bits, u32 flags); unsigned int command_bits, u32 flags);
extern void pci_register_set_vga_state(arch_set_vga_state_t func); void pci_register_set_vga_state(arch_set_vga_state_t func);
#else /* CONFIG_PCI is not enabled */ #else /* CONFIG_PCI is not enabled */
...@@ -1644,8 +1643,8 @@ int pcibios_set_pcie_reset_state(struct pci_dev *dev, ...@@ -1644,8 +1643,8 @@ int pcibios_set_pcie_reset_state(struct pci_dev *dev,
int pcibios_add_device(struct pci_dev *dev); int pcibios_add_device(struct pci_dev *dev);
#ifdef CONFIG_PCI_MMCONFIG #ifdef CONFIG_PCI_MMCONFIG
extern void __init pci_mmcfg_early_init(void); void __init pci_mmcfg_early_init(void);
extern void __init pci_mmcfg_late_init(void); void __init pci_mmcfg_late_init(void);
#else #else
static inline void pci_mmcfg_early_init(void) { } static inline void pci_mmcfg_early_init(void) { }
static inline void pci_mmcfg_late_init(void) { } static inline void pci_mmcfg_late_init(void) { }
...@@ -1656,12 +1655,12 @@ int pci_ext_cfg_avail(void); ...@@ -1656,12 +1655,12 @@ int pci_ext_cfg_avail(void);
void __iomem *pci_ioremap_bar(struct pci_dev *pdev, int bar); void __iomem *pci_ioremap_bar(struct pci_dev *pdev, int bar);
#ifdef CONFIG_PCI_IOV #ifdef CONFIG_PCI_IOV
extern int pci_enable_sriov(struct pci_dev *dev, int nr_virtfn); int pci_enable_sriov(struct pci_dev *dev, int nr_virtfn);
extern void pci_disable_sriov(struct pci_dev *dev); void pci_disable_sriov(struct pci_dev *dev);
extern irqreturn_t pci_sriov_migration(struct pci_dev *dev); irqreturn_t pci_sriov_migration(struct pci_dev *dev);
extern int pci_num_vf(struct pci_dev *dev); int pci_num_vf(struct pci_dev *dev);
extern int pci_sriov_set_totalvfs(struct pci_dev *dev, u16 numvfs); int pci_sriov_set_totalvfs(struct pci_dev *dev, u16 numvfs);
extern int pci_sriov_get_totalvfs(struct pci_dev *dev); int pci_sriov_get_totalvfs(struct pci_dev *dev);
#else #else
static inline int pci_enable_sriov(struct pci_dev *dev, int nr_virtfn) static inline int pci_enable_sriov(struct pci_dev *dev, int nr_virtfn)
{ {
...@@ -1689,8 +1688,8 @@ static inline int pci_sriov_get_totalvfs(struct pci_dev *dev) ...@@ -1689,8 +1688,8 @@ static inline int pci_sriov_get_totalvfs(struct pci_dev *dev)
#endif #endif
#if defined(CONFIG_HOTPLUG_PCI) || defined(CONFIG_HOTPLUG_PCI_MODULE) #if defined(CONFIG_HOTPLUG_PCI) || defined(CONFIG_HOTPLUG_PCI_MODULE)
extern void pci_hp_create_module_link(struct pci_slot *pci_slot); void pci_hp_create_module_link(struct pci_slot *pci_slot);
extern void pci_hp_remove_module_link(struct pci_slot *pci_slot); void pci_hp_remove_module_link(struct pci_slot *pci_slot);
#endif #endif
/** /**
...@@ -1834,13 +1833,13 @@ int pci_vpd_find_info_keyword(const u8 *buf, unsigned int off, ...@@ -1834,13 +1833,13 @@ int pci_vpd_find_info_keyword(const u8 *buf, unsigned int off,
/* PCI <-> OF binding helpers */ /* PCI <-> OF binding helpers */
#ifdef CONFIG_OF #ifdef CONFIG_OF
struct device_node; struct device_node;
extern void pci_set_of_node(struct pci_dev *dev); void pci_set_of_node(struct pci_dev *dev);
extern void pci_release_of_node(struct pci_dev *dev); void pci_release_of_node(struct pci_dev *dev);
extern void pci_set_bus_of_node(struct pci_bus *bus); void pci_set_bus_of_node(struct pci_bus *bus);
extern void pci_release_bus_of_node(struct pci_bus *bus); void pci_release_bus_of_node(struct pci_bus *bus);
/* Arch may override this (weak) */ /* Arch may override this (weak) */
extern struct device_node *pcibios_get_phb_of_node(struct pci_bus *bus); struct device_node *pcibios_get_phb_of_node(struct pci_bus *bus);
static inline struct device_node * static inline struct device_node *
pci_device_to_OF_node(const struct pci_dev *pdev) pci_device_to_OF_node(const struct pci_dev *pdev)
......
include/linux/pci_hotplug.h
浏览文件 @ 723ec4d0
...@@ -125,12 +125,12 @@ static inline const char *hotplug_slot_name(const struct hotplug_slot *slot) ...@@ -125,12 +125,12 @@ static inline const char *hotplug_slot_name(const struct hotplug_slot *slot)
return pci_slot_name(slot->pci_slot); return pci_slot_name(slot->pci_slot);
} }
extern int __pci_hp_register(struct hotplug_slot *slot, struct pci_bus *pbus, int __pci_hp_register(struct hotplug_slot *slot, struct pci_bus *pbus, int nr,
int nr, const char *name, const char *name, struct module *owner,
struct module *owner, const char *mod_name); const char *mod_name);
extern int pci_hp_deregister(struct hotplug_slot *slot); int pci_hp_deregister(struct hotplug_slot *slot);
extern int __must_check pci_hp_change_slot_info (struct hotplug_slot *slot, int __must_check pci_hp_change_slot_info(struct hotplug_slot *slot,
struct hotplug_slot_info *info); struct hotplug_slot_info *info);
/* use a define to avoid include chaining to get THIS_MODULE & friends */ /* use a define to avoid include chaining to get THIS_MODULE & friends */
#define pci_hp_register(slot, pbus, devnr, name) \ #define pci_hp_register(slot, pbus, devnr, name) \
......
include/linux/pcieport_if.h
浏览文件 @ 723ec4d0
...@@ -62,7 +62,7 @@ struct pcie_port_service_driver { ...@@ -62,7 +62,7 @@ struct pcie_port_service_driver {
#define to_service_driver(d) \ #define to_service_driver(d) \
container_of(d, struct pcie_port_service_driver, driver) container_of(d, struct pcie_port_service_driver, driver)
extern int pcie_port_service_register(struct pcie_port_service_driver *new); int pcie_port_service_register(struct pcie_port_service_driver *new);
extern void pcie_port_service_unregister(struct pcie_port_service_driver *new); void pcie_port_service_unregister(struct pcie_port_service_driver *new);
#endif /* _PCIEPORT_IF_H_ */ #endif /* _PCIEPORT_IF_H_ */
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或