aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/pci/hotplug/cpqphp.h
diff options
context:
space:
mode:
authorAlex Chiang <achiang@hp.com>2009-03-31 11:23:16 -0400
committerJesse Barnes <jbarnes@virtuousgeek.org>2009-06-11 15:04:08 -0400
commit427438c61b0083a60bb953cb36cfdc5841f0bb03 (patch)
tree4583b0f23eed091006324bc1f3f61ed7fcd8a7ac /drivers/pci/hotplug/cpqphp.h
parent861fefbf550d41e7a4f44584f3ec35977fa08bf1 (diff)
PCI Hotplug: cpqphp: fix comment style
Fix up comments from C++ to C-style, wrapping if necessary, etc. 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.h22
1 files changed, 11 insertions, 11 deletions
diff --git a/drivers/pci/hotplug/cpqphp.h b/drivers/pci/hotplug/cpqphp.h
index b627dfd74500..e15d657368f0 100644
--- a/drivers/pci/hotplug/cpqphp.h
+++ b/drivers/pci/hotplug/cpqphp.h
@@ -190,7 +190,9 @@ struct hrt {
190 u32 reserved2; 190 u32 reserved2;
191} __attribute__ ((packed)); 191} __attribute__ ((packed));
192 192
193/* offsets to the hotplug resource table registers based on the above structure layout */ 193/* offsets to the hotplug resource table registers based on the above
194 * structure layout
195 */
194enum hrt_offsets { 196enum hrt_offsets {
195 SIG0 = offsetof(struct hrt, sig0), 197 SIG0 = offsetof(struct hrt, sig0),
196 SIG1 = offsetof(struct hrt, sig1), 198 SIG1 = offsetof(struct hrt, sig1),
@@ -217,7 +219,9 @@ struct slot_rt {
217 u16 pre_mem_length; 219 u16 pre_mem_length;
218} __attribute__ ((packed)); 220} __attribute__ ((packed));
219 221
220/* offsets to the hotplug slot resource table registers based on the above structure layout */ 222/* offsets to the hotplug slot resource table registers based on the above
223 * structure layout
224 */
221enum slot_rt_offsets { 225enum slot_rt_offsets {
222 DEV_FUNC = offsetof(struct slot_rt, dev_func), 226 DEV_FUNC = offsetof(struct slot_rt, dev_func),
223 PRIMARY_BUS = offsetof(struct slot_rt, primary_bus), 227 PRIMARY_BUS = offsetof(struct slot_rt, primary_bus),
@@ -286,8 +290,8 @@ struct event_info {
286struct controller { 290struct controller {
287 struct controller *next; 291 struct controller *next;
288 u32 ctrl_int_comp; 292 u32 ctrl_int_comp;
289 struct mutex crit_sect; /* critical section mutex */ 293 struct mutex crit_sect; /* critical section mutex */
290 void __iomem *hpc_reg; /* cookie for our pci controller location */ 294 void __iomem *hpc_reg; /* cookie for our pci controller location */
291 struct pci_resource *mem_head; 295 struct pci_resource *mem_head;
292 struct pci_resource *p_mem_head; 296 struct pci_resource *p_mem_head;
293 struct pci_resource *io_head; 297 struct pci_resource *io_head;
@@ -299,7 +303,7 @@ struct controller {
299 u8 next_event; 303 u8 next_event;
300 u8 interrupt; 304 u8 interrupt;
301 u8 cfgspc_irq; 305 u8 cfgspc_irq;
302 u8 bus; /* bus number for the pci hotplug controller */ 306 u8 bus; /* bus number for the pci hotplug controller */
303 u8 rev; 307 u8 rev;
304 u8 slot_device_offset; 308 u8 slot_device_offset;
305 u8 first_slot; 309 u8 first_slot;
@@ -458,7 +462,6 @@ static inline char *slot_name(struct slot *slot)
458 * return_resource 462 * return_resource
459 * 463 *
460 * Puts node back in the resource list pointed to by head 464 * Puts node back in the resource list pointed to by head
461 *
462 */ 465 */
463static inline void return_resource(struct pci_resource **head, struct pci_resource *node) 466static inline void return_resource(struct pci_resource **head, struct pci_resource *node)
464{ 467{
@@ -575,13 +578,12 @@ static inline u8 read_slot_enable(struct controller *ctrl)
575} 578}
576 579
577 580
578/* 581/**
579 * get_controller_speed - find the current frequency/mode of controller. 582 * get_controller_speed - find the current frequency/mode of controller.
580 * 583 *
581 * @ctrl: controller to get frequency/mode for. 584 * @ctrl: controller to get frequency/mode for.
582 * 585 *
583 * Returns controller speed. 586 * Returns controller speed.
584 *
585 */ 587 */
586static inline u8 get_controller_speed(struct controller *ctrl) 588static inline u8 get_controller_speed(struct controller *ctrl)
587{ 589{
@@ -607,14 +609,13 @@ static inline u8 get_controller_speed(struct controller *ctrl)
607} 609}
608 610
609 611
610/* 612/**
611 * get_adapter_speed - find the max supported frequency/mode of adapter. 613 * get_adapter_speed - find the max supported frequency/mode of adapter.
612 * 614 *
613 * @ctrl: hotplug controller. 615 * @ctrl: hotplug controller.
614 * @hp_slot: hotplug slot where adapter is installed. 616 * @hp_slot: hotplug slot where adapter is installed.
615 * 617 *
616 * Returns adapter speed. 618 * Returns adapter speed.
617 *
618 */ 619 */
619static inline u8 get_adapter_speed(struct controller *ctrl, u8 hp_slot) 620static inline u8 get_adapter_speed(struct controller *ctrl, u8 hp_slot)
620{ 621{
@@ -719,4 +720,3 @@ static inline int wait_for_ctrl_irq(struct controller *ctrl)
719} 720}
720 721
721#endif 722#endif
722