[PATCH] Compaq PCI Hotplug: coding style fixes

The usual coding style fixes, this time for cpqphp_ctrl.c and cpqphp.c.

1 files changed, 25 insertions, 29 deletions

diff --git a/drivers/pci/hotplug/cpqphp.h b/drivers/pci/hotplug/cpqphp.h
index 444d2109024a..19e24ff0f0d2 100644
--- a/drivers/pci/hotplug/cpqphp.h
+++ b/drivers/pci/hotplug/cpqphp.h
@@ -377,11 +377,8 @@ struct resource_lists {
 #define PCISLOT_66_MHZ_SUPPORTED	0x00000100
 #define PCISLOT_64_BIT_SUPPORTED	0x00000200
 
-
-
 #define PCI_TO_PCI_BRIDGE_CLASS		0x00060400
 
-
 #define INTERLOCK_OPEN			0x00000002
 #define ADD_NOT_SUPPORTED		0x00000003
 #define CARD_FUNCTIONING		0x00000005
@@ -453,7 +450,6 @@ extern u8 cpqhp_nic_irq;
 extern u8 cpqhp_disk_irq;
 
 
-
 /* inline functions */
 
 
@@ -496,7 +492,7 @@ static inline struct slot *get_slot (struct hotplug_slot *hotplug_slot, const ch
  * Puts node back in the resource list pointed to by head
  *
  */
-static inline void return_resource (struct pci_resource **head, struct pci_resource *node)
+static inline void return_resource(struct pci_resource **head, struct pci_resource *node)
 {
 	if (!node || !head)
 		return;
@@ -504,7 +500,7 @@ static inline void return_resource (struct pci_resource **head, struct pci_resou
 	*head = node;
 }
 
-static inline void set_SOGO (struct controller *ctrl)
+static inline void set_SOGO(struct controller *ctrl)
 {
 	u16 misc;
 	
@@ -514,7 +510,7 @@ static inline void set_SOGO (struct controller *ctrl)
 }
 
 
-static inline void amber_LED_on (struct controller *ctrl, u8 slot)
+static inline void amber_LED_on(struct controller *ctrl, u8 slot)
 {
 	u32 led_control;
 	
@@ -524,7 +520,7 @@ static inline void amber_LED_on (struct controller *ctrl, u8 slot)
 }
 
 
-static inline void amber_LED_off (struct controller *ctrl, u8 slot)
+static inline void amber_LED_off(struct controller *ctrl, u8 slot)
 {
 	u32 led_control;
 	
@@ -534,7 +530,7 @@ static inline void amber_LED_off (struct controller *ctrl, u8 slot)
 }
 
 
-static inline int read_amber_LED (struct controller *ctrl, u8 slot)
+static inline int read_amber_LED(struct controller *ctrl, u8 slot)
 {
 	u32 led_control;
 
@@ -545,7 +541,7 @@ static inline int read_amber_LED (struct controller *ctrl, u8 slot)
 }
 
 
-static inline void green_LED_on (struct controller *ctrl, u8 slot)
+static inline void green_LED_on(struct controller *ctrl, u8 slot)
 {
 	u32 led_control;
 	
@@ -554,7 +550,7 @@ static inline void green_LED_on (struct controller *ctrl, u8 slot)
 	writel(led_control, ctrl->hpc_reg + LED_CONTROL);
 }
 
-static inline void green_LED_off (struct controller *ctrl, u8 slot)
+static inline void green_LED_off(struct controller *ctrl, u8 slot)
 {
 	u32 led_control;
 	
@@ -564,7 +560,7 @@ static inline void green_LED_off (struct controller *ctrl, u8 slot)
 }
 
 
-static inline void green_LED_blink (struct controller *ctrl, u8 slot)
+static inline void green_LED_blink(struct controller *ctrl, u8 slot)
 {
 	u32 led_control;
 	
@@ -575,7 +571,7 @@ static inline void green_LED_blink (struct controller *ctrl, u8 slot)
 }
 
 
-static inline void slot_disable (struct controller *ctrl, u8 slot)
+static inline void slot_disable(struct controller *ctrl, u8 slot)
 {
 	u8 slot_enable;
 
@@ -585,7 +581,7 @@ static inline void slot_disable (struct controller *ctrl, u8 slot)
 }
 
 
-static inline void slot_enable (struct controller *ctrl, u8 slot)
+static inline void slot_enable(struct controller *ctrl, u8 slot)
 {
 	u8 slot_enable;
 
@@ -595,7 +591,7 @@ static inline void slot_enable (struct controller *ctrl, u8 slot)
 }
 
 
-static inline u8 is_slot_enabled (struct controller *ctrl, u8 slot)
+static inline u8 is_slot_enabled(struct controller *ctrl, u8 slot)
 {
 	u8 slot_enable;
 
@@ -605,7 +601,7 @@ static inline u8 is_slot_enabled (struct controller *ctrl, u8 slot)
 }
 
 
-static inline u8 read_slot_enable (struct controller *ctrl)
+static inline u8 read_slot_enable(struct controller *ctrl)
 {
 	return readb(ctrl->hpc_reg + SLOT_ENABLE);
 }
@@ -619,7 +615,7 @@ static inline u8 read_slot_enable (struct controller *ctrl)
  * Returns controller speed.
  *
  */
-static inline u8 get_controller_speed (struct controller *ctrl)
+static inline u8 get_controller_speed(struct controller *ctrl)
 {
 	u8 curr_freq;
  	u16 misc;
@@ -652,7 +648,7 @@ static inline u8 get_controller_speed (struct controller *ctrl)
  * Returns adapter speed.
  *
  */
-static inline u8 get_adapter_speed (struct controller *ctrl, u8 hp_slot)
+static inline u8 get_adapter_speed(struct controller *ctrl, u8 hp_slot)
 {
 	u32 temp_dword = readl(ctrl->hpc_reg + NON_INT_INPUT);
 	dbg("slot: %d, PCIXCAP: %8x\n", hp_slot, temp_dword);
@@ -669,7 +665,7 @@ static inline u8 get_adapter_speed (struct controller *ctrl, u8 hp_slot)
 	return PCI_SPEED_33MHz;
 }
 
-static inline void enable_slot_power (struct controller *ctrl, u8 slot)
+static inline void enable_slot_power(struct controller *ctrl, u8 slot)
 {
 	u8 slot_power;
 
@@ -678,7 +674,7 @@ static inline void enable_slot_power (struct controller *ctrl, u8 slot)
 	writeb(slot_power, ctrl->hpc_reg + SLOT_POWER);
 }
 
-static inline void disable_slot_power (struct controller *ctrl, u8 slot)
+static inline void disable_slot_power(struct controller *ctrl, u8 slot)
 {
 	u8 slot_power;
 
@@ -688,7 +684,7 @@ static inline void disable_slot_power (struct controller *ctrl, u8 slot)
 }
 
 
-static inline int cpq_get_attention_status (struct controller *ctrl, struct slot *slot)
+static inline int cpq_get_attention_status(struct controller *ctrl, struct slot *slot)
 {
 	u8 hp_slot;
 
@@ -697,11 +693,11 @@ static inline int cpq_get_attention_status (struct controller *ctrl, struct slot
 
 	hp_slot = slot->device - ctrl->slot_device_offset;
 
-	return read_amber_LED (ctrl, hp_slot);
+	return read_amber_LED(ctrl, hp_slot);
 }
 
 
-static inline int get_slot_enabled (struct controller *ctrl, struct slot *slot)
+static inline int get_slot_enabled(struct controller *ctrl, struct slot *slot)
 {
 	u8 hp_slot;
 
@@ -710,11 +706,11 @@ static inline int get_slot_enabled (struct controller *ctrl, struct slot *slot)
 
 	hp_slot = slot->device - ctrl->slot_device_offset;
 
-	return is_slot_enabled (ctrl, hp_slot);
+	return is_slot_enabled(ctrl, hp_slot);
 }
 
 
-static inline int cpq_get_latch_status (struct controller *ctrl, struct slot *slot)
+static inline int cpq_get_latch_status(struct controller *ctrl, struct slot *slot)
 {
 	u32 status;
 	u8 hp_slot;
@@ -732,7 +728,7 @@ static inline int cpq_get_latch_status (struct controller *ctrl, struct slot *sl
 }
 
 
-static inline int get_presence_status (struct controller *ctrl, struct slot *slot)
+static inline int get_presence_status(struct controller *ctrl, struct slot *slot)
 {
 	int presence_save = 0;
 	u8 hp_slot;
@@ -751,13 +747,13 @@ static inline int get_presence_status (struct controller *ctrl, struct slot *slo
 
 #define SLOT_NAME_SIZE 10
 
-static inline void make_slot_name (char *buffer, int buffer_size, struct slot *slot)
+static inline void make_slot_name(char *buffer, int buffer_size, struct slot *slot)
 {
-	snprintf (buffer, buffer_size, "%d", slot->number);
+	snprintf(buffer, buffer_size, "%d", slot->number);
 }
 
 
-static inline int wait_for_ctrl_irq (struct controller *ctrl)
+static inline int wait_for_ctrl_irq(struct controller *ctrl)
 {
         DECLARE_WAITQUEUE(wait, current);
 	int retval = 0;