diff options
author | Alex Chiang <achiang@hp.com> | 2009-03-31 11:23:11 -0400 |
---|---|---|
committer | Jesse Barnes <jbarnes@virtuousgeek.org> | 2009-06-11 15:04:07 -0400 |
commit | 861fefbf550d41e7a4f44584f3ec35977fa08bf1 (patch) | |
tree | e7fd059f852d225f5270bd5ef0a367eab06a6a8f /drivers/pci/hotplug/cpqphp.h | |
parent | d09ee9687e027fc7d2c6b95daf05a8ef3ff06340 (diff) |
PCI Hotplug: cpqphp: stray whitespace cleanups
Clean up all stray whitespace issues, such as trailing whitespace,
spaces before tabs, etc. and whatever else vim's c_space_errors
highlights in red.
Signed-off-by: Alex Chiang <achiang@hp.com>
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
Diffstat (limited to 'drivers/pci/hotplug/cpqphp.h')
-rw-r--r-- | drivers/pci/hotplug/cpqphp.h | 58 |
1 files changed, 29 insertions, 29 deletions
diff --git a/drivers/pci/hotplug/cpqphp.h b/drivers/pci/hotplug/cpqphp.h index afaf8f69f73e..b627dfd74500 100644 --- a/drivers/pci/hotplug/cpqphp.h +++ b/drivers/pci/hotplug/cpqphp.h | |||
@@ -150,25 +150,25 @@ struct ctrl_reg { /* offset */ | |||
150 | 150 | ||
151 | /* offsets to the controller registers based on the above structure layout */ | 151 | /* offsets to the controller registers based on the above structure layout */ |
152 | enum ctrl_offsets { | 152 | enum ctrl_offsets { |
153 | SLOT_RST = offsetof(struct ctrl_reg, slot_RST), | 153 | SLOT_RST = offsetof(struct ctrl_reg, slot_RST), |
154 | SLOT_ENABLE = offsetof(struct ctrl_reg, slot_enable), | 154 | SLOT_ENABLE = offsetof(struct ctrl_reg, slot_enable), |
155 | MISC = offsetof(struct ctrl_reg, misc), | 155 | MISC = offsetof(struct ctrl_reg, misc), |
156 | LED_CONTROL = offsetof(struct ctrl_reg, led_control), | 156 | LED_CONTROL = offsetof(struct ctrl_reg, led_control), |
157 | INT_INPUT_CLEAR = offsetof(struct ctrl_reg, int_input_clear), | 157 | INT_INPUT_CLEAR = offsetof(struct ctrl_reg, int_input_clear), |
158 | INT_MASK = offsetof(struct ctrl_reg, int_mask), | 158 | INT_MASK = offsetof(struct ctrl_reg, int_mask), |
159 | CTRL_RESERVED0 = offsetof(struct ctrl_reg, reserved0), | 159 | CTRL_RESERVED0 = offsetof(struct ctrl_reg, reserved0), |
160 | CTRL_RESERVED1 = offsetof(struct ctrl_reg, reserved1), | 160 | CTRL_RESERVED1 = offsetof(struct ctrl_reg, reserved1), |
161 | CTRL_RESERVED2 = offsetof(struct ctrl_reg, reserved1), | 161 | CTRL_RESERVED2 = offsetof(struct ctrl_reg, reserved1), |
162 | GEN_OUTPUT_AB = offsetof(struct ctrl_reg, gen_output_AB), | 162 | GEN_OUTPUT_AB = offsetof(struct ctrl_reg, gen_output_AB), |
163 | NON_INT_INPUT = offsetof(struct ctrl_reg, non_int_input), | 163 | NON_INT_INPUT = offsetof(struct ctrl_reg, non_int_input), |
164 | CTRL_RESERVED3 = offsetof(struct ctrl_reg, reserved3), | 164 | CTRL_RESERVED3 = offsetof(struct ctrl_reg, reserved3), |
165 | CTRL_RESERVED4 = offsetof(struct ctrl_reg, reserved4), | 165 | CTRL_RESERVED4 = offsetof(struct ctrl_reg, reserved4), |
166 | CTRL_RESERVED5 = offsetof(struct ctrl_reg, reserved5), | 166 | CTRL_RESERVED5 = offsetof(struct ctrl_reg, reserved5), |
167 | CTRL_RESERVED6 = offsetof(struct ctrl_reg, reserved6), | 167 | CTRL_RESERVED6 = offsetof(struct ctrl_reg, reserved6), |
168 | CTRL_RESERVED7 = offsetof(struct ctrl_reg, reserved7), | 168 | CTRL_RESERVED7 = offsetof(struct ctrl_reg, reserved7), |
169 | CTRL_RESERVED8 = offsetof(struct ctrl_reg, reserved8), | 169 | CTRL_RESERVED8 = offsetof(struct ctrl_reg, reserved8), |
170 | SLOT_MASK = offsetof(struct ctrl_reg, slot_mask), | 170 | SLOT_MASK = offsetof(struct ctrl_reg, slot_mask), |
171 | CTRL_RESERVED9 = offsetof(struct ctrl_reg, reserved9), | 171 | CTRL_RESERVED9 = offsetof(struct ctrl_reg, reserved9), |
172 | CTRL_RESERVED10 = offsetof(struct ctrl_reg, reserved10), | 172 | CTRL_RESERVED10 = offsetof(struct ctrl_reg, reserved10), |
173 | CTRL_RESERVED11 = offsetof(struct ctrl_reg, reserved11), | 173 | CTRL_RESERVED11 = offsetof(struct ctrl_reg, reserved11), |
174 | SLOT_SERR = offsetof(struct ctrl_reg, slot_SERR), | 174 | SLOT_SERR = offsetof(struct ctrl_reg, slot_SERR), |
@@ -220,15 +220,15 @@ struct slot_rt { | |||
220 | /* offsets to the hotplug slot resource table registers based on the above structure layout */ | 220 | /* offsets to the hotplug slot resource table registers based on the above structure layout */ |
221 | enum slot_rt_offsets { | 221 | enum slot_rt_offsets { |
222 | DEV_FUNC = offsetof(struct slot_rt, dev_func), | 222 | DEV_FUNC = offsetof(struct slot_rt, dev_func), |
223 | PRIMARY_BUS = offsetof(struct slot_rt, primary_bus), | 223 | PRIMARY_BUS = offsetof(struct slot_rt, primary_bus), |
224 | SECONDARY_BUS = offsetof(struct slot_rt, secondary_bus), | 224 | SECONDARY_BUS = offsetof(struct slot_rt, secondary_bus), |
225 | MAX_BUS = offsetof(struct slot_rt, max_bus), | 225 | MAX_BUS = offsetof(struct slot_rt, max_bus), |
226 | IO_BASE = offsetof(struct slot_rt, io_base), | 226 | IO_BASE = offsetof(struct slot_rt, io_base), |
227 | IO_LENGTH = offsetof(struct slot_rt, io_length), | 227 | IO_LENGTH = offsetof(struct slot_rt, io_length), |
228 | MEM_BASE = offsetof(struct slot_rt, mem_base), | 228 | MEM_BASE = offsetof(struct slot_rt, mem_base), |
229 | MEM_LENGTH = offsetof(struct slot_rt, mem_length), | 229 | MEM_LENGTH = offsetof(struct slot_rt, mem_length), |
230 | PRE_MEM_BASE = offsetof(struct slot_rt, pre_mem_base), | 230 | PRE_MEM_BASE = offsetof(struct slot_rt, pre_mem_base), |
231 | PRE_MEM_LENGTH = offsetof(struct slot_rt, pre_mem_length), | 231 | PRE_MEM_LENGTH = offsetof(struct slot_rt, pre_mem_length), |
232 | }; | 232 | }; |
233 | 233 | ||
234 | struct pci_func { | 234 | struct pci_func { |
@@ -471,7 +471,7 @@ static inline void return_resource(struct pci_resource **head, struct pci_resour | |||
471 | static inline void set_SOGO(struct controller *ctrl) | 471 | static inline void set_SOGO(struct controller *ctrl) |
472 | { | 472 | { |
473 | u16 misc; | 473 | u16 misc; |
474 | 474 | ||
475 | misc = readw(ctrl->hpc_reg + MISC); | 475 | misc = readw(ctrl->hpc_reg + MISC); |
476 | misc = (misc | 0x0001) & 0xFFFB; | 476 | misc = (misc | 0x0001) & 0xFFFB; |
477 | writew(misc, ctrl->hpc_reg + MISC); | 477 | writew(misc, ctrl->hpc_reg + MISC); |
@@ -481,7 +481,7 @@ static inline void set_SOGO(struct controller *ctrl) | |||
481 | static inline void amber_LED_on(struct controller *ctrl, u8 slot) | 481 | static inline void amber_LED_on(struct controller *ctrl, u8 slot) |
482 | { | 482 | { |
483 | u32 led_control; | 483 | u32 led_control; |
484 | 484 | ||
485 | led_control = readl(ctrl->hpc_reg + LED_CONTROL); | 485 | led_control = readl(ctrl->hpc_reg + LED_CONTROL); |
486 | led_control |= (0x01010000L << slot); | 486 | led_control |= (0x01010000L << slot); |
487 | writel(led_control, ctrl->hpc_reg + LED_CONTROL); | 487 | writel(led_control, ctrl->hpc_reg + LED_CONTROL); |
@@ -491,7 +491,7 @@ static inline void amber_LED_on(struct controller *ctrl, u8 slot) | |||
491 | static inline void amber_LED_off(struct controller *ctrl, u8 slot) | 491 | static inline void amber_LED_off(struct controller *ctrl, u8 slot) |
492 | { | 492 | { |
493 | u32 led_control; | 493 | u32 led_control; |
494 | 494 | ||
495 | led_control = readl(ctrl->hpc_reg + LED_CONTROL); | 495 | led_control = readl(ctrl->hpc_reg + LED_CONTROL); |
496 | led_control &= ~(0x01010000L << slot); | 496 | led_control &= ~(0x01010000L << slot); |
497 | writel(led_control, ctrl->hpc_reg + LED_CONTROL); | 497 | writel(led_control, ctrl->hpc_reg + LED_CONTROL); |
@@ -504,7 +504,7 @@ static inline int read_amber_LED(struct controller *ctrl, u8 slot) | |||
504 | 504 | ||
505 | led_control = readl(ctrl->hpc_reg + LED_CONTROL); | 505 | led_control = readl(ctrl->hpc_reg + LED_CONTROL); |
506 | led_control &= (0x01010000L << slot); | 506 | led_control &= (0x01010000L << slot); |
507 | 507 | ||
508 | return led_control ? 1 : 0; | 508 | return led_control ? 1 : 0; |
509 | } | 509 | } |
510 | 510 | ||
@@ -512,7 +512,7 @@ static inline int read_amber_LED(struct controller *ctrl, u8 slot) | |||
512 | static inline void green_LED_on(struct controller *ctrl, u8 slot) | 512 | static inline void green_LED_on(struct controller *ctrl, u8 slot) |
513 | { | 513 | { |
514 | u32 led_control; | 514 | u32 led_control; |
515 | 515 | ||
516 | led_control = readl(ctrl->hpc_reg + LED_CONTROL); | 516 | led_control = readl(ctrl->hpc_reg + LED_CONTROL); |
517 | led_control |= 0x0101L << slot; | 517 | led_control |= 0x0101L << slot; |
518 | writel(led_control, ctrl->hpc_reg + LED_CONTROL); | 518 | writel(led_control, ctrl->hpc_reg + LED_CONTROL); |
@@ -521,7 +521,7 @@ static inline void green_LED_on(struct controller *ctrl, u8 slot) | |||
521 | static inline void green_LED_off(struct controller *ctrl, u8 slot) | 521 | static inline void green_LED_off(struct controller *ctrl, u8 slot) |
522 | { | 522 | { |
523 | u32 led_control; | 523 | u32 led_control; |
524 | 524 | ||
525 | led_control = readl(ctrl->hpc_reg + LED_CONTROL); | 525 | led_control = readl(ctrl->hpc_reg + LED_CONTROL); |
526 | led_control &= ~(0x0101L << slot); | 526 | led_control &= ~(0x0101L << slot); |
527 | writel(led_control, ctrl->hpc_reg + LED_CONTROL); | 527 | writel(led_control, ctrl->hpc_reg + LED_CONTROL); |
@@ -531,7 +531,7 @@ static inline void green_LED_off(struct controller *ctrl, u8 slot) | |||
531 | static inline void green_LED_blink(struct controller *ctrl, u8 slot) | 531 | static inline void green_LED_blink(struct controller *ctrl, u8 slot) |
532 | { | 532 | { |
533 | u32 led_control; | 533 | u32 led_control; |
534 | 534 | ||
535 | led_control = readl(ctrl->hpc_reg + LED_CONTROL); | 535 | led_control = readl(ctrl->hpc_reg + LED_CONTROL); |
536 | led_control &= ~(0x0101L << slot); | 536 | led_control &= ~(0x0101L << slot); |
537 | led_control |= (0x0001L << slot); | 537 | led_control |= (0x0001L << slot); |
@@ -586,11 +586,11 @@ static inline u8 read_slot_enable(struct controller *ctrl) | |||
586 | static inline u8 get_controller_speed(struct controller *ctrl) | 586 | static inline u8 get_controller_speed(struct controller *ctrl) |
587 | { | 587 | { |
588 | u8 curr_freq; | 588 | u8 curr_freq; |
589 | u16 misc; | 589 | u16 misc; |
590 | 590 | ||
591 | if (ctrl->pcix_support) { | 591 | if (ctrl->pcix_support) { |
592 | curr_freq = readb(ctrl->hpc_reg + NEXT_CURR_FREQ); | 592 | curr_freq = readb(ctrl->hpc_reg + NEXT_CURR_FREQ); |
593 | if ((curr_freq & 0xB0) == 0xB0) | 593 | if ((curr_freq & 0xB0) == 0xB0) |
594 | return PCI_SPEED_133MHz_PCIX; | 594 | return PCI_SPEED_133MHz_PCIX; |
595 | if ((curr_freq & 0xA0) == 0xA0) | 595 | if ((curr_freq & 0xA0) == 0xA0) |
596 | return PCI_SPEED_100MHz_PCIX; | 596 | return PCI_SPEED_100MHz_PCIX; |
@@ -602,10 +602,10 @@ static inline u8 get_controller_speed(struct controller *ctrl) | |||
602 | return PCI_SPEED_33MHz; | 602 | return PCI_SPEED_33MHz; |
603 | } | 603 | } |
604 | 604 | ||
605 | misc = readw(ctrl->hpc_reg + MISC); | 605 | misc = readw(ctrl->hpc_reg + MISC); |
606 | return (misc & 0x0800) ? PCI_SPEED_66MHz : PCI_SPEED_33MHz; | 606 | return (misc & 0x0800) ? PCI_SPEED_66MHz : PCI_SPEED_33MHz; |
607 | } | 607 | } |
608 | 608 | ||
609 | 609 | ||
610 | /* | 610 | /* |
611 | * get_adapter_speed - find the max supported frequency/mode of adapter. | 611 | * get_adapter_speed - find the max supported frequency/mode of adapter. |