diff options
Diffstat (limited to 'drivers/pci/hotplug/cpqphp_ctrl.c')
-rw-r--r-- | drivers/pci/hotplug/cpqphp_ctrl.c | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/drivers/pci/hotplug/cpqphp_ctrl.c b/drivers/pci/hotplug/cpqphp_ctrl.c index f593585f2784..bde47fce3248 100644 --- a/drivers/pci/hotplug/cpqphp_ctrl.c +++ b/drivers/pci/hotplug/cpqphp_ctrl.c | |||
@@ -39,9 +39,9 @@ | |||
39 | #include <linux/kthread.h> | 39 | #include <linux/kthread.h> |
40 | #include "cpqphp.h" | 40 | #include "cpqphp.h" |
41 | 41 | ||
42 | static u32 configure_new_device(struct controller* ctrl, struct pci_func *func, | 42 | static u32 configure_new_device(struct controller *ctrl, struct pci_func *func, |
43 | u8 behind_bridge, struct resource_lists *resources); | 43 | u8 behind_bridge, struct resource_lists *resources); |
44 | static int configure_new_function(struct controller* ctrl, struct pci_func *func, | 44 | static int configure_new_function(struct controller *ctrl, struct pci_func *func, |
45 | u8 behind_bridge, struct resource_lists *resources); | 45 | u8 behind_bridge, struct resource_lists *resources); |
46 | static void interrupt_event_handler(struct controller *ctrl); | 46 | static void interrupt_event_handler(struct controller *ctrl); |
47 | 47 | ||
@@ -64,7 +64,7 @@ static void long_delay(int delay) | |||
64 | 64 | ||
65 | /* FIXME: The following line needs to be somewhere else... */ | 65 | /* FIXME: The following line needs to be somewhere else... */ |
66 | #define WRONG_BUS_FREQUENCY 0x07 | 66 | #define WRONG_BUS_FREQUENCY 0x07 |
67 | static u8 handle_switch_change(u8 change, struct controller * ctrl) | 67 | static u8 handle_switch_change(u8 change, struct controller *ctrl) |
68 | { | 68 | { |
69 | int hp_slot; | 69 | int hp_slot; |
70 | u8 rc = 0; | 70 | u8 rc = 0; |
@@ -138,7 +138,7 @@ static struct slot *cpqhp_find_slot(struct controller *ctrl, u8 device) | |||
138 | } | 138 | } |
139 | 139 | ||
140 | 140 | ||
141 | static u8 handle_presence_change(u16 change, struct controller * ctrl) | 141 | static u8 handle_presence_change(u16 change, struct controller *ctrl) |
142 | { | 142 | { |
143 | int hp_slot; | 143 | int hp_slot; |
144 | u8 rc = 0; | 144 | u8 rc = 0; |
@@ -232,7 +232,7 @@ static u8 handle_presence_change(u16 change, struct controller * ctrl) | |||
232 | } | 232 | } |
233 | 233 | ||
234 | 234 | ||
235 | static u8 handle_power_fault(u8 change, struct controller * ctrl) | 235 | static u8 handle_power_fault(u8 change, struct controller *ctrl) |
236 | { | 236 | { |
237 | int hp_slot; | 237 | int hp_slot; |
238 | u8 rc = 0; | 238 | u8 rc = 0; |
@@ -997,7 +997,7 @@ struct pci_func *cpqhp_slot_create(u8 busnumber) | |||
997 | * | 997 | * |
998 | * Returns %0 if successful, !0 otherwise. | 998 | * Returns %0 if successful, !0 otherwise. |
999 | */ | 999 | */ |
1000 | static int slot_remove(struct pci_func * old_slot) | 1000 | static int slot_remove(struct pci_func *old_slot) |
1001 | { | 1001 | { |
1002 | struct pci_func *next; | 1002 | struct pci_func *next; |
1003 | 1003 | ||
@@ -1109,7 +1109,7 @@ struct pci_func *cpqhp_slot_find(u8 bus, u8 device, u8 index) | |||
1109 | 1109 | ||
1110 | /* DJZ: I don't think is_bridge will work as is. | 1110 | /* DJZ: I don't think is_bridge will work as is. |
1111 | * FIXME */ | 1111 | * FIXME */ |
1112 | static int is_bridge(struct pci_func * func) | 1112 | static int is_bridge(struct pci_func *func) |
1113 | { | 1113 | { |
1114 | /* Check the header type */ | 1114 | /* Check the header type */ |
1115 | if (((func->config_space[0x03] >> 16) & 0xFF) == 0x01) | 1115 | if (((func->config_space[0x03] >> 16) & 0xFF) == 0x01) |
@@ -1625,7 +1625,7 @@ static u32 board_added(struct pci_func *func, struct controller *ctrl) | |||
1625 | * @replace_flag: whether replacing or adding a new device | 1625 | * @replace_flag: whether replacing or adding a new device |
1626 | * @ctrl: target controller | 1626 | * @ctrl: target controller |
1627 | */ | 1627 | */ |
1628 | static u32 remove_board(struct pci_func * func, u32 replace_flag, struct controller * ctrl) | 1628 | static u32 remove_board(struct pci_func *func, u32 replace_flag, struct controller *ctrl) |
1629 | { | 1629 | { |
1630 | int index; | 1630 | int index; |
1631 | u8 skip = 0; | 1631 | u8 skip = 0; |
@@ -1742,7 +1742,7 @@ static void pushbutton_helper_thread(unsigned long data) | |||
1742 | 1742 | ||
1743 | 1743 | ||
1744 | /* this is the main worker thread */ | 1744 | /* this is the main worker thread */ |
1745 | static int event_thread(void* data) | 1745 | static int event_thread(void *data) |
1746 | { | 1746 | { |
1747 | struct controller *ctrl; | 1747 | struct controller *ctrl; |
1748 | 1748 | ||
@@ -1992,7 +1992,7 @@ int cpqhp_process_SI(struct controller *ctrl, struct pci_func *func) | |||
1992 | u16 temp_word; | 1992 | u16 temp_word; |
1993 | u32 tempdword; | 1993 | u32 tempdword; |
1994 | int rc; | 1994 | int rc; |
1995 | struct slot* p_slot; | 1995 | struct slot *p_slot; |
1996 | int physical_slot = 0; | 1996 | int physical_slot = 0; |
1997 | 1997 | ||
1998 | tempdword = 0; | 1998 | tempdword = 0; |
@@ -2088,7 +2088,7 @@ int cpqhp_process_SS(struct controller *ctrl, struct pci_func *func) | |||
2088 | u8 replace_flag; | 2088 | u8 replace_flag; |
2089 | u32 rc = 0; | 2089 | u32 rc = 0; |
2090 | unsigned int devfn; | 2090 | unsigned int devfn; |
2091 | struct slot* p_slot; | 2091 | struct slot *p_slot; |
2092 | struct pci_bus *pci_bus = ctrl->pci_bus; | 2092 | struct pci_bus *pci_bus = ctrl->pci_bus; |
2093 | int physical_slot=0; | 2093 | int physical_slot=0; |
2094 | 2094 | ||
@@ -2270,8 +2270,8 @@ int cpqhp_hardware_test(struct controller *ctrl, int test_num) | |||
2270 | * | 2270 | * |
2271 | * Returns 0 if success. | 2271 | * Returns 0 if success. |
2272 | */ | 2272 | */ |
2273 | static u32 configure_new_device(struct controller * ctrl, struct pci_func * func, | 2273 | static u32 configure_new_device(struct controller *ctrl, struct pci_func *func, |
2274 | u8 behind_bridge, struct resource_lists * resources) | 2274 | u8 behind_bridge, struct resource_lists *resources) |
2275 | { | 2275 | { |
2276 | u8 temp_byte, function, max_functions, stop_it; | 2276 | u8 temp_byte, function, max_functions, stop_it; |
2277 | int rc; | 2277 | int rc; |