diff options
author | Alex Chiang <achiang@hp.com> | 2009-03-31 11:23:21 -0400 |
---|---|---|
committer | Jesse Barnes <jbarnes@virtuousgeek.org> | 2009-06-11 15:04:09 -0400 |
commit | 86a58023e4078a843f8ca8a9b6fa23542d881f99 (patch) | |
tree | 61db2563bf96253b5b70e50c86d24100814c7f9e | |
parent | 427438c61b0083a60bb953cb36cfdc5841f0bb03 (diff) |
PCI Hotplug: cpqphp: obey 80 column convention in cpqphp.h
Clean up cpqphp.h to follow 80 column convention.
Signed-off-by: Alex Chiang <achiang@hp.com>
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
-rw-r--r-- | drivers/pci/hotplug/cpqphp.h | 76 |
1 files changed, 45 insertions, 31 deletions
diff --git a/drivers/pci/hotplug/cpqphp.h b/drivers/pci/hotplug/cpqphp.h index e15d657368f0..308f82b1fc9a 100644 --- a/drivers/pci/hotplug/cpqphp.h +++ b/drivers/pci/hotplug/cpqphp.h | |||
@@ -405,40 +405,50 @@ struct resource_lists { | |||
405 | 405 | ||
406 | 406 | ||
407 | /* debugfs functions for the hotplug controller info */ | 407 | /* debugfs functions for the hotplug controller info */ |
408 | extern void cpqhp_initialize_debugfs (void); | 408 | extern void cpqhp_initialize_debugfs(void); |
409 | extern void cpqhp_shutdown_debugfs (void); | 409 | extern void cpqhp_shutdown_debugfs(void); |
410 | extern void cpqhp_create_debugfs_files (struct controller *ctrl); | 410 | extern void cpqhp_create_debugfs_files(struct controller *ctrl); |
411 | extern void cpqhp_remove_debugfs_files (struct controller *ctrl); | 411 | extern void cpqhp_remove_debugfs_files(struct controller *ctrl); |
412 | 412 | ||
413 | /* controller functions */ | 413 | /* controller functions */ |
414 | extern void cpqhp_pushbutton_thread (unsigned long event_pointer); | 414 | extern void cpqhp_pushbutton_thread(unsigned long event_pointer); |
415 | extern irqreturn_t cpqhp_ctrl_intr (int IRQ, void *data); | 415 | extern irqreturn_t cpqhp_ctrl_intr(int IRQ, void *data); |
416 | extern int cpqhp_find_available_resources (struct controller *ctrl, void __iomem *rom_start); | 416 | extern int cpqhp_find_available_resources(struct controller *ctrl, |
417 | extern int cpqhp_event_start_thread (void); | 417 | void __iomem *rom_start); |
418 | extern void cpqhp_event_stop_thread (void); | 418 | extern int cpqhp_event_start_thread(void); |
419 | extern struct pci_func *cpqhp_slot_create (unsigned char busnumber); | 419 | extern void cpqhp_event_stop_thread(void); |
420 | extern struct pci_func *cpqhp_slot_find (unsigned char bus, unsigned char device, unsigned char index); | 420 | extern struct pci_func *cpqhp_slot_create(unsigned char busnumber); |
421 | extern int cpqhp_process_SI (struct controller *ctrl, struct pci_func *func); | 421 | extern struct pci_func *cpqhp_slot_find(unsigned char bus, unsigned char device, |
422 | extern int cpqhp_process_SS (struct controller *ctrl, struct pci_func *func); | 422 | unsigned char index); |
423 | extern int cpqhp_hardware_test (struct controller *ctrl, int test_num); | 423 | extern int cpqhp_process_SI(struct controller *ctrl, struct pci_func *func); |
424 | extern int cpqhp_process_SS(struct controller *ctrl, struct pci_func *func); | ||
425 | extern int cpqhp_hardware_test(struct controller *ctrl, int test_num); | ||
424 | 426 | ||
425 | /* resource functions */ | 427 | /* resource functions */ |
426 | extern int cpqhp_resource_sort_and_combine (struct pci_resource **head); | 428 | extern int cpqhp_resource_sort_and_combine (struct pci_resource **head); |
427 | 429 | ||
428 | /* pci functions */ | 430 | /* pci functions */ |
429 | extern int cpqhp_set_irq (u8 bus_num, u8 dev_num, u8 int_pin, u8 irq_num); | 431 | extern int cpqhp_set_irq(u8 bus_num, u8 dev_num, u8 int_pin, u8 irq_num); |
430 | extern int cpqhp_get_bus_dev (struct controller *ctrl, u8 *bus_num, u8 *dev_num, u8 slot); | 432 | extern int cpqhp_get_bus_dev(struct controller *ctrl, u8 *bus_num, u8 *dev_num, |
431 | extern int cpqhp_save_config (struct controller *ctrl, int busnumber, int is_hot_plug); | 433 | u8 slot); |
432 | extern int cpqhp_save_base_addr_length (struct controller *ctrl, struct pci_func * func); | 434 | extern int cpqhp_save_config(struct controller *ctrl, int busnumber, |
433 | extern int cpqhp_save_used_resources (struct controller *ctrl, struct pci_func * func); | 435 | int is_hot_plug); |
434 | extern int cpqhp_configure_board (struct controller *ctrl, struct pci_func * func); | 436 | extern int cpqhp_save_base_addr_length(struct controller *ctrl, |
435 | extern int cpqhp_save_slot_config (struct controller *ctrl, struct pci_func * new_slot); | 437 | struct pci_func *func); |
436 | extern int cpqhp_valid_replace (struct controller *ctrl, struct pci_func * func); | 438 | extern int cpqhp_save_used_resources(struct controller *ctrl, |
437 | extern void cpqhp_destroy_board_resources (struct pci_func * func); | 439 | struct pci_func *func); |
438 | extern int cpqhp_return_board_resources (struct pci_func * func, struct resource_lists * resources); | 440 | extern int cpqhp_configure_board(struct controller *ctrl, |
439 | extern void cpqhp_destroy_resource_list (struct resource_lists * resources); | 441 | struct pci_func *func); |
440 | extern int cpqhp_configure_device (struct controller* ctrl, struct pci_func* func); | 442 | extern int cpqhp_save_slot_config(struct controller *ctrl, |
441 | extern int cpqhp_unconfigure_device (struct pci_func* func); | 443 | struct pci_func *new_slot); |
444 | extern int cpqhp_valid_replace(struct controller *ctrl, struct pci_func *func); | ||
445 | extern void cpqhp_destroy_board_resources(struct pci_func *func); | ||
446 | extern int cpqhp_return_board_resources (struct pci_func *func, | ||
447 | struct resource_lists *resources); | ||
448 | extern void cpqhp_destroy_resource_list(struct resource_lists *resources); | ||
449 | extern int cpqhp_configure_device(struct controller *ctrl, | ||
450 | struct pci_func *func); | ||
451 | extern int cpqhp_unconfigure_device(struct pci_func *func); | ||
442 | 452 | ||
443 | /* Global variables */ | 453 | /* Global variables */ |
444 | extern int cpqhp_debug; | 454 | extern int cpqhp_debug; |
@@ -463,7 +473,8 @@ static inline char *slot_name(struct slot *slot) | |||
463 | * | 473 | * |
464 | * Puts node back in the resource list pointed to by head | 474 | * Puts node back in the resource list pointed to by head |
465 | */ | 475 | */ |
466 | static inline void return_resource(struct pci_resource **head, struct pci_resource *node) | 476 | static inline void return_resource(struct pci_resource **head, |
477 | struct pci_resource *node) | ||
467 | { | 478 | { |
468 | if (!node || !head) | 479 | if (!node || !head) |
469 | return; | 480 | return; |
@@ -673,7 +684,8 @@ static inline int get_slot_enabled(struct controller *ctrl, struct slot *slot) | |||
673 | } | 684 | } |
674 | 685 | ||
675 | 686 | ||
676 | static inline int cpq_get_latch_status(struct controller *ctrl, struct slot *slot) | 687 | static inline int cpq_get_latch_status(struct controller *ctrl, |
688 | struct slot *slot) | ||
677 | { | 689 | { |
678 | u32 status; | 690 | u32 status; |
679 | u8 hp_slot; | 691 | u8 hp_slot; |
@@ -688,7 +700,8 @@ static inline int cpq_get_latch_status(struct controller *ctrl, struct slot *slo | |||
688 | } | 700 | } |
689 | 701 | ||
690 | 702 | ||
691 | static inline int get_presence_status(struct controller *ctrl, struct slot *slot) | 703 | static inline int get_presence_status(struct controller *ctrl, |
704 | struct slot *slot) | ||
692 | { | 705 | { |
693 | int presence_save = 0; | 706 | int presence_save = 0; |
694 | u8 hp_slot; | 707 | u8 hp_slot; |
@@ -697,7 +710,8 @@ static inline int get_presence_status(struct controller *ctrl, struct slot *slot | |||
697 | hp_slot = slot->device - ctrl->slot_device_offset; | 710 | hp_slot = slot->device - ctrl->slot_device_offset; |
698 | 711 | ||
699 | tempdword = readl(ctrl->hpc_reg + INT_INPUT_CLEAR); | 712 | tempdword = readl(ctrl->hpc_reg + INT_INPUT_CLEAR); |
700 | presence_save = (int) ((((~tempdword) >> 23) | ((~tempdword) >> 15)) >> hp_slot) & 0x02; | 713 | presence_save = (int) ((((~tempdword) >> 23) | ((~tempdword) >> 15)) |
714 | >> hp_slot) & 0x02; | ||
701 | 715 | ||
702 | return presence_save; | 716 | return presence_save; |
703 | } | 717 | } |