45 files changed, 517 insertions, 588 deletions
diff --git a/drivers/pci/host/pci-mvebu.c b/drivers/pci/host/pci-mvebu.c
index 7f450322f397..ce23e0f076b6 100644
--- a/drivers/pci/host/pci-mvebu.c
+++ b/drivers/pci/host/pci-mvebu.c
@@ -614,9 +614,9 @@ static inline struct mvebu_pcie *sys_to_pcie(struct pci_sys_data *sys)
        return sys->private_data;
 }
-static struct mvebu_pcie_port *
+static struct mvebu_pcie_port *mvebu_pcie_find_port(struct mvebu_pcie *pcie,
-mvebu_pcie_find_port(struct mvebu_pcie *pcie, struct pci_bus *bus,
+                                                    struct pci_bus *bus,
-                     int devfn)
+                                                    int devfn)
 {
        int i;
@@ -781,10 +781,10 @@ static void mvebu_pcie_add_bus(struct pci_bus *bus)
 }
 static resource_size_t mvebu_pcie_align_resource(struct pci_dev *dev,
-                                                const struct resource *res,
+                                                 const struct resource *res,
-                                                resource_size_t start,
+                                                 resource_size_t start,
-                                                resource_size_t size,
+                                                 resource_size_t size,
-                                                resource_size_t align)
+                                                 resource_size_t align)
 {
        if (dev->bus->number != 0)
                return start;
@@ -834,7 +834,8 @@ static void mvebu_pcie_enable(struct mvebu_pcie *pcie)
 * found, maps it.
 */
 static void __iomem *mvebu_pcie_map_registers(struct platform_device *pdev,
-                      struct device_node *np, struct mvebu_pcie_port *port)
+                                              struct device_node *np,
+                                              struct mvebu_pcie_port *port)
 {
        struct resource regs;
        int ret = 0;
diff --git a/drivers/pci/hotplug/cpci_hotplug.h b/drivers/pci/hotplug/cpci_hotplug.h
index 1356211431d0..6a0ddf757349 100644
--- a/drivers/pci/hotplug/cpci_hotplug.h
+++ b/drivers/pci/hotplug/cpci_hotplug.h
@@ -56,9 +56,9 @@ struct cpci_hp_controller_ops {
        int (*enable_irq) (void);
        int (*disable_irq) (void);
        int (*check_irq) (void *dev_id);
-        int (*hardware_test) (struct slot* slot, u32 value);
+        int (*hardware_test) (struct slot *slot, u32 value);
-        u8  (*get_power) (struct slot* slot);
+        u8  (*get_power) (struct slot *slot);
-        int (*set_power) (struct slot* slot, int value);
+        int (*set_power) (struct slot *slot, int value);
 };
 struct cpci_hp_controller {
@@ -89,13 +89,13 @@ int cpci_hp_stop(void);
 u8 cpci_get_attention_status(struct slot *slot);
 u8 cpci_get_latch_status(struct slot *slot);
 u8 cpci_get_adapter_status(struct slot *slot);
-u16 cpci_get_hs_csr(struct slot * slot);
+u16 cpci_get_hs_csr(struct slot *slot);
 int cpci_set_attention_status(struct slot *slot, int status);
-int cpci_check_and_clear_ins(struct slot * slot);
+int cpci_check_and_clear_ins(struct slot *slot);
-int cpci_check_ext(struct slot * slot);
+int cpci_check_ext(struct slot *slot);
-int cpci_clear_ext(struct slot * slot);
+int cpci_clear_ext(struct slot *slot);
-int cpci_led_on(struct slot * slot);
+int cpci_led_on(struct slot *slot);
-int cpci_led_off(struct slot * slot);
+int cpci_led_off(struct slot *slot);
 int cpci_configure_slot(struct slot *slot);
 int cpci_unconfigure_slot(struct slot *slot);
diff --git a/drivers/pci/hotplug/cpci_hotplug_core.c b/drivers/pci/hotplug/cpci_hotplug_core.c
index 1bd77fdd5b13..e09cf7827d68 100644
--- a/drivers/pci/hotplug/cpci_hotplug_core.c
+++ b/drivers/pci/hotplug/cpci_hotplug_core.c
@@ -65,10 +65,10 @@ static int thread_finished;
 static int enable_slot(struct hotplug_slot *slot);
 static int disable_slot(struct hotplug_slot *slot);
 static int set_attention_status(struct hotplug_slot *slot, u8 value);
-static int get_power_status(struct hotplug_slot *slot, u8 * value);
+static int get_power_status(struct hotplug_slot *slot, u8 *value);
-static int get_attention_status(struct hotplug_slot *slot, u8 * value);
+static int get_attention_status(struct hotplug_slot *slot, u8 *value);
-static int get_adapter_status(struct hotplug_slot *slot, u8 * value);
+static int get_adapter_status(struct hotplug_slot *slot, u8 *value);
-static int get_latch_status(struct hotplug_slot *slot, u8 * value);
+static int get_latch_status(struct hotplug_slot *slot, u8 *value);
 static struct hotplug_slot_ops cpci_hotplug_slot_ops = {
        .enable_slot = enable_slot,
@@ -168,7 +168,7 @@ cpci_get_power_status(struct slot *slot)
 }
 static int
-get_power_status(struct hotplug_slot *hotplug_slot, u8 * value)
+get_power_status(struct hotplug_slot *hotplug_slot, u8 *value)
 {
        struct slot *slot = hotplug_slot->private;
@@ -177,7 +177,7 @@ get_power_status(struct hotplug_slot *hotplug_slot, u8 * value)
 }
 static int
-get_attention_status(struct hotplug_slot *hotplug_slot, u8 * value)
+get_attention_status(struct hotplug_slot *hotplug_slot, u8 *value)
 {
        struct slot *slot = hotplug_slot->private;
@@ -192,14 +192,14 @@ set_attention_status(struct hotplug_slot *hotplug_slot, u8 status)
 }
 static int
-get_adapter_status(struct hotplug_slot *hotplug_slot, u8 * value)
+get_adapter_status(struct hotplug_slot *hotplug_slot, u8 *value)
 {
        *value = hotplug_slot->info->adapter_status;
        return 0;
 }
 static int
-get_latch_status(struct hotplug_slot *hotplug_slot, u8 * value)
+get_latch_status(struct hotplug_slot *hotplug_slot, u8 *value)
 {
        *value = hotplug_slot->info->latch_status;
        return 0;
@@ -362,7 +362,7 @@ static int
 init_slots(int clear_ins)
 {
        struct slot *slot;
-        struct pci_dev* dev;
+        struct pci_dev *dev;
        dbg("%s - enter", __func__);
        down_read(&list_rwsem);
diff --git a/drivers/pci/hotplug/cpci_hotplug_pci.c b/drivers/pci/hotplug/cpci_hotplug_pci.c
index f6ef64c2ccb5..7d48ecae6695 100644
--- a/drivers/pci/hotplug/cpci_hotplug_pci.c
+++ b/drivers/pci/hotplug/cpci_hotplug_pci.c
@@ -46,7 +46,7 @@ extern int cpci_debug;
 #define warn(format, arg...) printk(KERN_WARNING "%s: " format "\n", MY_NAME , ## arg)
-u8 cpci_get_attention_status(struct slot* slot)
+u8 cpci_get_attention_status(struct slot *slot)
 {
        int hs_cap;
        u16 hs_csr;
@@ -66,7 +66,7 @@ u8 cpci_get_attention_status(struct slot* slot)
        return hs_csr & 0x0008 ? 1 : 0;
 }
-int cpci_set_attention_status(struct slot* slot, int status)
+int cpci_set_attention_status(struct slot *slot, int status)
 {
        int hs_cap;
        u16 hs_csr;
@@ -93,7 +93,7 @@ int cpci_set_attention_status(struct slot* slot, int status)
        return 1;
 }
-u16 cpci_get_hs_csr(struct slot* slot)
+u16 cpci_get_hs_csr(struct slot *slot)
 {
        int hs_cap;
        u16 hs_csr;
@@ -111,7 +111,7 @@ u16 cpci_get_hs_csr(struct slot* slot)
        return hs_csr;
 }
-int cpci_check_and_clear_ins(struct slot* slot)
+int cpci_check_and_clear_ins(struct slot *slot)
 {
        int hs_cap;
        u16 hs_csr;
@@ -140,7 +140,7 @@ int cpci_check_and_clear_ins(struct slot* slot)
        return ins;
 }
-int cpci_check_ext(struct slot* slot)
+int cpci_check_ext(struct slot *slot)
 {
        int hs_cap;
        u16 hs_csr;
@@ -161,7 +161,7 @@ int cpci_check_ext(struct slot* slot)
        return ext;
 }
-int cpci_clear_ext(struct slot* slot)
+int cpci_clear_ext(struct slot *slot)
 {
        int hs_cap;
        u16 hs_csr;
@@ -187,7 +187,7 @@ int cpci_clear_ext(struct slot* slot)
        return 0;
 }
-int cpci_led_on(struct slot* slot)
+int cpci_led_on(struct slot *slot)
 {
        int hs_cap;
        u16 hs_csr;
@@ -216,7 +216,7 @@ int cpci_led_on(struct slot* slot)
        return 0;
 }
-int cpci_led_off(struct slot* slot)
+int cpci_led_off(struct slot *slot)
 {
        int hs_cap;
        u16 hs_csr;
@@ -303,7 +303,7 @@ int cpci_configure_slot(struct slot *slot)
        return ret;
 }
-int cpci_unconfigure_slot(struct slot* slot)
+int cpci_unconfigure_slot(struct slot *slot)
 {
        struct pci_dev *dev, *temp;
diff --git a/drivers/pci/hotplug/cpcihp_generic.c b/drivers/pci/hotplug/cpcihp_generic.c
index 7536eef620b0..04fcd7811400 100644
--- a/drivers/pci/hotplug/cpcihp_generic.c
+++ b/drivers/pci/hotplug/cpcihp_generic.c
@@ -78,8 +78,8 @@ static struct cpci_hp_controller generic_hpc;
 static int __init validate_parameters(void)
 {
-        char* str;
+        char *str;
-        char* p;
+        char *p;
        unsigned long tmp;
        if(!bridge) {
@@ -142,8 +142,8 @@ static int query_enum(void)
 static int __init cpcihp_generic_init(void)
 {
        int status;
-        struct resource* r;
+        struct resource *r;
-        struct pci_dev* dev;
+        struct pci_dev *dev;
        info(DRIVER_DESC " version: " DRIVER_VERSION);
        status = validate_parameters();
diff --git a/drivers/pci/hotplug/cpcihp_zt5550.c b/drivers/pci/hotplug/cpcihp_zt5550.c
index e8c4a7ccf578..6757b3ef7e10 100644
--- a/drivers/pci/hotplug/cpcihp_zt5550.c
+++ b/drivers/pci/hotplug/cpcihp_zt5550.c
@@ -295,7 +295,7 @@ static struct pci_driver zt5550_hc_driver = {
 static int __init zt5550_init(void)
 {
-        struct resource* r;
+        struct resource *r;
        int rc;
        info(DRIVER_DESC " version: " DRIVER_VERSION);
diff --git a/drivers/pci/hotplug/cpqphp.h b/drivers/pci/hotplug/cpqphp.h
index 516b87738b6e..0450f405807d 100644
--- a/drivers/pci/hotplug/cpqphp.h
+++ b/drivers/pci/hotplug/cpqphp.h
@@ -255,7 +255,7 @@ struct pci_func {
        struct pci_resource *io_head;
        struct pci_resource *bus_head;
        struct timer_list *p_task_event;
-        struct pci_dev* pci_dev;
+        struct pci_dev *pci_dev;
 };
 struct slot {
@@ -278,7 +278,7 @@ struct slot {
 };
 struct pci_resource {
-        struct pci_resource * next;
+        struct pci_resource *next;
        u32 base;
        u32 length;
 };
diff --git a/drivers/pci/hotplug/cpqphp_core.c b/drivers/pci/hotplug/cpqphp_core.c
index 037e2612c5bd..868e62fc869b 100644
--- a/drivers/pci/hotplug/cpqphp_core.c
+++ b/drivers/pci/hotplug/cpqphp_core.c
@@ -94,7 +94,7 @@ static inline int is_slot66mhz(struct slot *slot)
 *
 * Returns pointer to the head of the SMBIOS tables (or %NULL).
 */
-static void __iomem * detect_SMBIOS_pointer(void __iomem *begin, void __iomem *end)
+static void __iomem *detect_SMBIOS_pointer(void __iomem *begin, void __iomem *end)
 {
        void __iomem *fp;
        void __iomem *endp;
@@ -131,7 +131,7 @@ static void __iomem * detect_SMBIOS_pointer(void __iomem *begin, void __iomem *e
 *
 * For unexpected switch opens
 */
-static int init_SERR(struct controller * ctrl)
+static int init_SERR(struct controller *ctrl)
 {
        u32 tempdword;
        u32 number_of_slots;
@@ -291,7 +291,7 @@ static void release_slot(struct hotplug_slot *hotplug_slot)
        kfree(slot);
 }
-static int ctrl_slot_cleanup (struct controller * ctrl)
+static int ctrl_slot_cleanup (struct controller *ctrl)
 {
        struct slot *old_slot, *next_slot;
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 @@
 #include <linux/kthread.h>
 #include "cpqphp.h"
-static u32 configure_new_device(struct controller* ctrl, struct pci_func *func,
+static u32 configure_new_device(struct controller *ctrl, struct pci_func *func,
                        u8 behind_bridge, struct resource_lists *resources);
-static int configure_new_function(struct controller* ctrl, struct pci_func *func,
+static int configure_new_function(struct controller *ctrl, struct pci_func *func,
                        u8 behind_bridge, struct resource_lists *resources);
 static void interrupt_event_handler(struct controller *ctrl);
@@ -64,7 +64,7 @@ static void long_delay(int delay)
 /* FIXME: The following line needs to be somewhere else... */
 #define WRONG_BUS_FREQUENCY 0x07
-static u8 handle_switch_change(u8 change, struct controller * ctrl)
+static u8 handle_switch_change(u8 change, struct controller *ctrl)
 {
        int hp_slot;
        u8 rc = 0;
@@ -138,7 +138,7 @@ static struct slot *cpqhp_find_slot(struct controller *ctrl, u8 device)
 }
-static u8 handle_presence_change(u16 change, struct controller * ctrl)
+static u8 handle_presence_change(u16 change, struct controller *ctrl)
 {
        int hp_slot;
        u8 rc = 0;
@@ -232,7 +232,7 @@ static u8 handle_presence_change(u16 change, struct controller * ctrl)
 }
-static u8 handle_power_fault(u8 change, struct controller * ctrl)
+static u8 handle_power_fault(u8 change, struct controller *ctrl)
 {
        int hp_slot;
        u8 rc = 0;
@@ -997,7 +997,7 @@ struct pci_func *cpqhp_slot_create(u8 busnumber)
 *
 * Returns %0 if successful, !0 otherwise.
 */
-static int slot_remove(struct pci_func * old_slot)
+static int slot_remove(struct pci_func *old_slot)
 {
        struct pci_func *next;
@@ -1109,7 +1109,7 @@ struct pci_func *cpqhp_slot_find(u8 bus, u8 device, u8 index)
 /* DJZ: I don't think is_bridge will work as is.
 * FIXME */
-static int is_bridge(struct pci_func * func)
+static int is_bridge(struct pci_func *func)
 {
        /* Check the header type */
        if (((func->config_space[0x03] >> 16) & 0xFF) == 0x01)
@@ -1625,7 +1625,7 @@ static u32 board_added(struct pci_func *func, struct controller *ctrl)
 * @replace_flag: whether replacing or adding a new device
 * @ctrl: target controller
 */
-static u32 remove_board(struct pci_func * func, u32 replace_flag, struct controller * ctrl)
+static u32 remove_board(struct pci_func *func, u32 replace_flag, struct controller *ctrl)
 {
        int index;
        u8 skip = 0;
@@ -1742,7 +1742,7 @@ static void pushbutton_helper_thread(unsigned long data)
 /* this is the main worker thread */
-static int event_thread(void* data)
+static int event_thread(void *data)
 {
        struct controller *ctrl;
@@ -1992,7 +1992,7 @@ int cpqhp_process_SI(struct controller *ctrl, struct pci_func *func)
        u16 temp_word;
        u32 tempdword;
        int rc;
-        struct slot* p_slot;
+        struct slot *p_slot;
        int physical_slot = 0;
        tempdword = 0;
@@ -2088,7 +2088,7 @@ int cpqhp_process_SS(struct controller *ctrl, struct pci_func *func)
        u8 replace_flag;
        u32 rc = 0;
        unsigned int devfn;
-        struct slot* p_slot;
+        struct slot *p_slot;
        struct pci_bus *pci_bus = ctrl->pci_bus;
        int physical_slot=0;
@@ -2270,8 +2270,8 @@ int cpqhp_hardware_test(struct controller *ctrl, int test_num)
 *
 * Returns 0 if success.
 */
-static u32 configure_new_device(struct controller * ctrl, struct pci_func * func,
+static u32 configure_new_device(struct controller  *ctrl, struct pci_func  *func,
-                                 u8 behind_bridge, struct resource_lists * resources)
+                                 u8 behind_bridge, struct resource_lists  *resources)
 {
        u8 temp_byte, function, max_functions, stop_it;
        int rc;
diff --git a/drivers/pci/hotplug/cpqphp_nvram.c b/drivers/pci/hotplug/cpqphp_nvram.c
index 9600a392eaae..0968a9bcb345 100644
--- a/drivers/pci/hotplug/cpqphp_nvram.c
+++ b/drivers/pci/hotplug/cpqphp_nvram.c
@@ -107,7 +107,7 @@ static spinlock_t int15_lock;
 */
-static u32 add_byte( u32 **p_buffer, u8 value, u32 *used, u32 *avail)
+static u32 add_byte(u32 **p_buffer, u8 value, u32 *used, u32 *avail)
 {
        u8 **tByte;
@@ -122,7 +122,7 @@ static u32 add_byte( u32 **p_buffer, u8 value, u32 *used, u32 *avail)
 }
-static u32 add_dword( u32 **p_buffer, u32 value, u32 *used, u32 *avail)
+static u32 add_dword(u32 **p_buffer, u32 value, u32 *used, u32 *avail)
 {
        if ((*used + 4) > *avail)
                return(1);
@@ -267,12 +267,12 @@ static u32 store_HRT (void __iomem *rom_start)
        ctrl = cpqhp_ctrl_list;
        /* The revision of this structure */
-        rc = add_byte( &pFill, 1 + ctrl->push_flag, &usedbytes, &available);
+        rc = add_byte(&pFill, 1 + ctrl->push_flag, &usedbytes, &available);
        if (rc)
                return(rc);
        /* The number of controllers */
-        rc = add_byte( &pFill, 1, &usedbytes, &available);
+        rc = add_byte(&pFill, 1, &usedbytes, &available);
        if (rc)
                return(rc);
@@ -282,22 +282,22 @@ static u32 store_HRT (void __iomem *rom_start)
                numCtrl++;
                /* The bus number */
-                rc = add_byte( &pFill, ctrl->bus, &usedbytes, &available);
+                rc = add_byte(&pFill, ctrl->bus, &usedbytes, &available);
                if (rc)
                        return(rc);
                /* The device Number */
-                rc = add_byte( &pFill, PCI_SLOT(ctrl->pci_dev->devfn), &usedbytes, &available);
+                rc = add_byte(&pFill, PCI_SLOT(ctrl->pci_dev->devfn), &usedbytes, &available);
                if (rc)
                        return(rc);
                /* The function Number */
-                rc = add_byte( &pFill, PCI_FUNC(ctrl->pci_dev->devfn), &usedbytes, &available);
+                rc = add_byte(&pFill, PCI_FUNC(ctrl->pci_dev->devfn), &usedbytes, &available);
                if (rc)
                        return(rc);
                /* Skip the number of available entries */
-                rc = add_dword( &pFill, 0, &usedbytes, &available);
+                rc = add_dword(&pFill, 0, &usedbytes, &available);
                if (rc)
                        return(rc);
@@ -311,12 +311,12 @@ static u32 store_HRT (void __iomem *rom_start)
                        loop ++;
                        /* base */
-                        rc = add_dword( &pFill, resNode->base, &usedbytes, &available);
+                        rc = add_dword(&pFill, resNode->base, &usedbytes, &available);
                        if (rc)
                                return(rc);
                        /* length */
-                        rc = add_dword( &pFill, resNode->length, &usedbytes, &available);
+                        rc = add_dword(&pFill, resNode->length, &usedbytes, &available);
                        if (rc)
                                return(rc);
@@ -336,12 +336,12 @@ static u32 store_HRT (void __iomem *rom_start)
                        loop ++;
                        /* base */
-                        rc = add_dword( &pFill, resNode->base, &usedbytes, &available);
+                        rc = add_dword(&pFill, resNode->base, &usedbytes, &available);
                        if (rc)
                                return(rc);
                        /* length */
-                        rc = add_dword( &pFill, resNode->length, &usedbytes, &available);
+                        rc = add_dword(&pFill, resNode->length, &usedbytes, &available);
                        if (rc)
                                return(rc);
@@ -361,12 +361,12 @@ static u32 store_HRT (void __iomem *rom_start)
                        loop ++;
                        /* base */
-                        rc = add_dword( &pFill, resNode->base, &usedbytes, &available);
+                        rc = add_dword(&pFill, resNode->base, &usedbytes, &available);
                        if (rc)
                                return(rc);
                        /* length */
-                        rc = add_dword( &pFill, resNode->length, &usedbytes, &available);
+                        rc = add_dword(&pFill, resNode->length, &usedbytes, &available);
                        if (rc)
                                return(rc);
@@ -386,12 +386,12 @@ static u32 store_HRT (void __iomem *rom_start)
                        loop ++;
                        /* base */
-                        rc = add_dword( &pFill, resNode->base, &usedbytes, &available);
+                        rc = add_dword(&pFill, resNode->base, &usedbytes, &available);
                        if (rc)
                                return(rc);
                        /* length */
-                        rc = add_dword( &pFill, resNode->length, &usedbytes, &available);
+                        rc = add_dword(&pFill, resNode->length, &usedbytes, &available);
                        if (rc)
                                return(rc);
diff --git a/drivers/pci/hotplug/cpqphp_pci.c b/drivers/pci/hotplug/cpqphp_pci.c
index a3e3c2002b58..1c8c2f130d31 100644
--- a/drivers/pci/hotplug/cpqphp_pci.c
+++ b/drivers/pci/hotplug/cpqphp_pci.c
@@ -81,7 +81,7 @@ static void __iomem *detect_HRT_floating_pointer(void __iomem *begin, void __iom
 }
-int cpqhp_configure_device (struct controller* ctrl, struct pci_func* func)
+int cpqhp_configure_device (struct controller *ctrl, struct pci_func *func)
 {
        struct pci_bus *child;
        int num;
@@ -121,7 +121,7 @@ int cpqhp_configure_device (struct controller* ctrl, struct pci_func* func)
 }
-int cpqhp_unconfigure_device(struct pci_func* func)
+int cpqhp_unconfigure_device(struct pci_func *func)
 {
        int j;
@@ -129,7 +129,7 @@ int cpqhp_unconfigure_device(struct pci_func* func)
        pci_lock_rescan_remove();
        for (j=0; j<8 ; j++) {
-                struct pci_dev* temp = pci_get_bus_and_slot(func->bus, PCI_DEVFN(func->device, j));
+                struct pci_dev *temp = pci_get_bus_and_slot(func->bus, PCI_DEVFN(func->device, j));
                if (temp) {
                        pci_dev_put(temp);
                        pci_stop_and_remove_bus_device(temp);
@@ -203,7 +203,7 @@ int cpqhp_set_irq (u8 bus_num, u8 dev_num, u8 int_pin, u8 irq_num)
 }
-static int PCI_ScanBusForNonBridge(struct controller *ctrl, u8 bus_num, u8 * dev_num)
+static int PCI_ScanBusForNonBridge(struct controller *ctrl, u8 bus_num, u8 *dev_num)
 {
        u16 tdevice;
        u32 work;
@@ -280,7 +280,7 @@ static int PCI_GetBusDevHelper(struct controller *ctrl, u8 *bus_num, u8 *dev_num
 }
-int cpqhp_get_bus_dev (struct controller *ctrl, u8 * bus_num, u8 * dev_num, u8 slot)
+int cpqhp_get_bus_dev (struct controller *ctrl, u8 *bus_num, u8 *dev_num, u8 slot)
 {
        /* plain (bridges allowed) */
        return PCI_GetBusDevHelper(ctrl, bus_num, dev_num, slot, 0);
@@ -465,7 +465,7 @@ int cpqhp_save_config(struct controller *ctrl, int busnumber, int is_hot_plug)
 *
 * returns 0 if success
 */
-int cpqhp_save_slot_config (struct controller *ctrl, struct pci_func * new_slot)
+int cpqhp_save_slot_config (struct controller *ctrl, struct pci_func *new_slot)
 {
        long rc;
        u8 class_code;
@@ -549,7 +549,7 @@ int cpqhp_save_slot_config (struct controller *ctrl, struct pci_func * new_slot)
 *
 * returns 0 if success
 */
-int cpqhp_save_base_addr_length(struct controller *ctrl, struct pci_func * func)
+int cpqhp_save_base_addr_length(struct controller *ctrl, struct pci_func *func)
 {
        u8 cloop;
        u8 header_type;
@@ -686,7 +686,7 @@ int cpqhp_save_base_addr_length(struct controller *ctrl, struct pci_func * func)
 *
 * returns 0 if success
 */
-int cpqhp_save_used_resources (struct controller *ctrl, struct pci_func * func)
+int cpqhp_save_used_resources (struct controller *ctrl, struct pci_func *func)
 {
        u8 cloop;
        u8 header_type;
@@ -949,7 +949,7 @@ int cpqhp_save_used_resources (struct controller *ctrl, struct pci_func * func)
 *
 * returns 0 if success
 */
-int cpqhp_configure_board(struct controller *ctrl, struct pci_func * func)
+int cpqhp_configure_board(struct controller *ctrl, struct pci_func *func)
 {
        int cloop;
        u8 header_type;
@@ -1027,7 +1027,7 @@ int cpqhp_configure_board(struct controller *ctrl, struct pci_func * func)
 *
 * returns 0 if the board is the same nonzero otherwise
 */
-int cpqhp_valid_replace(struct controller *ctrl, struct pci_func * func)
+int cpqhp_valid_replace(struct controller *ctrl, struct pci_func *func)
 {
        u8 cloop;
        u8 header_type;
@@ -1419,7 +1419,7 @@ int cpqhp_find_available_resources(struct controller *ctrl, void __iomem *rom_st
 *
 * returns 0 if success
 */
-int cpqhp_return_board_resources(struct pci_func * func, struct resource_lists * resources)
+int cpqhp_return_board_resources(struct pci_func *func, struct resource_lists *resources)
 {
        int rc = 0;
        struct pci_resource *node;
@@ -1475,7 +1475,7 @@ int cpqhp_return_board_resources(struct pci_func * func, struct resource_lists *
 *
 * Puts node back in the resource list pointed to by head
 */
-void cpqhp_destroy_resource_list (struct resource_lists * resources)
+void cpqhp_destroy_resource_list (struct resource_lists *resources)
 {
        struct pci_resource *res, *tres;
@@ -1522,7 +1522,7 @@ void cpqhp_destroy_resource_list (struct resource_lists * resources)
 *
 * Puts node back in the resource list pointed to by head
 */
-void cpqhp_destroy_board_resources (struct pci_func * func)
+void cpqhp_destroy_board_resources (struct pci_func *func)
 {
        struct pci_resource *res, *tres;
diff --git a/drivers/pci/hotplug/cpqphp_sysfs.c b/drivers/pci/hotplug/cpqphp_sysfs.c
index 17c1f36315d1..4a392c44e3d3 100644
--- a/drivers/pci/hotplug/cpqphp_sysfs.c
+++ b/drivers/pci/hotplug/cpqphp_sysfs.c
@@ -79,7 +79,7 @@ static int show_ctrl (struct controller *ctrl, char *buf)
 static int show_dev (struct controller *ctrl, char *buf)
 {
-        char * out = buf;
+        char *out = buf;
        int index;
        struct pci_resource *res;
        struct pci_func *new_slot;
diff --git a/drivers/pci/hotplug/ibmphp_core.c b/drivers/pci/hotplug/ibmphp_core.c
index cf3ac1e4b099..5794057f7ec1 100644
--- a/drivers/pci/hotplug/ibmphp_core.c
+++ b/drivers/pci/hotplug/ibmphp_core.c
@@ -74,7 +74,7 @@ static inline int get_max_adapter_speed (struct hotplug_slot *hs, u8 *value)
 static inline int get_cur_bus_info(struct slot **sl)
 {
        int rc = 1;
-        struct slot * slot_cur = *sl;
+        struct slot *slot_cur = *sl;
        debug("options = %x\n", slot_cur->ctrl->options);
        debug("revision = %x\n", slot_cur->ctrl->revision);
@@ -114,8 +114,8 @@ static inline int slot_update(struct slot **sl)
 static int __init get_max_slots (void)
 {
-        struct slot * slot_cur;
+        struct slot *slot_cur;
-        struct list_head * tmp;
+        struct list_head *tmp;
        u8 slot_count = 0;
        list_for_each(tmp, &ibmphp_slot_head) {
@@ -280,7 +280,7 @@ static int set_attention_status(struct hotplug_slot *hotplug_slot, u8 value)
        return rc;
 }
-static int get_attention_status(struct hotplug_slot *hotplug_slot, u8 * value)
+static int get_attention_status(struct hotplug_slot *hotplug_slot, u8 *value)
 {
        int rc = -ENODEV;
        struct slot *pslot;
@@ -311,7 +311,7 @@ static int get_attention_status(struct hotplug_slot *hotplug_slot, u8 * value)
        return rc;
 }
-static int get_latch_status(struct hotplug_slot *hotplug_slot, u8 * value)
+static int get_latch_status(struct hotplug_slot *hotplug_slot, u8 *value)
 {
        int rc = -ENODEV;
        struct slot *pslot;
@@ -338,7 +338,7 @@ static int get_latch_status(struct hotplug_slot *hotplug_slot, u8 * value)
 }
-static int get_power_status(struct hotplug_slot *hotplug_slot, u8 * value)
+static int get_power_status(struct hotplug_slot *hotplug_slot, u8 *value)
 {
        int rc = -ENODEV;
        struct slot *pslot;
@@ -364,7 +364,7 @@ static int get_power_status(struct hotplug_slot *hotplug_slot, u8 * value)
        return rc;
 }
-static int get_adapter_present(struct hotplug_slot *hotplug_slot, u8 * value)
+static int get_adapter_present(struct hotplug_slot *hotplug_slot, u8 *value)
 {
        int rc = -ENODEV;
        struct slot *pslot;
@@ -433,7 +433,7 @@ static int get_max_bus_speed(struct slot *slot)
 }
 /*
-static int get_max_adapter_speed_1(struct hotplug_slot *hotplug_slot, u8 * value, u8 flag)
+static int get_max_adapter_speed_1(struct hotplug_slot *hotplug_slot, u8 *value, u8 flag)
 {
        int rc = -ENODEV;
        struct slot *pslot;
@@ -471,7 +471,7 @@ static int get_max_adapter_speed_1(struct hotplug_slot *hotplug_slot, u8 * value
        return rc;
 }
-static int get_bus_name(struct hotplug_slot *hotplug_slot, char * value)
+static int get_bus_name(struct hotplug_slot *hotplug_slot, char *value)
 {
        int rc = -ENODEV;
        struct slot *pslot = NULL;
@@ -671,7 +671,7 @@ static struct pci_func *ibm_slot_find(u8 busno, u8 device, u8 function)
 {
        struct pci_func *func_cur;
        struct slot *slot_cur;
-        struct list_head * tmp;
+        struct list_head *tmp;
        list_for_each(tmp, &ibmphp_slot_head) {
                slot_cur = list_entry(tmp, struct slot, ibm_slot_list);
                if (slot_cur->func) {
@@ -696,8 +696,8 @@ static struct pci_func *ibm_slot_find(u8 busno, u8 device, u8 function)
 static void free_slots(void)
 {
        struct slot *slot_cur;
-        struct list_head * tmp;
+        struct list_head *tmp;
-        struct list_head * next;
+        struct list_head *next;
        debug("%s -- enter\n", __func__);
@@ -825,10 +825,10 @@ static int ibm_configure_device(struct pci_func *func)
 /*******************************************************
 * Returns whether the bus is empty or not
 *******************************************************/
-static int is_bus_empty(struct slot * slot_cur)
+static int is_bus_empty(struct slot *slot_cur)
 {
        int rc;
-        struct slot * tmp_slot;
+        struct slot *tmp_slot;
        u8 i = slot_cur->bus_on->slot_min;
        while (i <= slot_cur->bus_on->slot_max) {
@@ -856,7 +856,7 @@ static int is_bus_empty(struct slot * slot_cur)
 * Parameters: slot
 * Returns: bus is set (0) or error code
 ***********************************************************/
-static int set_bus(struct slot * slot_cur)
+static int set_bus(struct slot *slot_cur)
 {
        int rc;
        u8 speed;
@@ -956,7 +956,7 @@ static int set_bus(struct slot * slot_cur)
 static int check_limitations(struct slot *slot_cur)
 {
        u8 i;
-        struct slot * tmp_slot;
+        struct slot *tmp_slot;
        u8 count = 0;
        u8 limitation = 0;
diff --git a/drivers/pci/hotplug/ibmphp_ebda.c b/drivers/pci/hotplug/ibmphp_ebda.c
index bd044158b36c..0f65ac555434 100644
--- a/drivers/pci/hotplug/ibmphp_ebda.c
+++ b/drivers/pci/hotplug/ibmphp_ebda.c
@@ -563,7 +563,7 @@ static int first_slot_num (u8 slot_num, u8 first_slot, u8 var)
        return rc;
 }
-static struct opt_rio_lo * find_rxe_num (u8 slot_num)
+static struct opt_rio_lo *find_rxe_num (u8 slot_num)
 {
        struct opt_rio_lo *opt_lo_ptr;
@@ -575,7 +575,7 @@ static struct opt_rio_lo * find_rxe_num (u8 slot_num)
        return NULL;
 }
-static struct opt_rio * find_chassis_num (u8 slot_num)
+static struct opt_rio *find_chassis_num (u8 slot_num)
 {
        struct opt_rio *opt_vg_ptr;
@@ -593,7 +593,7 @@ static struct opt_rio * find_chassis_num (u8 slot_num)
 static u8 calculate_first_slot (u8 slot_num)
 {
        u8 first_slot = 1;
-        struct slot * slot_cur;
+        struct slot *slot_cur;
        list_for_each_entry(slot_cur, &ibmphp_slot_head, ibm_slot_list) {
                if (slot_cur->ctrl) {
@@ -607,7 +607,7 @@ static u8 calculate_first_slot (u8 slot_num)
 #define SLOT_NAME_SIZE 30
-static char *create_file_name (struct slot * slot_cur)
+static char *create_file_name (struct slot *slot_cur)
 {
        struct opt_rio *opt_vg_ptr = NULL;
        struct opt_rio_lo *opt_lo_ptr = NULL;
@@ -1192,7 +1192,7 @@ int ibmphp_register_pci (void)
        }
        return rc;
 }
-static int ibmphp_probe (struct pci_dev * dev, const struct pci_device_id *ids)
+static int ibmphp_probe (struct pci_dev *dev, const struct pci_device_id *ids)
 {
        struct controller *ctrl;
diff --git a/drivers/pci/hotplug/ibmphp_hpc.c b/drivers/pci/hotplug/ibmphp_hpc.c
index 5fc7a089f532..a936022956e6 100644
--- a/drivers/pci/hotplug/ibmphp_hpc.c
+++ b/drivers/pci/hotplug/ibmphp_hpc.c
@@ -533,7 +533,7 @@ static u8 hpc_readcmdtoindex (u8 cmd, u8 index)
 *
 * Return   0 or error codes
 *---------------------------------------------------------------------*/
-int ibmphp_hpc_readslot (struct slot * pslot, u8 cmd, u8 * pstatus)
+int ibmphp_hpc_readslot (struct slot *pslot, u8 cmd, u8 *pstatus)
 {
        void __iomem *wpg_bbar = NULL;
        struct controller *ctlr_ptr;
@@ -672,7 +672,7 @@ int ibmphp_hpc_readslot (struct slot * pslot, u8 cmd, u8 * pstatus)
 *
 * Action: issue a WRITE command to HPC
 *---------------------------------------------------------------------*/
-int ibmphp_hpc_writeslot (struct slot * pslot, u8 cmd)
+int ibmphp_hpc_writeslot (struct slot *pslot, u8 cmd)
 {
        void __iomem *wpg_bbar = NULL;
        struct controller *ctlr_ptr;
@@ -1102,7 +1102,7 @@ void __exit ibmphp_hpc_stop_poll_thread (void)
 * Value:
 *---------------------------------------------------------------------*/
 static int hpc_wait_ctlr_notworking (int timeout, struct controller *ctlr_ptr, void __iomem *wpg_bbar,
-                                    u8 * pstatus)
+                                    u8 *pstatus)
 {
        int rc = 0;
        u8 done = 0;
diff --git a/drivers/pci/hotplug/ibmphp_pci.c b/drivers/pci/hotplug/ibmphp_pci.c
index 639ea3a75e14..f53b7c5b9a3f 100644
--- a/drivers/pci/hotplug/ibmphp_pci.c
+++ b/drivers/pci/hotplug/ibmphp_pci.c
@@ -47,7 +47,7 @@ static u8 find_sec_number (u8 primary_busno, u8 slotno);
 * We also assign the same irq numbers for multi function devices.
 * These are PIC mode, so shouldn't matter n.e.ways (hopefully)
 */
-static void assign_alt_irq (struct pci_func * cur_func, u8 class_code)
+static void assign_alt_irq (struct pci_func *cur_func, u8 class_code)
 {
        int j;
        for (j = 0; j < 4; j++) {
@@ -1073,7 +1073,7 @@ error:
 * Input: bridge function
 * Output: amount of resources needed
 *****************************************************************************/
-static struct res_needed *scan_behind_bridge (struct pci_func * func, u8 busno)
+static struct res_needed *scan_behind_bridge (struct pci_func *func, u8 busno)
 {
        int count, len[6];
        u16 vendor_id;
diff --git a/drivers/pci/hotplug/ibmphp_res.c b/drivers/pci/hotplug/ibmphp_res.c
index a265acb2d518..f62dfc40f753 100644
--- a/drivers/pci/hotplug/ibmphp_res.c
+++ b/drivers/pci/hotplug/ibmphp_res.c
@@ -46,9 +46,9 @@ static struct bus_node *find_bus_wprev (u8, struct bus_node **, u8);
 static LIST_HEAD(gbuses);
-static struct bus_node * __init alloc_error_bus (struct ebda_pci_rsrc * curr, u8 busno, int flag)
+static struct bus_node * __init alloc_error_bus (struct ebda_pci_rsrc *curr, u8 busno, int flag)
 {
-        struct bus_node * newbus;
+        struct bus_node *newbus;
        if (!(curr) && !(flag)) {
                err ("NULL pointer passed\n");
@@ -69,7 +69,7 @@ static struct bus_node * __init alloc_error_bus (struct ebda_pci_rsrc * curr, u8
        return newbus;
 }
-static struct resource_node * __init alloc_resources (struct ebda_pci_rsrc * curr)
+static struct resource_node * __init alloc_resources (struct ebda_pci_rsrc *curr)
 {
        struct resource_node *rs;
@@ -93,7 +93,7 @@ static struct resource_node * __init alloc_resources (struct ebda_pci_rsrc * cur
 static int __init alloc_bus_range (struct bus_node **new_bus, struct range_node **new_range, struct ebda_pci_rsrc *curr, int flag, u8 first_bus)
 {
-        struct bus_node * newbus;
+        struct bus_node *newbus;
        struct range_node *newrange;
        u8 num_ranges = 0;
@@ -934,9 +934,9 @@ int ibmphp_remove_resource (struct resource_node *res)
        return 0;
 }
-static struct range_node * find_range (struct bus_node *bus_cur, struct resource_node * res)
+static struct range_node *find_range (struct bus_node *bus_cur, struct resource_node *res)
 {
-        struct range_node * range = NULL;
+        struct range_node *range = NULL;
        switch (res->type) {
                case IO:
diff --git a/drivers/pci/hotplug/pci_hotplug_core.c b/drivers/pci/hotplug/pci_hotplug_core.c
index ef496457f8d0..29caef96a21c 100644
--- a/drivers/pci/hotplug/pci_hotplug_core.c
+++ b/drivers/pci/hotplug/pci_hotplug_core.c
@@ -59,14 +59,12 @@ static bool debug;
 #define DRIVER_DESC     "PCI Hot Plug PCI Core"
-//////////////////////////////////////////////////////////////////
 static LIST_HEAD(pci_hotplug_slot_list);
 static DEFINE_MUTEX(pci_hp_mutex);
 /* Weee, fun with macros... */
-#define GET_STATUS(name,type)   \
+#define GET_STATUS(name, type)  \
-static int get_##name (struct hotplug_slot *slot, type *value)          \
+static int get_##name(struct hotplug_slot *slot, type *value)           \
 {                                                                       \
        struct hotplug_slot_ops *ops = slot->ops;                       \
        int retval = 0;                                                 \
@@ -92,42 +90,41 @@ static ssize_t power_read_file(struct pci_slot *slot, char *buf)
        retval = get_power_status(slot->hotplug, &value);
        if (retval)
-                goto exit;
+                return retval;
-        retval = sprintf (buf, "%d\n", value);
-exit:
+        return sprintf(buf, "%d\n", value);
-        return retval;
 }
 static ssize_t power_write_file(struct pci_slot *pci_slot, const char *buf,
-                size_t count)
+                                size_t count)
 {
        struct hotplug_slot *slot = pci_slot->hotplug;
        unsigned long lpower;
        u8 power;
        int retval = 0;
-        lpower = simple_strtoul (buf, NULL, 10);
+        lpower = simple_strtoul(buf, NULL, 10);
        power = (u8)(lpower & 0xff);
-        dbg ("power = %d\n", power);
+        dbg("power = %d\n", power);
        if (!try_module_get(slot->ops->owner)) {
                retval = -ENODEV;
                goto exit;
        }
        switch (power) {
-                case 0:
+        case 0:
-                        if (slot->ops->disable_slot)
+                if (slot->ops->disable_slot)
-                                retval = slot->ops->disable_slot(slot);
+                        retval = slot->ops->disable_slot(slot);
-                        break;
+                break;
-                case 1:
+        case 1:
-                        if (slot->ops->enable_slot)
+                if (slot->ops->enable_slot)
-                                retval = slot->ops->enable_slot(slot);
+                        retval = slot->ops->enable_slot(slot);
-                        break;
+                break;
-                default:
+        default:
-                        err ("Illegal value specified for power\n");
+                err("Illegal value specified for power\n");
-                        retval = -EINVAL;
+                retval = -EINVAL;
        }
        module_put(slot->ops->owner);
@@ -150,24 +147,22 @@ static ssize_t attention_read_file(struct pci_slot *slot, char *buf)
        retval = get_attention_status(slot->hotplug, &value);
        if (retval)
-                goto exit;
+                return retval;
-        retval = sprintf(buf, "%d\n", value);
-exit:
+        return sprintf(buf, "%d\n", value);
-        return retval;
 }
 static ssize_t attention_write_file(struct pci_slot *slot, const char *buf,
-                size_t count)
+                                    size_t count)
 {
        struct hotplug_slot_ops *ops = slot->hotplug->ops;
        unsigned long lattention;
        u8 attention;
        int retval = 0;
-        lattention = simple_strtoul (buf, NULL, 10);
+        lattention = simple_strtoul(buf, NULL, 10);
        attention = (u8)(lattention & 0xff);
-        dbg (" - attention = %d\n", attention);
+        dbg(" - attention = %d\n", attention);
        if (!try_module_get(ops->owner)) {
                retval = -ENODEV;
@@ -196,11 +191,9 @@ static ssize_t latch_read_file(struct pci_slot *slot, char *buf)
        retval = get_latch_status(slot->hotplug, &value);
        if (retval)
-                goto exit;
+                return retval;
-        retval = sprintf (buf, "%d\n", value);
-exit:
+        return sprintf(buf, "%d\n", value);
-        return retval;
 }
 static struct pci_slot_attribute hotplug_slot_attr_latch = {
@@ -215,11 +208,9 @@ static ssize_t presence_read_file(struct pci_slot *slot, char *buf)
        retval = get_adapter_status(slot->hotplug, &value);
        if (retval)
-                goto exit;
+                return retval;
-        retval = sprintf (buf, "%d\n", value);
-exit:
+        return sprintf(buf, "%d\n", value);
-        return retval;
 }
 static struct pci_slot_attribute hotplug_slot_attr_presence = {
@@ -228,7 +219,7 @@ static struct pci_slot_attribute hotplug_slot_attr_presence = {
 };
 static ssize_t test_write_file(struct pci_slot *pci_slot, const char *buf,
-                size_t count)
+                               size_t count)
 {
        struct hotplug_slot *slot = pci_slot->hotplug;
        unsigned long ltest;
@@ -237,7 +228,7 @@ static ssize_t test_write_file(struct pci_slot *pci_slot, const char *buf,
        ltest = simple_strtoul (buf, NULL, 10);
        test = (u32)(ltest & 0xffffffff);
-        dbg ("test = %d\n", test);
+        dbg("test = %d\n", test);
        if (!try_module_get(slot->ops->owner)) {
                retval = -ENODEV;
@@ -261,6 +252,7 @@ static struct pci_slot_attribute hotplug_slot_attr_test = {
 static bool has_power_file(struct pci_slot *pci_slot)
 {
        struct hotplug_slot *slot = pci_slot->hotplug;
        if ((!slot) || (!slot->ops))
                return false;
        if ((slot->ops->enable_slot) ||
@@ -273,6 +265,7 @@ static bool has_power_file(struct pci_slot *pci_slot)
 static bool has_attention_file(struct pci_slot *pci_slot)
 {
        struct hotplug_slot *slot = pci_slot->hotplug;
        if ((!slot) || (!slot->ops))
                return false;
        if ((slot->ops->set_attention_status) ||
@@ -284,6 +277,7 @@ static bool has_attention_file(struct pci_slot *pci_slot)
 static bool has_latch_file(struct pci_slot *pci_slot)
 {
        struct hotplug_slot *slot = pci_slot->hotplug;
        if ((!slot) || (!slot->ops))
                return false;
        if (slot->ops->get_latch_status)
@@ -294,6 +288,7 @@ static bool has_latch_file(struct pci_slot *pci_slot)
 static bool has_adapter_file(struct pci_slot *pci_slot)
 {
        struct hotplug_slot *slot = pci_slot->hotplug;
        if ((!slot) || (!slot->ops))
                return false;
        if (slot->ops->get_adapter_status)
@@ -304,6 +299,7 @@ static bool has_adapter_file(struct pci_slot *pci_slot)
 static bool has_test_file(struct pci_slot *pci_slot)
 {
        struct hotplug_slot *slot = pci_slot->hotplug;
        if ((!slot) || (!slot->ops))
                return false;
        if (slot->ops->hardware_test)
@@ -397,13 +393,13 @@ static void fs_remove_slot(struct pci_slot *slot)
        pci_hp_remove_module_link(slot);
 }
-static struct hotplug_slot *get_slot_from_name (const char *name)
+static struct hotplug_slot *get_slot_from_name(const char *name)
 {
        struct hotplug_slot *slot;
        struct list_head *tmp;
-        list_for_each (tmp, &pci_hotplug_slot_list) {
+        list_for_each(tmp, &pci_hotplug_slot_list) {
-                slot = list_entry (tmp, struct hotplug_slot, slot_list);
+                slot = list_entry(tmp, struct hotplug_slot, slot_list);
                if (strcmp(hotplug_slot_name(slot), name) == 0)
                        return slot;
        }
@@ -531,23 +527,21 @@ int pci_hp_change_slot_info(struct hotplug_slot *hotplug,
 }
 EXPORT_SYMBOL_GPL(pci_hp_change_slot_info);
-static int __init pci_hotplug_init (void)
+static int __init pci_hotplug_init(void)
 {
        int result;
        result = cpci_hotplug_init(debug);
        if (result) {
-                err ("cpci_hotplug_init with error %d\n", result);
+                err("cpci_hotplug_init with error %d\n", result);
-                goto err_cpci;
+                return result;
        }
-        info (DRIVER_DESC " version: " DRIVER_VERSION "\n");
+        info(DRIVER_DESC " version: " DRIVER_VERSION "\n");
-err_cpci:
        return result;
 }
-static void __exit pci_hotplug_exit (void)
+static void __exit pci_hotplug_exit(void)
 {
        cpci_hotplug_exit();
 }
diff --git a/drivers/pci/hotplug/pciehp_acpi.c b/drivers/pci/hotplug/pciehp_acpi.c
index 20fea57d2149..93cc9266e8cb 100644
--- a/drivers/pci/hotplug/pciehp_acpi.c
+++ b/drivers/pci/hotplug/pciehp_acpi.c
@@ -103,10 +103,10 @@ static int __init dummy_probe(struct pcie_device *dev)
 }
 static struct pcie_port_service_driver __initdata dummy_driver = {
-        .name           = "pciehp_dummy",
+        .name           = "pciehp_dummy",
        .port_type      = PCIE_ANY_PORT,
        .service        = PCIE_PORT_SERVICE_HP,
-        .probe          = dummy_probe,
+        .probe          = dummy_probe,
 };
 static int __init select_detection_mode(void)
diff --git a/drivers/pci/hotplug/pciehp_core.c b/drivers/pci/hotplug/pciehp_core.c
index 0e0a2fff20a3..96bb617e4de5 100644
--- a/drivers/pci/hotplug/pciehp_core.c
+++ b/drivers/pci/hotplug/pciehp_core.c
@@ -312,12 +312,12 @@ static void pciehp_remove(struct pcie_device *dev)
 }
 #ifdef CONFIG_PM
-static int pciehp_suspend (struct pcie_device *dev)
+static int pciehp_suspend(struct pcie_device *dev)
 {
        return 0;
 }
-static int pciehp_resume (struct pcie_device *dev)
+static int pciehp_resume(struct pcie_device *dev)
 {
        struct controller *ctrl;
        struct slot *slot;
diff --git a/drivers/pci/hotplug/pciehp_ctrl.c b/drivers/pci/hotplug/pciehp_ctrl.c
index c75e6a678dcc..c57463e1d756 100644
--- a/drivers/pci/hotplug/pciehp_ctrl.c
+++ b/drivers/pci/hotplug/pciehp_ctrl.c
@@ -175,7 +175,7 @@ void pciehp_handle_linkstate_change(struct slot *p_slot)
   hotplug controller logic
 */
-static void set_slot_off(struct controller *ctrl, struct slot * pslot)
+static void set_slot_off(struct controller *ctrl, struct slot *pslot)
 {
        /* turn off slot, turn on Amber LED, turn off Green LED if supported*/
        if (POWER_CTRL(ctrl)) {
diff --git a/drivers/pci/hotplug/pciehp_hpc.c b/drivers/pci/hotplug/pciehp_hpc.c
index 1463412cf7f8..9334fc76b9d1 100644
--- a/drivers/pci/hotplug/pciehp_hpc.c
+++ b/drivers/pci/hotplug/pciehp_hpc.c
@@ -203,7 +203,7 @@ static void pcie_write_cmd(struct controller *ctrl, u16 cmd, u16 mask)
                if (!(slot_ctrl & PCI_EXP_SLTCTL_HPIE) ||
                    !(slot_ctrl & PCI_EXP_SLTCTL_CCIE))
                        poll = 1;
-                pcie_wait_cmd(ctrl, poll);
+                pcie_wait_cmd(ctrl, poll);
        }
        mutex_unlock(&ctrl->ctrl_lock);
 }
@@ -276,15 +276,15 @@ int pciehp_check_link_status(struct controller *ctrl)
        bool found;
        u16 lnk_status;
-        /*
+        /*
-         * Data Link Layer Link Active Reporting must be capable for
+         * Data Link Layer Link Active Reporting must be capable for
-         * hot-plug capable downstream port. But old controller might
+         * hot-plug capable downstream port. But old controller might
-         * not implement it. In this case, we wait for 1000 ms.
+         * not implement it. In this case, we wait for 1000 ms.
-         */
+        */
-        if (ctrl->link_active_reporting)
+        if (ctrl->link_active_reporting)
-                pcie_wait_link_active(ctrl);
+                pcie_wait_link_active(ctrl);
-        else
+        else
-                msleep(1000);
+                msleep(1000);
        /* wait 100ms before read pci conf, and try in 1s */
        msleep(100);
@@ -295,7 +295,7 @@ int pciehp_check_link_status(struct controller *ctrl)
        ctrl_dbg(ctrl, "%s: lnk_status = %x\n", __func__, lnk_status);
        if ((lnk_status & PCI_EXP_LNKSTA_LT) ||
            !(lnk_status & PCI_EXP_LNKSTA_NLW)) {
-                ctrl_err(ctrl, "Link Training Error occurs \n");
+                ctrl_err(ctrl, "Link Training Error occurs\n");
                return -1;
        }
@@ -414,7 +414,7 @@ void pciehp_set_attention_status(struct slot *slot, u8 value)
                return;
        switch (value) {
-        case 0 :        /* turn off */
+        case 0:         /* turn off */
                slot_cmd = PCI_EXP_SLTCTL_ATTN_IND_OFF;
                break;
        case 1:         /* turn on */
@@ -470,7 +470,7 @@ void pciehp_green_led_blink(struct slot *slot)
                 PCI_EXP_SLTCTL_PWR_IND_BLINK);
 }
-int pciehp_power_on_slot(struct slot * slot)
+int pciehp_power_on_slot(struct slot *slot)
 {
        struct controller *ctrl = slot->ctrl;
        struct pci_dev *pdev = ctrl_dev(ctrl);
@@ -496,7 +496,7 @@ int pciehp_power_on_slot(struct slot * slot)
        return retval;
 }
-void pciehp_power_off_slot(struct slot * slot)
+void pciehp_power_off_slot(struct slot *slot)
 {
        struct controller *ctrl = slot->ctrl;
@@ -756,7 +756,7 @@ static inline void dbg_ctrl(struct controller *ctrl)
        ctrl_info(ctrl, "Slot Control           : 0x%04x\n", reg16);
 }
-#define FLAG(x,y)       (((x) & (y)) ? '+' : '-')
+#define FLAG(x, y)      (((x) & (y)) ? '+' : '-')
 struct controller *pcie_init(struct pcie_device *dev)
 {
@@ -783,14 +783,14 @@ struct controller *pcie_init(struct pcie_device *dev)
         */
        if (NO_CMD_CMPL(ctrl) ||
            !(POWER_CTRL(ctrl) | ATTN_LED(ctrl) | PWR_LED(ctrl) | EMI(ctrl)))
-            ctrl->no_cmd_complete = 1;
+                ctrl->no_cmd_complete = 1;
-        /* Check if Data Link Layer Link Active Reporting is implemented */
+        /* Check if Data Link Layer Link Active Reporting is implemented */
-        pcie_capability_read_dword(pdev, PCI_EXP_LNKCAP, &link_cap);
+        pcie_capability_read_dword(pdev, PCI_EXP_LNKCAP, &link_cap);
-        if (link_cap & PCI_EXP_LNKCAP_DLLLARC) {
+        if (link_cap & PCI_EXP_LNKCAP_DLLLARC) {
-                ctrl_dbg(ctrl, "Link Active Reporting supported\n");
+                ctrl_dbg(ctrl, "Link Active Reporting supported\n");
-                ctrl->link_active_reporting = 1;
+                ctrl->link_active_reporting = 1;
-        }
+        }
        /* Clear all remaining event bits in Slot Status register */
        pcie_capability_write_word(pdev, PCI_EXP_SLTSTA,
diff --git a/drivers/pci/hotplug/pcihp_skeleton.c b/drivers/pci/hotplug/pcihp_skeleton.c
index ac69094e4b20..d062c008fc95 100644
--- a/drivers/pci/hotplug/pcihp_skeleton.c
+++ b/drivers/pci/hotplug/pcihp_skeleton.c
@@ -51,7 +51,7 @@ static LIST_HEAD(slot_list);
 #define dbg(format, arg...)                                     \
        do {                                                    \
                if (debug)                                      \
-                        printk (KERN_DEBUG "%s: " format "\n",  \
+                        printk(KERN_DEBUG "%s: " format "\n",   \
                                MY_NAME , ## arg);              \
        } while (0)
 #define err(format, arg...) printk(KERN_ERR "%s: " format "\n", MY_NAME , ## arg)
@@ -128,18 +128,18 @@ static int set_attention_status(struct hotplug_slot *hotplug_slot, u8 status)
        dbg("%s - physical_slot = %s\n", __func__, hotplug_slot->name);
        switch (status) {
-                case 0:
+        case 0:
-                        /*
+                /*
-                         * Fill in code here to turn light off
+                 * Fill in code here to turn light off
-                         */
+                 */
-                        break;
+                break;
-                case 1:
+        case 1:
-                default:
+        default:
-                        /*
+                /*
-                         * Fill in code here to turn light on
+                 * Fill in code here to turn light on
-                         */
+                 */
-                        break;
+                break;
        }
        return retval;
@@ -153,12 +153,12 @@ static int hardware_test(struct hotplug_slot *hotplug_slot, u32 value)
        dbg("%s - physical_slot = %s\n", __func__, hotplug_slot->name);
        switch (value) {
-                case 0:
+        case 0:
-                        /* Specify a test here */
+                /* Specify a test here */
-                        break;
+                break;
-                case 1:
+        case 1:
-                        /* Specify another test here */
+                /* Specify another test here */
-                        break;
+                break;
        }
        return retval;
diff --git a/drivers/pci/hotplug/rpaphp_core.c b/drivers/pci/hotplug/rpaphp_core.c
index f2abfc6ec7c8..93aa29f6d39c 100644
--- a/drivers/pci/hotplug/rpaphp_core.c
+++ b/drivers/pci/hotplug/rpaphp_core.c
@@ -89,7 +89,7 @@ static int set_attention_status(struct hotplug_slot *hotplug_slot, u8 value)
 * @hotplug_slot: slot to get status
 * @value: pointer to store status
 */
-static int get_power_status(struct hotplug_slot *hotplug_slot, u8 * value)
+static int get_power_status(struct hotplug_slot *hotplug_slot, u8 *value)
 {
        int retval, level;
        struct slot *slot = (struct slot *)hotplug_slot->private;
@@ -105,14 +105,14 @@ static int get_power_status(struct hotplug_slot *hotplug_slot, u8 * value)
 * @hotplug_slot: slot to get status
 * @value: pointer to store status
 */
-static int get_attention_status(struct hotplug_slot *hotplug_slot, u8 * value)
+static int get_attention_status(struct hotplug_slot *hotplug_slot, u8 *value)
 {
        struct slot *slot = (struct slot *)hotplug_slot->private;
        *value = slot->hotplug_slot->info->attention_status;
        return 0;
 }
-static int get_adapter_status(struct hotplug_slot *hotplug_slot, u8 * value)
+static int get_adapter_status(struct hotplug_slot *hotplug_slot, u8 *value)
 {
        struct slot *slot = (struct slot *)hotplug_slot->private;
        int rc, state;
diff --git a/drivers/pci/hotplug/sgi_hotplug.c b/drivers/pci/hotplug/sgi_hotplug.c
index 613043f7576f..0f4c36033ade 100644
--- a/drivers/pci/hotplug/sgi_hotplug.c
+++ b/drivers/pci/hotplug/sgi_hotplug.c
@@ -188,7 +188,7 @@ static int sn_hp_slot_private_alloc(struct hotplug_slot *bss_hotplug_slot,
        return 0;
 }
-static struct hotplug_slot * sn_hp_destroy(void)
+static struct hotplug_slot *sn_hp_destroy(void)
 {
        struct slot *slot;
        struct pci_slot *pci_slot;
diff --git a/drivers/pci/hotplug/shpchp.h b/drivers/pci/hotplug/shpchp.h
index 61529097464d..5897d516427b 100644
--- a/drivers/pci/hotplug/shpchp.h
+++ b/drivers/pci/hotplug/shpchp.h
@@ -180,7 +180,7 @@ int shpchp_configure_device(struct slot *p_slot);
 int shpchp_unconfigure_device(struct slot *p_slot);
 void cleanup_slots(struct controller *ctrl);
 void shpchp_queue_pushbutton_work(struct work_struct *work);
-int shpc_init( struct controller *ctrl, struct pci_dev *pdev);
+int shpc_init(struct controller *ctrl, struct pci_dev *pdev);
 static inline const char *slot_name(struct slot *slot)
 {
@@ -295,7 +295,7 @@ static inline void amd_pogo_errata_restore_misc_reg(struct slot *p_slot)
                pci_write_config_dword(p_slot->ctrl->pci_dev, PCIX_MEM_BASE_LIMIT_OFFSET, rse_set);
        }
        /* restore MiscII register */
-        pci_read_config_dword( p_slot->ctrl->pci_dev, PCIX_MISCII_OFFSET, &pcix_misc2_temp );
+        pci_read_config_dword(p_slot->ctrl->pci_dev, PCIX_MISCII_OFFSET, &pcix_misc2_temp );
        if (p_slot->ctrl->pcix_misc2_reg & SERRFATALENABLE_MASK)
                pcix_misc2_temp |= SERRFATALENABLE_MASK;
diff --git a/drivers/pci/hotplug/shpchp_ctrl.c b/drivers/pci/hotplug/shpchp_ctrl.c
index 58499277903a..90cd75c1a3a7 100644
--- a/drivers/pci/hotplug/shpchp_ctrl.c
+++ b/drivers/pci/hotplug/shpchp_ctrl.c
@@ -162,7 +162,7 @@ u8 shpchp_handle_power_fault(u8 hp_slot, struct controller *ctrl)
        p_slot = shpchp_find_slot(ctrl, hp_slot + ctrl->slot_device_offset);
-        if ( !(p_slot->hpc_ops->query_power_fault(p_slot))) {
+        if (!(p_slot->hpc_ops->query_power_fault(p_slot))) {
                /*
                 * Power fault Cleared
                 */
diff --git a/drivers/pci/hotplug/shpchp_hpc.c b/drivers/pci/hotplug/shpchp_hpc.c
index 2d7f474ca0ec..12aa9e2b78aa 100644
--- a/drivers/pci/hotplug/shpchp_hpc.c
+++ b/drivers/pci/hotplug/shpchp_hpc.c
@@ -404,7 +404,7 @@ static int hpc_get_attention_status(struct slot *slot, u8 *status)
        return 0;
 }
-static int hpc_get_power_status(struct slot * slot, u8 *status)
+static int hpc_get_power_status(struct slot *slot, u8 *status)
 {
        struct controller *ctrl = slot->ctrl;
        u32 slot_reg = shpc_readl(ctrl, SLOT_REG(slot->hp_slot));
@@ -528,7 +528,7 @@ static int hpc_get_mode1_ECC_cap(struct slot *slot, u8 *mode)
        return retval;
 }
-static int hpc_query_power_fault(struct slot * slot)
+static int hpc_query_power_fault(struct slot *slot)
 {
        struct controller *ctrl = slot->ctrl;
        u32 slot_reg = shpc_readl(ctrl, SLOT_REG(slot->hp_slot));
@@ -614,7 +614,7 @@ static void hpc_release_ctlr(struct controller *ctrl)
        release_mem_region(ctrl->mmio_base, ctrl->mmio_size);
 }
-static int hpc_power_on_slot(struct slot * slot)
+static int hpc_power_on_slot(struct slot *slot)
 {
        int retval;
@@ -625,7 +625,7 @@ static int hpc_power_on_slot(struct slot * slot)
        return retval;
 }
-static int hpc_slot_enable(struct slot * slot)
+static int hpc_slot_enable(struct slot *slot)
 {
        int retval;
@@ -638,7 +638,7 @@ static int hpc_slot_enable(struct slot * slot)
        return retval;
 }
-static int hpc_slot_disable(struct slot * slot)
+static int hpc_slot_disable(struct slot *slot)
 {
        int retval;
@@ -720,7 +720,7 @@ static int shpc_get_cur_bus_speed(struct controller *ctrl)
 }
-static int hpc_set_bus_speed_mode(struct slot * slot, enum pci_bus_speed value)
+static int hpc_set_bus_speed_mode(struct slot *slot, enum pci_bus_speed value)
 {
        int retval;
        struct controller *ctrl = slot->ctrl;
diff --git a/drivers/pci/hotplug/shpchp_sysfs.c b/drivers/pci/hotplug/shpchp_sysfs.c
index e8c31fe20566..52875b360463 100644
--- a/drivers/pci/hotplug/shpchp_sysfs.c
+++ b/drivers/pci/hotplug/shpchp_sysfs.c
@@ -38,7 +38,7 @@
 static ssize_t show_ctrl (struct device *dev, struct device_attribute *attr, char *buf)
 {
        struct pci_dev *pdev;
-        char * out = buf;
+        char *out = buf;
        int index, busnr;
        struct resource *res;
        struct pci_bus *bus;
diff --git a/drivers/pci/htirq.c b/drivers/pci/htirq.c
index 847912c5f4a3..5d50b54bb51c 100644
--- a/drivers/pci/htirq.c
+++ b/drivers/pci/htirq.c
@@ -105,7 +105,7 @@ int __ht_create_irq(struct pci_dev *dev, int idx, ht_irq_update_t *update)
        spin_unlock_irqrestore(&ht_irq_lock, flags);
        max_irq = (data >> 16) & 0xff;
-        if ( idx > max_irq)
+        if (idx > max_irq)
                return -EINVAL;
        cfg = kmalloc(sizeof(*cfg), GFP_KERNEL);
diff --git a/drivers/pci/pci-driver.c b/drivers/pci/pci-driver.c
index b91a17fe425b..3f8e3dbcaa7c 100644
--- a/drivers/pci/pci-driver.c
+++ b/drivers/pci/pci-driver.c
@@ -99,15 +99,15 @@ static void pci_free_dynids(struct pci_driver *drv)
 *
 * Allow PCI IDs to be added to an existing driver via sysfs.
 */
-static ssize_t
+static ssize_t store_new_id(struct device_driver *driver, const char *buf,
-store_new_id(struct device_driver *driver, const char *buf, size_t count)
+                            size_t count)
 {
        struct pci_driver *pdrv = to_pci_driver(driver);
        const struct pci_device_id *ids = pdrv->id_table;
-        __u32 vendor, device, subvendor=PCI_ANY_ID,
+        __u32 vendor, device, subvendor = PCI_ANY_ID,
-                subdevice=PCI_ANY_ID, class=0, class_mask=0;
+                subdevice = PCI_ANY_ID, class = 0, class_mask = 0;
-        unsigned long driver_data=0;
+        unsigned long driver_data = 0;
-        int fields=0;
+        int fields = 0;
        int retval = 0;
        fields = sscanf(buf, "%x %x %x %x %x %x %lx",
@@ -167,8 +167,8 @@ static DRIVER_ATTR(new_id, S_IWUSR, NULL, store_new_id);
 *
 * Removes a dynamic pci device ID to this driver.
 */
-static ssize_t
+static ssize_t store_remove_id(struct device_driver *driver, const char *buf,
-store_remove_id(struct device_driver *driver, const char *buf, size_t count)
+                               size_t count)
 {
        struct pci_dynid *dynid, *n;
        struct pci_driver *pdrv = to_pci_driver(driver);
@@ -374,8 +374,7 @@ static int pci_call_probe(struct pci_driver *drv, struct pci_dev *dev,
 * returns 0 on success, else error.
 * side-effect: pci_dev->driver is set to drv when drv claims pci_dev.
 */
-static int
+static int __pci_device_probe(struct pci_driver *drv, struct pci_dev *pci_dev)
-__pci_device_probe(struct pci_driver *drv, struct pci_dev *pci_dev)
 {
        const struct pci_device_id *id;
        int error = 0;
@@ -392,7 +391,7 @@ __pci_device_probe(struct pci_driver *drv, struct pci_dev *pci_dev)
        return error;
 }
-static int pci_device_probe(struct device * dev)
+static int pci_device_probe(struct device *dev)
 {
        int error = 0;
        struct pci_driver *drv;
@@ -408,10 +407,10 @@ static int pci_device_probe(struct device * dev)
        return error;
 }
-static int pci_device_remove(struct device * dev)
+static int pci_device_remove(struct device *dev)
 {
-        struct pci_dev * pci_dev = to_pci_dev(dev);
+        struct pci_dev *pci_dev = to_pci_dev(dev);
-        struct pci_driver * drv = pci_dev->driver;
+        struct pci_driver *drv = pci_dev->driver;
        if (drv) {
                if (drv->remove) {
@@ -539,8 +538,8 @@ static int pci_pm_reenable_device(struct pci_dev *pci_dev)
 static int pci_legacy_suspend(struct device *dev, pm_message_t state)
 {
-        struct pci_dev * pci_dev = to_pci_dev(dev);
+        struct pci_dev *pci_dev = to_pci_dev(dev);
-        struct pci_driver * drv = pci_dev->driver;
+        struct pci_driver *drv = pci_dev->driver;
        if (drv && drv->suspend) {
                pci_power_t prev = pci_dev->current_state;
@@ -566,8 +565,8 @@ static int pci_legacy_suspend(struct device *dev, pm_message_t state)
 static int pci_legacy_suspend_late(struct device *dev, pm_message_t state)
 {
-        struct pci_dev * pci_dev = to_pci_dev(dev);
+        struct pci_dev *pci_dev = to_pci_dev(dev);
-        struct pci_driver * drv = pci_dev->driver;
+        struct pci_driver *drv = pci_dev->driver;
        if (drv && drv->suspend_late) {
                pci_power_t prev = pci_dev->current_state;
@@ -597,8 +596,8 @@ static int pci_legacy_suspend_late(struct device *dev, pm_message_t state)
 static int pci_legacy_resume_early(struct device *dev)
 {
-        struct pci_dev * pci_dev = to_pci_dev(dev);
+        struct pci_dev *pci_dev = to_pci_dev(dev);
-        struct pci_driver * drv = pci_dev->driver;
+        struct pci_driver *drv = pci_dev->driver;
        return drv && drv->resume_early ?
                        drv->resume_early(pci_dev) : 0;
@@ -606,8 +605,8 @@ static int pci_legacy_resume_early(struct device *dev)
 static int pci_legacy_resume(struct device *dev)
 {
-        struct pci_dev * pci_dev = to_pci_dev(dev);
+        struct pci_dev *pci_dev = to_pci_dev(dev);
-        struct pci_driver * drv = pci_dev->driver;
+        struct pci_driver *drv = pci_dev->driver;
        pci_fixup_device(pci_fixup_resume, pci_dev);
@@ -1269,8 +1268,7 @@ EXPORT_SYMBOL(__pci_register_driver);
 * driverless.
 */
-void
+void pci_unregister_driver(struct pci_driver *drv)
-pci_unregister_driver(struct pci_driver *drv)
 {
        driver_unregister(&drv->driver);
        pci_free_dynids(drv);
@@ -1288,14 +1286,13 @@ static struct pci_driver pci_compat_driver = {
 * Returns the appropriate pci_driver structure or %NULL if there is no
 * registered driver for the device.
 */
-struct pci_driver *
+struct pci_driver *pci_dev_driver(const struct pci_dev *dev)
-pci_dev_driver(const struct pci_dev *dev)
 {
        if (dev->driver)
                return dev->driver;
        else {
                int i;
-                for(i=0; i<=PCI_ROM_RESOURCE; i++)
+                for (i = 0; i <= PCI_ROM_RESOURCE; i++)
                        if (dev->resource[i].flags & IORESOURCE_BUSY)
                                return &pci_compat_driver;
        }
diff --git a/drivers/pci/pci-label.c b/drivers/pci/pci-label.c
index 45113daaa778..a3fbe2012ea3 100644
--- a/drivers/pci/pci-label.c
+++ b/drivers/pci/pci-label.c
@@ -40,9 +40,8 @@ enum smbios_attr_enum {
        SMBIOS_ATTR_INSTANCE_SHOW,
 };
-static size_t
+static size_t find_smbios_instance_string(struct pci_dev *pdev, char *buf,
-find_smbios_instance_string(struct pci_dev *pdev, char *buf,
+                                          enum smbios_attr_enum attribute)
-                            enum smbios_attr_enum attribute)
 {
        const struct dmi_device *dmi;
        struct dmi_dev_onboard *donboard;
@@ -74,9 +73,8 @@ find_smbios_instance_string(struct pci_dev *pdev, char *buf,
        return 0;
 }
-static umode_t
+static umode_t smbios_instance_string_exist(struct kobject *kobj,
-smbios_instance_string_exist(struct kobject *kobj, struct attribute *attr,
+                                            struct attribute *attr, int n)
-                             int n)
 {
        struct device *dev;
        struct pci_dev *pdev;
@@ -88,8 +86,8 @@ smbios_instance_string_exist(struct kobject *kobj, struct attribute *attr,
                                           S_IRUGO : 0;
 }
-static ssize_t
+static ssize_t smbioslabel_show(struct device *dev,
-smbioslabel_show(struct device *dev, struct device_attribute *attr, char *buf)
+                                struct device_attribute *attr, char *buf)
 {
        struct pci_dev *pdev;
        pdev = to_pci_dev(dev);
@@ -98,9 +96,8 @@ smbioslabel_show(struct device *dev, struct device_attribute *attr, char *buf)
                                           SMBIOS_ATTR_LABEL_SHOW);
 }
-static ssize_t
+static ssize_t smbiosinstance_show(struct device *dev,
-smbiosinstance_show(struct device *dev,
+                                   struct device_attribute *attr, char *buf)
-                    struct device_attribute *attr, char *buf)
 {
        struct pci_dev *pdev;
        pdev = to_pci_dev(dev);
@@ -130,26 +127,22 @@ static struct attribute_group smbios_attr_group = {
        .is_visible = smbios_instance_string_exist,
 };
-static int
+static int pci_create_smbiosname_file(struct pci_dev *pdev)
-pci_create_smbiosname_file(struct pci_dev *pdev)
 {
        return sysfs_create_group(&pdev->dev.kobj, &smbios_attr_group);
 }
-static void
+static void pci_remove_smbiosname_file(struct pci_dev *pdev)
-pci_remove_smbiosname_file(struct pci_dev *pdev)
 {
        sysfs_remove_group(&pdev->dev.kobj, &smbios_attr_group);
 }
 #else
-static inline int
+static inline int pci_create_smbiosname_file(struct pci_dev *pdev)
-pci_create_smbiosname_file(struct pci_dev *pdev)
 {
        return -1;
 }
-static inline void
+static inline void pci_remove_smbiosname_file(struct pci_dev *pdev)
-pci_remove_smbiosname_file(struct pci_dev *pdev)
 {
 }
 #endif
@@ -175,8 +168,8 @@ static void dsm_label_utf16s_to_utf8s(union acpi_object *obj, char *buf)
        buf[len] = '\n';
 }
-static int
+static int dsm_get_label(struct device *dev, char *buf,
-dsm_get_label(struct device *dev, char *buf, enum acpi_attr_enum attr)
+                         enum acpi_attr_enum attr)
 {
        acpi_handle handle;
        union acpi_object *obj, *tmp;
@@ -212,8 +205,7 @@ dsm_get_label(struct device *dev, char *buf, enum acpi_attr_enum attr)
        return len;
 }
-static bool
+static bool device_has_dsm(struct device *dev)
-device_has_dsm(struct device *dev)
 {
        acpi_handle handle;
@@ -225,8 +217,8 @@ device_has_dsm(struct device *dev)
                                1 << DEVICE_LABEL_DSM);
 }
-static umode_t
+static umode_t acpi_index_string_exist(struct kobject *kobj,
-acpi_index_string_exist(struct kobject *kobj, struct attribute *attr, int n)
+                                       struct attribute *attr, int n)
 {
        struct device *dev;
@@ -238,14 +230,14 @@ acpi_index_string_exist(struct kobject *kobj, struct attribute *attr, int n)
        return 0;
 }
-static ssize_t
+static ssize_t acpilabel_show(struct device *dev,
-acpilabel_show(struct device *dev, struct device_attribute *attr, char *buf)
+                              struct device_attribute *attr, char *buf)
 {
        return dsm_get_label(dev, buf, ACPI_ATTR_LABEL_SHOW);
 }
-static ssize_t
+static ssize_t acpiindex_show(struct device *dev,
-acpiindex_show(struct device *dev, struct device_attribute *attr, char *buf)
+                              struct device_attribute *attr, char *buf)
 {
        return dsm_get_label(dev, buf, ACPI_ATTR_INDEX_SHOW);
 }
@@ -271,33 +263,28 @@ static struct attribute_group acpi_attr_group = {
        .is_visible = acpi_index_string_exist,
 };
-static int
+static int pci_create_acpi_index_label_files(struct pci_dev *pdev)
-pci_create_acpi_index_label_files(struct pci_dev *pdev)
 {
        return sysfs_create_group(&pdev->dev.kobj, &acpi_attr_group);
 }
-static int
+static int pci_remove_acpi_index_label_files(struct pci_dev *pdev)
-pci_remove_acpi_index_label_files(struct pci_dev *pdev)
 {
        sysfs_remove_group(&pdev->dev.kobj, &acpi_attr_group);
        return 0;
 }
 #else
-static inline int
+static inline int pci_create_acpi_index_label_files(struct pci_dev *pdev)
-pci_create_acpi_index_label_files(struct pci_dev *pdev)
 {
        return -1;
 }
-static inline int
+static inline int pci_remove_acpi_index_label_files(struct pci_dev *pdev)
-pci_remove_acpi_index_label_files(struct pci_dev *pdev)
 {
        return -1;
 }
-static inline bool
+static inline bool device_has_dsm(struct device *dev)
-device_has_dsm(struct device *dev)
 {
        return false;
 }
diff --git a/drivers/pci/pci-stub.c b/drivers/pci/pci-stub.c
index 2ff77509d8e5..886fb3570278 100644
--- a/drivers/pci/pci-stub.c
+++ b/drivers/pci/pci-stub.c
@@ -55,7 +55,7 @@ static int __init pci_stub_init(void)
        p = ids;
        while ((id = strsep(&p, ","))) {
                unsigned int vendor, device, subvendor = PCI_ANY_ID,
-                        subdevice = PCI_ANY_ID, class=0, class_mask=0;
+                        subdevice = PCI_ANY_ID, class = 0, class_mask = 0;
                int fields;
                if (!strlen(id))
diff --git a/drivers/pci/pci-sysfs.c b/drivers/pci/pci-sysfs.c
index 84c350994b06..41d8d0307347 100644
--- a/drivers/pci/pci-sysfs.c
+++ b/drivers/pci/pci-sysfs.c
@@ -41,8 +41,8 @@ field##_show(struct device *dev, struct device_attribute *attr, char *buf)				\
 {                                                                       \
        struct pci_dev *pdev;                                           \
                                                                        \
-        pdev = to_pci_dev (dev);                                        \
+        pdev = to_pci_dev(dev);                                         \
-        return sprintf (buf, format_string, pdev->field);               \
+        return sprintf(buf, format_string, pdev->field);                \
 }                                                                       \
 static DEVICE_ATTR_RO(field)
@@ -58,7 +58,7 @@ static ssize_t broken_parity_status_show(struct device *dev,
                                         char *buf)
 {
        struct pci_dev *pdev = to_pci_dev(dev);
-        return sprintf (buf, "%u\n", pdev->broken_parity_status);
+        return sprintf(buf, "%u\n", pdev->broken_parity_status);
 }
 static ssize_t broken_parity_status_store(struct device *dev,
@@ -77,10 +77,8 @@ static ssize_t broken_parity_status_store(struct device *dev,
 }
 static DEVICE_ATTR_RW(broken_parity_status);
-static ssize_t pci_dev_show_local_cpu(struct device *dev,
+static ssize_t pci_dev_show_local_cpu(struct device *dev, int type,
-                int type,
+                                      struct device_attribute *attr, char *buf)
-                struct device_attribute *attr,
-                char *buf)
 {
        const struct cpumask *mask;
        int len;
@@ -101,14 +99,14 @@ static ssize_t pci_dev_show_local_cpu(struct device *dev,
 }
 static ssize_t local_cpus_show(struct device *dev,
-                        struct device_attribute *attr, char *buf)
+                               struct device_attribute *attr, char *buf)
 {
        return pci_dev_show_local_cpu(dev, 1, attr, buf);
 }
 static DEVICE_ATTR_RO(local_cpus);
 static ssize_t local_cpulist_show(struct device *dev,
-                        struct device_attribute *attr, char *buf)
+                                  struct device_attribute *attr, char *buf)
 {
        return pci_dev_show_local_cpu(dev, 0, attr, buf);
 }
@@ -117,8 +115,7 @@ static DEVICE_ATTR_RO(local_cpulist);
 /*
 * PCI Bus Class Devices
 */
-static ssize_t pci_bus_show_cpuaffinity(struct device *dev,
+static ssize_t pci_bus_show_cpuaffinity(struct device *dev, int type,
-                                        int type,
                                        struct device_attribute *attr,
                                        char *buf)
 {
@@ -149,11 +146,11 @@ static ssize_t cpulistaffinity_show(struct device *dev,
 static DEVICE_ATTR_RO(cpulistaffinity);
 /* show resources */
-static ssize_t
+static ssize_t resource_show(struct device *dev, struct device_attribute *attr,
-resource_show(struct device * dev, struct device_attribute *attr, char * buf)
+                             char *buf)
 {
-        struct pci_dev * pci_dev = to_pci_dev(dev);
+        struct pci_dev *pci_dev = to_pci_dev(dev);
-        char * str = buf;
+        char *str = buf;
        int i;
        int max;
        resource_size_t start, end;
@@ -166,7 +163,7 @@ resource_show(struct device * dev, struct device_attribute *attr, char * buf)
        for (i = 0; i < max; i++) {
                struct resource *res =  &pci_dev->resource[i];
                pci_resource_to_user(pci_dev, i, res, &start, &end);
-                str += sprintf(str,"0x%016llx 0x%016llx 0x%016llx\n",
+                str += sprintf(str, "0x%016llx 0x%016llx 0x%016llx\n",
                               (unsigned long long)start,
                               (unsigned long long)end,
                               (unsigned long long)res->flags);
@@ -175,7 +172,8 @@ resource_show(struct device * dev, struct device_attribute *attr, char * buf)
 }
 static DEVICE_ATTR_RO(resource);
-static ssize_t modalias_show(struct device *dev, struct device_attribute *attr, char *buf)
+static ssize_t modalias_show(struct device *dev, struct device_attribute *attr,
+                             char *buf)
 {
        struct pci_dev *pci_dev = to_pci_dev(dev);
@@ -187,9 +185,8 @@ static ssize_t modalias_show(struct device *dev, struct device_attribute *attr,
 }
 static DEVICE_ATTR_RO(modalias);
-static ssize_t enabled_store(struct device *dev,
+static ssize_t enabled_store(struct device *dev, struct device_attribute *attr,
-                             struct device_attribute *attr, const char *buf,
+                             const char *buf, size_t count)
-                             size_t count)
 {
        struct pci_dev *pdev = to_pci_dev(dev);
        unsigned long val;
@@ -213,57 +210,56 @@ static ssize_t enabled_store(struct device *dev,
        return result < 0 ? result : count;
 }
-static ssize_t enabled_show(struct device *dev,
+static ssize_t enabled_show(struct device *dev, struct device_attribute *attr,
-                            struct device_attribute *attr, char *buf)
+                            char *buf)
 {
        struct pci_dev *pdev;
-        pdev = to_pci_dev (dev);
+        pdev = to_pci_dev(dev);
-        return sprintf (buf, "%u\n", atomic_read(&pdev->enable_cnt));
+        return sprintf(buf, "%u\n", atomic_read(&pdev->enable_cnt));
 }
 static DEVICE_ATTR_RW(enabled);
 #ifdef CONFIG_NUMA
-static ssize_t
+static ssize_t numa_node_show(struct device *dev, struct device_attribute *attr,
-numa_node_show(struct device *dev, struct device_attribute *attr, char *buf)
+                              char *buf)
 {
-        return sprintf (buf, "%d\n", dev->numa_node);
+        return sprintf(buf, "%d\n", dev->numa_node);
 }
 static DEVICE_ATTR_RO(numa_node);
 #endif
-static ssize_t
+static ssize_t dma_mask_bits_show(struct device *dev,
-dma_mask_bits_show(struct device *dev, struct device_attribute *attr, char *buf)
+                                  struct device_attribute *attr, char *buf)
 {
        struct pci_dev *pdev = to_pci_dev(dev);
-        return sprintf (buf, "%d\n", fls64(pdev->dma_mask));
+        return sprintf(buf, "%d\n", fls64(pdev->dma_mask));
 }
 static DEVICE_ATTR_RO(dma_mask_bits);
-static ssize_t
+static ssize_t consistent_dma_mask_bits_show(struct device *dev,
-consistent_dma_mask_bits_show(struct device *dev, struct device_attribute *attr,
+                                             struct device_attribute *attr,
-                                 char *buf)
+                                             char *buf)
 {
-        return sprintf (buf, "%d\n", fls64(dev->coherent_dma_mask));
+        return sprintf(buf, "%d\n", fls64(dev->coherent_dma_mask));
 }
 static DEVICE_ATTR_RO(consistent_dma_mask_bits);
-static ssize_t
+static ssize_t msi_bus_show(struct device *dev, struct device_attribute *attr,
-msi_bus_show(struct device *dev, struct device_attribute *attr, char *buf)
+                            char *buf)
 {
        struct pci_dev *pdev = to_pci_dev(dev);
        if (!pdev->subordinate)
                return 0;
-        return sprintf (buf, "%u\n",
+        return sprintf(buf, "%u\n",
-                        !(pdev->subordinate->bus_flags & PCI_BUS_FLAGS_NO_MSI));
+                       !(pdev->subordinate->bus_flags & PCI_BUS_FLAGS_NO_MSI));
 }
-static ssize_t
+static ssize_t msi_bus_store(struct device *dev, struct device_attribute *attr,
-msi_bus_store(struct device *dev, struct device_attribute *attr,
+                             const char *buf, size_t count)
-              const char *buf, size_t count)
 {
        struct pci_dev *pdev = to_pci_dev(dev);
        unsigned long val;
@@ -331,9 +327,9 @@ const struct attribute_group *pci_bus_groups[] = {
        NULL,
 };
-static ssize_t
+static ssize_t dev_rescan_store(struct device *dev,
-dev_rescan_store(struct device *dev, struct device_attribute *attr,
+                                struct device_attribute *attr, const char *buf,
-                 const char *buf, size_t count)
+                                size_t count)
 {
        unsigned long val;
        struct pci_dev *pdev = to_pci_dev(dev);
@@ -352,9 +348,8 @@ static struct device_attribute dev_rescan_attr = __ATTR(rescan,
                                                        (S_IWUSR|S_IWGRP),
                                                        NULL, dev_rescan_store);
-static ssize_t
+static ssize_t remove_store(struct device *dev, struct device_attribute *attr,
-remove_store(struct device *dev, struct device_attribute *attr,
+                            const char *buf, size_t count)
-             const char *buf, size_t count)
 {
        unsigned long val;
@@ -369,9 +364,9 @@ static struct device_attribute dev_remove_attr = __ATTR(remove,
                                                        (S_IWUSR|S_IWGRP),
                                                        NULL, remove_store);
-static ssize_t
+static ssize_t dev_bus_rescan_store(struct device *dev,
-dev_bus_rescan_store(struct device *dev, struct device_attribute *attr,
+                                    struct device_attribute *attr,
-                 const char *buf, size_t count)
+                                    const char *buf, size_t count)
 {
        unsigned long val;
        struct pci_bus *bus = to_pci_bus(dev);
@@ -412,7 +407,7 @@ static ssize_t d3cold_allowed_show(struct device *dev,
                                   struct device_attribute *attr, char *buf)
 {
        struct pci_dev *pdev = to_pci_dev(dev);
-        return sprintf (buf, "%u\n", pdev->d3cold_allowed);
+        return sprintf(buf, "%u\n", pdev->d3cold_allowed);
 }
 static DEVICE_ATTR_RW(d3cold_allowed);
 #endif
@@ -607,8 +602,8 @@ const struct attribute_group *pcibus_groups[] = {
        NULL,
 };
-static ssize_t
+static ssize_t boot_vga_show(struct device *dev, struct device_attribute *attr,
-boot_vga_show(struct device *dev, struct device_attribute *attr, char *buf)
+                             char *buf)
 {
        struct pci_dev *pdev = to_pci_dev(dev);
        struct pci_dev *vga_dev = vga_default_device();
@@ -622,22 +617,21 @@ boot_vga_show(struct device *dev, struct device_attribute *attr, char *buf)
 }
 static struct device_attribute vga_attr = __ATTR_RO(boot_vga);
-static ssize_t
+static ssize_t pci_read_config(struct file *filp, struct kobject *kobj,
-pci_read_config(struct file *filp, struct kobject *kobj,
+                               struct bin_attribute *bin_attr, char *buf,
-                struct bin_attribute *bin_attr,
+                               loff_t off, size_t count)
-                char *buf, loff_t off, size_t count)
 {
-        struct pci_dev *dev = to_pci_dev(container_of(kobj,struct device,kobj));
+        struct pci_dev *dev = to_pci_dev(container_of(kobj, struct device,
+                                                      kobj));
        unsigned int size = 64;
        loff_t init_off = off;
-        u8 *data = (u8*) buf;
+        u8 *data = (u8 *) buf;
        /* Several chips lock up trying to read undefined config space */
-        if (security_capable(filp->f_cred, &init_user_ns, CAP_SYS_ADMIN) == 0) {
+        if (security_capable(filp->f_cred, &init_user_ns, CAP_SYS_ADMIN) == 0)
                size = dev->cfg_size;
-        } else if (dev->hdr_type == PCI_HEADER_TYPE_CARDBUS) {
+        else if (dev->hdr_type == PCI_HEADER_TYPE_CARDBUS)
                size = 128;
-        }
        if (off > size)
                return 0;
@@ -700,15 +694,15 @@ pci_read_config(struct file *filp, struct kobject *kobj,
        return count;
 }
-static ssize_t
+static ssize_t pci_write_config(struct file *filp, struct kobject *kobj,
-pci_write_config(struct file* filp, struct kobject *kobj,
+                                struct bin_attribute *bin_attr, char *buf,
-                 struct bin_attribute *bin_attr,
+                                loff_t off, size_t count)
-                 char *buf, loff_t off, size_t count)
 {
-        struct pci_dev *dev = to_pci_dev(container_of(kobj,struct device,kobj));
+        struct pci_dev *dev = to_pci_dev(container_of(kobj, struct device,
+                                                      kobj));
        unsigned int size = count;
        loff_t init_off = off;
-        u8 *data = (u8*) buf;
+        u8 *data = (u8 *) buf;
        if (off > dev->cfg_size)
                return 0;
@@ -728,10 +722,10 @@ pci_write_config(struct file* filp, struct kobject *kobj,
        if ((off & 3) && size > 2) {
                u16 val = data[off - init_off];
                val |= (u16) data[off - init_off + 1] << 8;
-                pci_user_write_config_word(dev, off, val);
+                pci_user_write_config_word(dev, off, val);
-                off += 2;
+                off += 2;
-                size -= 2;
+                size -= 2;
-        }
+        }
        while (size > 3) {
                u32 val = data[off - init_off];
@@ -762,10 +756,9 @@ pci_write_config(struct file* filp, struct kobject *kobj,
        return count;
 }
-static ssize_t
+static ssize_t read_vpd_attr(struct file *filp, struct kobject *kobj,
-read_vpd_attr(struct file *filp, struct kobject *kobj,
+                             struct bin_attribute *bin_attr, char *buf,
-              struct bin_attribute *bin_attr,
+                             loff_t off, size_t count)
-              char *buf, loff_t off, size_t count)
 {
        struct pci_dev *dev =
                to_pci_dev(container_of(kobj, struct device, kobj));
@@ -778,10 +771,9 @@ read_vpd_attr(struct file *filp, struct kobject *kobj,
        return pci_read_vpd(dev, off, count, buf);
 }
-static ssize_t
+static ssize_t write_vpd_attr(struct file *filp, struct kobject *kobj,
-write_vpd_attr(struct file *filp, struct kobject *kobj,
+                              struct bin_attribute *bin_attr, char *buf,
-               struct bin_attribute *bin_attr,
+                              loff_t off, size_t count)
-               char *buf, loff_t off, size_t count)
 {
        struct pci_dev *dev =
                to_pci_dev(container_of(kobj, struct device, kobj));
@@ -807,20 +799,18 @@ write_vpd_attr(struct file *filp, struct kobject *kobj,
 * Reads 1, 2, or 4 bytes from legacy I/O port space using an arch specific
 * callback routine (pci_legacy_read).
 */
-static ssize_t
+static ssize_t pci_read_legacy_io(struct file *filp, struct kobject *kobj,
-pci_read_legacy_io(struct file *filp, struct kobject *kobj,
+                                  struct bin_attribute *bin_attr, char *buf,
-                   struct bin_attribute *bin_attr,
+                                  loff_t off, size_t count)
-                   char *buf, loff_t off, size_t count)
 {
-        struct pci_bus *bus = to_pci_bus(container_of(kobj,
+        struct pci_bus *bus = to_pci_bus(container_of(kobj, struct device,
-                                                      struct device,
                                                      kobj));
-        /* Only support 1, 2 or 4 byte accesses */
+        /* Only support 1, 2 or 4 byte accesses */
-        if (count != 1 && count != 2 && count != 4)
+        if (count != 1 && count != 2 && count != 4)
-                return -EINVAL;
+                return -EINVAL;
-        return pci_legacy_read(bus, off, (u32 *)buf, count);
+        return pci_legacy_read(bus, off, (u32 *)buf, count);
 }
 /**
@@ -835,19 +825,18 @@ pci_read_legacy_io(struct file *filp, struct kobject *kobj,
 * Writes 1, 2, or 4 bytes from legacy I/O port space using an arch specific
 * callback routine (pci_legacy_write).
 */
-static ssize_t
+static ssize_t pci_write_legacy_io(struct file *filp, struct kobject *kobj,
-pci_write_legacy_io(struct file *filp, struct kobject *kobj,
+                                   struct bin_attribute *bin_attr, char *buf,
-                    struct bin_attribute *bin_attr,
+                                   loff_t off, size_t count)
-                    char *buf, loff_t off, size_t count)
 {
-        struct pci_bus *bus = to_pci_bus(container_of(kobj,
+        struct pci_bus *bus = to_pci_bus(container_of(kobj, struct device,
-                                                      struct device,
                                                      kobj));
-        /* Only support 1, 2 or 4 byte accesses */
-        if (count != 1 && count != 2 && count != 4)
-                return -EINVAL;
-        return pci_legacy_write(bus, off, *(u32 *)buf, count);
+        /* Only support 1, 2 or 4 byte accesses */
+        if (count != 1 && count != 2 && count != 4)
+                return -EINVAL;
+        return pci_legacy_write(bus, off, *(u32 *)buf, count);
 }
 /**
@@ -861,16 +850,14 @@ pci_write_legacy_io(struct file *filp, struct kobject *kobj,
 * legacy memory space (first meg of bus space) into application virtual
 * memory space.
 */
-static int
+static int pci_mmap_legacy_mem(struct file *filp, struct kobject *kobj,
-pci_mmap_legacy_mem(struct file *filp, struct kobject *kobj,
+                               struct bin_attribute *attr,
-                    struct bin_attribute *attr,
+                               struct vm_area_struct *vma)
-                    struct vm_area_struct *vma)
 {
-        struct pci_bus *bus = to_pci_bus(container_of(kobj,
+        struct pci_bus *bus = to_pci_bus(container_of(kobj, struct device,
-                                                      struct device,
                                                      kobj));
-        return pci_mmap_legacy_page_range(bus, vma, pci_mmap_mem);
+        return pci_mmap_legacy_page_range(bus, vma, pci_mmap_mem);
 }
 /**
@@ -884,16 +871,14 @@ pci_mmap_legacy_mem(struct file *filp, struct kobject *kobj,
 * legacy IO space (first meg of bus space) into application virtual
 * memory space. Returns -ENOSYS if the operation isn't supported
 */
-static int
+static int pci_mmap_legacy_io(struct file *filp, struct kobject *kobj,
-pci_mmap_legacy_io(struct file *filp, struct kobject *kobj,
+                              struct bin_attribute *attr,
-                   struct bin_attribute *attr,
+                              struct vm_area_struct *vma)
-                   struct vm_area_struct *vma)
 {
-        struct pci_bus *bus = to_pci_bus(container_of(kobj,
+        struct pci_bus *bus = to_pci_bus(container_of(kobj, struct device,
-                                                      struct device,
                                                      kobj));
-        return pci_mmap_legacy_page_range(bus, vma, pci_mmap_io);
+        return pci_mmap_legacy_page_range(bus, vma, pci_mmap_io);
 }
 /**
@@ -903,10 +888,9 @@ pci_mmap_legacy_io(struct file *filp, struct kobject *kobj,
 *
 * Stub implementation. Can be overridden by arch if necessary.
 */
-void __weak
+void __weak pci_adjust_legacy_attr(struct pci_bus *b,
-pci_adjust_legacy_attr(struct pci_bus *b, enum pci_mmap_state mmap_type)
+                                   enum pci_mmap_state mmap_type)
 {
-        return;
 }
 /**
@@ -1005,9 +989,8 @@ int pci_mmap_fits(struct pci_dev *pdev, int resno, struct vm_area_struct *vma,
 *
 * Use the regular PCI mapping routines to map a PCI resource into userspace.
 */
-static int
+static int pci_mmap_resource(struct kobject *kobj, struct bin_attribute *attr,
-pci_mmap_resource(struct kobject *kobj, struct bin_attribute *attr,
+                             struct vm_area_struct *vma, int write_combine)
-                  struct vm_area_struct *vma, int write_combine)
 {
        struct pci_dev *pdev = to_pci_dev(container_of(kobj,
                                                       struct device, kobj));
@@ -1046,26 +1029,23 @@ pci_mmap_resource(struct kobject *kobj, struct bin_attribute *attr,
        return pci_mmap_page_range(pdev, vma, mmap_type, write_combine);
 }
-static int
+static int pci_mmap_resource_uc(struct file *filp, struct kobject *kobj,
-pci_mmap_resource_uc(struct file *filp, struct kobject *kobj,
+                                struct bin_attribute *attr,
-                     struct bin_attribute *attr,
+                                struct vm_area_struct *vma)
-                     struct vm_area_struct *vma)
 {
        return pci_mmap_resource(kobj, attr, vma, 0);
 }
-static int
+static int pci_mmap_resource_wc(struct file *filp, struct kobject *kobj,
-pci_mmap_resource_wc(struct file *filp, struct kobject *kobj,
+                                struct bin_attribute *attr,
-                     struct bin_attribute *attr,
+                                struct vm_area_struct *vma)
-                     struct vm_area_struct *vma)
 {
        return pci_mmap_resource(kobj, attr, vma, 1);
 }
-static ssize_t
+static ssize_t pci_resource_io(struct file *filp, struct kobject *kobj,
-pci_resource_io(struct file *filp, struct kobject *kobj,
+                               struct bin_attribute *attr, char *buf,
-                struct bin_attribute *attr, char *buf,
+                               loff_t off, size_t count, bool write)
-                loff_t off, size_t count, bool write)
 {
        struct pci_dev *pdev = to_pci_dev(container_of(kobj,
                                                       struct device, kobj));
@@ -1110,18 +1090,16 @@ pci_resource_io(struct file *filp, struct kobject *kobj,
        return -EINVAL;
 }
-static ssize_t
+static ssize_t pci_read_resource_io(struct file *filp, struct kobject *kobj,
-pci_read_resource_io(struct file *filp, struct kobject *kobj,
+                                    struct bin_attribute *attr, char *buf,
-                     struct bin_attribute *attr, char *buf,
+                                    loff_t off, size_t count)
-                     loff_t off, size_t count)
 {
        return pci_resource_io(filp, kobj, attr, buf, off, count, false);
 }
-static ssize_t
+static ssize_t pci_write_resource_io(struct file *filp, struct kobject *kobj,
-pci_write_resource_io(struct file *filp, struct kobject *kobj,
+                                     struct bin_attribute *attr, char *buf,
-                      struct bin_attribute *attr, char *buf,
+                                     loff_t off, size_t count)
-                      loff_t off, size_t count)
 {
        return pci_resource_io(filp, kobj, attr, buf, off, count, true);
 }
@@ -1133,8 +1111,7 @@ pci_write_resource_io(struct file *filp, struct kobject *kobj,
 * If we created resource files for @pdev, remove them from sysfs and
 * free their resources.
 */
-static void
+static void pci_remove_resource_files(struct pci_dev *pdev)
-pci_remove_resource_files(struct pci_dev *pdev)
 {
        int i;
@@ -1237,10 +1214,9 @@ void __weak pci_remove_resource_files(struct pci_dev *dev) { return; }
 *
 * writing anything except 0 enables it
 */
-static ssize_t
+static ssize_t pci_write_rom(struct file *filp, struct kobject *kobj,
-pci_write_rom(struct file *filp, struct kobject *kobj,
+                             struct bin_attribute *bin_attr, char *buf,
-              struct bin_attribute *bin_attr,
+                             loff_t off, size_t count)
-              char *buf, loff_t off, size_t count)
 {
        struct pci_dev *pdev = to_pci_dev(container_of(kobj, struct device, kobj));
@@ -1264,10 +1240,9 @@ pci_write_rom(struct file *filp, struct kobject *kobj,
 * Put @count bytes starting at @off into @buf from the ROM in the PCI
 * device corresponding to @kobj.
 */
-static ssize_t
+static ssize_t pci_read_rom(struct file *filp, struct kobject *kobj,
-pci_read_rom(struct file *filp, struct kobject *kobj,
+                            struct bin_attribute *bin_attr, char *buf,
-             struct bin_attribute *bin_attr,
+                            loff_t off, size_t count)
-             char *buf, loff_t off, size_t count)
 {
        struct pci_dev *pdev = to_pci_dev(container_of(kobj, struct device, kobj));
        void __iomem *rom;
@@ -1313,9 +1288,8 @@ static struct bin_attribute pcie_config_attr = {
        .write = pci_write_config,
 };
-static ssize_t reset_store(struct device *dev,
+static ssize_t reset_store(struct device *dev, struct device_attribute *attr,
-                           struct device_attribute *attr, const char *buf,
+                           const char *buf, size_t count)
-                           size_t count)
 {
        struct pci_dev *pdev = to_pci_dev(dev);
        unsigned long val;
@@ -1382,7 +1356,7 @@ error:
        return retval;
 }
-int __must_check pci_create_sysfs_dev_files (struct pci_dev *pdev)
+int __must_check pci_create_sysfs_dev_files(struct pci_dev *pdev)
 {
        int retval;
        int rom_size = 0;
@@ -1520,7 +1494,6 @@ static int __init pci_sysfs_init(void)
        return 0;
 }
 late_initcall(pci_sysfs_init);
 static struct attribute *pci_dev_dev_attrs[] = {
@@ -1529,7 +1502,7 @@ static struct attribute *pci_dev_dev_attrs[] = {
 };
 static umode_t pci_dev_attrs_are_visible(struct kobject *kobj,
-                                                struct attribute *a, int n)
+                                         struct attribute *a, int n)
 {
        struct device *dev = container_of(kobj, struct device, kobj);
        struct pci_dev *pdev = to_pci_dev(dev);
@@ -1548,7 +1521,7 @@ static struct attribute *pci_dev_hp_attrs[] = {
 };
 static umode_t pci_dev_hp_attrs_are_visible(struct kobject *kobj,
-                                                struct attribute *a, int n)
+                                            struct attribute *a, int n)
 {
        struct device *dev = container_of(kobj, struct device, kobj);
        struct pci_dev *pdev = to_pci_dev(dev);
@@ -1572,7 +1545,7 @@ static struct attribute *sriov_dev_attrs[] = {
 };
 static umode_t sriov_attrs_are_visible(struct kobject *kobj,
-                                         struct attribute *a, int n)
+                                       struct attribute *a, int n)
 {
        struct device *dev = container_of(kobj, struct device, kobj);
diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c
index 51ec8b481280..952b4b489d0f 100644
--- a/drivers/pci/pci.c
+++ b/drivers/pci/pci.c
@@ -106,7 +106,7 @@ static bool pcie_ari_disabled;
 * Given a PCI bus, returns the highest PCI bus number present in the set
 * including the given PCI bus and its list of child PCI buses.
 */
-unsigned char pci_bus_max_busnr(struct pci_bus* bus)
+unsigned char pci_bus_max_busnr(struct pci_bus *bus)
 {
        struct pci_bus *tmp;
        unsigned char max, n;
@@ -114,7 +114,7 @@ unsigned char pci_bus_max_busnr(struct pci_bus* bus)
        max = bus->busn_res.end;
        list_for_each_entry(tmp, &bus->children, node) {
                n = pci_bus_max_busnr(tmp);
-                if(n > max)
+                if (n > max)
                        max = n;
        }
        return max;
@@ -405,8 +405,8 @@ EXPORT_SYMBOL_GPL(pci_find_ht_capability);
 *  For given resource region of given device, return the resource
 *  region of parent bus the given region is contained in.
 */
-struct resource *
+struct resource *pci_find_parent_resource(const struct pci_dev *dev,
-pci_find_parent_resource(const struct pci_dev *dev, struct resource *res)
+                                          struct resource *res)
 {
        const struct pci_bus *bus = dev->bus;
        struct resource *r;
@@ -473,8 +473,7 @@ int pci_wait_for_pending(struct pci_dev *dev, int pos, u16 mask)
 * Restore the BAR values for a given device, so as to make it
 * accessible by its driver.
 */
-static void
+static void pci_restore_bars(struct pci_dev *dev)
-pci_restore_bars(struct pci_dev *dev)
 {
        int i;
@@ -499,7 +498,7 @@ static inline bool platform_pci_power_manageable(struct pci_dev *dev)
 }
 static inline int platform_pci_set_power_state(struct pci_dev *dev,
-                                                pci_power_t t)
+                                               pci_power_t t)
 {
        return pci_platform_pm ? pci_platform_pm->set_state(dev, t) : -ENOSYS;
 }
@@ -888,12 +887,10 @@ pci_power_t pci_choose_state(struct pci_dev *dev, pm_message_t state)
        }
        return PCI_D0;
 }
 EXPORT_SYMBOL(pci_choose_state);
 #define PCI_EXP_SAVE_REGS       7
 static struct pci_cap_saved_state *_pci_find_saved_cap(struct pci_dev *pci_dev,
                                                       u16 cap, bool extended)
 {
@@ -1005,8 +1002,7 @@ static void pci_restore_pcix_state(struct pci_dev *dev)
 * pci_save_state - save the PCI configuration space of a device before suspending
 * @dev: - PCI device that we're dealing with
 */
-int
+int pci_save_state(struct pci_dev *dev)
-pci_save_state(struct pci_dev *dev)
 {
        int i;
        /* XXX: 100% dword access ok here? */
@@ -1381,7 +1377,7 @@ static void pcim_release(struct device *gendev, void *res)
                pci_disable_device(dev);
 }
-static struct pci_devres * get_pci_dr(struct pci_dev *pdev)
+static struct pci_devres *get_pci_dr(struct pci_dev *pdev)
 {
        struct pci_devres *dr, *new_dr;
@@ -1395,7 +1391,7 @@ static struct pci_devres * get_pci_dr(struct pci_dev *pdev)
        return devres_get(&pdev->dev, new_dr, NULL, NULL);
 }
-static struct pci_devres * find_pci_dr(struct pci_dev *pdev)
+static struct pci_devres *find_pci_dr(struct pci_dev *pdev)
 {
        if (pci_is_managed(pdev))
                return devres_find(&pdev->dev, pcim_release, NULL, NULL);
@@ -1455,7 +1451,7 @@ EXPORT_SYMBOL(pcim_pin_device);
 * devices are added. This is the default implementation. Architecture
 * implementations can override this.
 */
-int __weak pcibios_add_device (struct pci_dev *dev)
+int __weak pcibios_add_device(struct pci_dev *dev)
 {
        return 0;
 }
@@ -1527,8 +1523,7 @@ void pci_disable_enabled_device(struct pci_dev *dev)
 * Note we don't actually disable the device until all callers of
 * pci_enable_device() have called pci_disable_device().
 */
-void
+void pci_disable_device(struct pci_dev *dev)
-pci_disable_device(struct pci_dev *dev)
 {
        struct pci_devres *dr;
@@ -2434,8 +2429,7 @@ u8 pci_swizzle_interrupt_pin(const struct pci_dev *dev, u8 pin)
        return (((pin - 1) + slot) % 4) + 1;
 }
-int
+int pci_get_interrupt_pin(struct pci_dev *dev, struct pci_dev **bridge)
-pci_get_interrupt_pin(struct pci_dev *dev, struct pci_dev **bridge)
 {
        u8 pin;
@@ -2518,8 +2512,8 @@ EXPORT_SYMBOL(pci_release_region);
 *      Returns 0 on success, or %EBUSY on error.  A warning
 *      message is also printed on failure.
 */
-static int __pci_request_region(struct pci_dev *pdev, int bar, const char *res_name,
+static int __pci_request_region(struct pci_dev *pdev, int bar,
-                                                                        int exclusive)
+                                const char *res_name, int exclusive)
 {
        struct pci_devres *dr;
@@ -2530,8 +2524,7 @@ static int __pci_request_region(struct pci_dev *pdev, int bar, const char *res_n
                if (!request_region(pci_resource_start(pdev, bar),
                            pci_resource_len(pdev, bar), res_name))
                        goto err_out;
-        }
+        } else if (pci_resource_flags(pdev, bar) & IORESOURCE_MEM) {
-        else if (pci_resource_flags(pdev, bar) & IORESOURCE_MEM) {
                if (!__request_mem_region(pci_resource_start(pdev, bar),
                                        pci_resource_len(pdev, bar), res_name,
                                        exclusive))
@@ -2588,7 +2581,8 @@ EXPORT_SYMBOL(pci_request_region);
 *      explicitly not allowed to map the resource via /dev/mem or
 *      sysfs.
 */
-int pci_request_region_exclusive(struct pci_dev *pdev, int bar, const char *res_name)
+int pci_request_region_exclusive(struct pci_dev *pdev, int bar,
+                                 const char *res_name)
 {
        return __pci_request_region(pdev, bar, res_name, IORESOURCE_EXCLUSIVE);
 }
@@ -2613,7 +2607,7 @@ void pci_release_selected_regions(struct pci_dev *pdev, int bars)
 EXPORT_SYMBOL(pci_release_selected_regions);
 static int __pci_request_selected_regions(struct pci_dev *pdev, int bars,
-                                 const char *res_name, int excl)
+                                          const char *res_name, int excl)
 {
        int i;
@@ -2624,7 +2618,7 @@ static int __pci_request_selected_regions(struct pci_dev *pdev, int bars,
        return 0;
 err_out:
-        while(--i >= 0)
+        while (--i >= 0)
                if (bars & (1 << i))
                        pci_release_region(pdev, i);
@@ -2645,8 +2639,8 @@ int pci_request_selected_regions(struct pci_dev *pdev, int bars,
 }
 EXPORT_SYMBOL(pci_request_selected_regions);
-int pci_request_selected_regions_exclusive(struct pci_dev *pdev,
+int pci_request_selected_regions_exclusive(struct pci_dev *pdev, int bars,
-                                 int bars, const char *res_name)
+                                           const char *res_name)
 {
        return __pci_request_selected_regions(pdev, bars, res_name,
                        IORESOURCE_EXCLUSIVE);
@@ -2836,8 +2830,7 @@ EXPORT_SYMBOL_GPL(pci_set_cacheline_size);
 *
 * RETURNS: An appropriate -ERRNO error value on error, or zero for success.
 */
-int
+int pci_set_mwi(struct pci_dev *dev)
-pci_set_mwi(struct pci_dev *dev)
 {
 #ifdef PCI_DISABLE_MWI
        return 0;
@@ -2850,7 +2843,7 @@ pci_set_mwi(struct pci_dev *dev)
                return rc;
        pci_read_config_word(dev, PCI_COMMAND, &cmd);
-        if (! (cmd & PCI_COMMAND_INVALIDATE)) {
+        if (!(cmd & PCI_COMMAND_INVALIDATE)) {
                dev_dbg(&dev->dev, "enabling Mem-Wr-Inval\n");
                cmd |= PCI_COMMAND_INVALIDATE;
                pci_write_config_word(dev, PCI_COMMAND, cmd);
@@ -2885,8 +2878,7 @@ EXPORT_SYMBOL(pci_try_set_mwi);
 *
 * Disables PCI Memory-Write-Invalidate transaction on the device
 */
-void
+void pci_clear_mwi(struct pci_dev *dev)
-pci_clear_mwi(struct pci_dev *dev)
 {
 #ifndef PCI_DISABLE_MWI
        u16 cmd;
@@ -2907,18 +2899,16 @@ EXPORT_SYMBOL(pci_clear_mwi);
 *
 * Enables/disables PCI INTx for device dev
 */
-void
+void pci_intx(struct pci_dev *pdev, int enable)
-pci_intx(struct pci_dev *pdev, int enable)
 {
        u16 pci_command, new;
        pci_read_config_word(pdev, PCI_COMMAND, &pci_command);
-        if (enable) {
+        if (enable)
                new = pci_command & ~PCI_COMMAND_INTX_DISABLE;
-        } else {
+        else
                new = pci_command | PCI_COMMAND_INTX_DISABLE;
-        }
        if (new != pci_command) {
                struct pci_devres *dr;
@@ -4159,7 +4149,7 @@ void __init pci_register_set_vga_state(arch_set_vga_state_t func)
 }
 static int pci_set_vga_state_arch(struct pci_dev *dev, bool decode,
-                      unsigned int command_bits, u32 flags)
+                                  unsigned int command_bits, u32 flags)
 {
        if (arch_set_vga_state)
                return arch_set_vga_state(dev, decode, command_bits,
@@ -4271,11 +4261,10 @@ static resource_size_t pci_specified_resource_alignment(struct pci_dev *dev)
                        bus == dev->bus->number &&
                        slot == PCI_SLOT(dev->devfn) &&
                        func == PCI_FUNC(dev->devfn)) {
-                        if (align_order == -1) {
+                        if (align_order == -1)
                                align = PAGE_SIZE;
-                        } else {
+                        else
                                align = 1 << align_order;
-                        }
                        /* Found */
                        break;
                }
@@ -4393,7 +4382,6 @@ static int __init pci_resource_alignment_sysfs_init(void)
        return bus_create_file(&pci_bus_type,
                                        &bus_attr_resource_alignment);
 }
 late_initcall(pci_resource_alignment_sysfs_init);
 static void pci_no_domains(void)
diff --git a/drivers/pci/pcie/aer/aer_inject.c b/drivers/pci/pcie/aer/aer_inject.c
index 587e7e853107..d82cb8fd452e 100644
--- a/drivers/pci/pcie/aer/aer_inject.c
+++ b/drivers/pci/pcie/aer/aer_inject.c
@@ -464,8 +464,7 @@ static int aer_inject(struct aer_error_inj *einj)
                        goto out_put;
                }
                aer_irq(-1, edev);
-        }
+        } else
-        else
                ret = -EINVAL;
 out_put:
        kfree(err_alloc);
diff --git a/drivers/pci/pcie/aer/aerdrv_core.c b/drivers/pci/pcie/aer/aerdrv_core.c
index b2c8881da764..5653ea94547f 100644
--- a/drivers/pci/pcie/aer/aerdrv_core.c
+++ b/drivers/pci/pcie/aer/aerdrv_core.c
@@ -542,8 +542,7 @@ static void aer_recover_work_func(struct work_struct *work);
 #define AER_RECOVER_RING_ORDER          4
 #define AER_RECOVER_RING_SIZE           (1 << AER_RECOVER_RING_ORDER)
-struct aer_recover_entry
+struct aer_recover_entry {
-{
        u8      bus;
        u8      devfn;
        u16     domain;
diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c
index 96b954f55d0d..468a6505bef1 100644
--- a/drivers/pci/probe.c
+++ b/drivers/pci/probe.c
@@ -168,7 +168,7 @@ static inline unsigned long decode_bar(struct pci_dev *dev, u32 bar)
 * Returns 1 if the BAR is 64-bit, or 0 if 32-bit.
 */
 int __pci_read_base(struct pci_dev *dev, enum pci_bar_type type,
-                        struct resource *res, unsigned int pos)
+                    struct resource *res, unsigned int pos)
 {
        u32 l, sz, mask;
        u64 l64, sz64, mask64;
@@ -604,7 +604,6 @@ static enum pci_bus_speed agp_speed(int agp3, int agpstat)
        return agp_speeds[index];
 }
 static void pci_set_bus_speed(struct pci_bus *bus)
 {
        struct pci_dev *bridge = bus->self;
@@ -636,11 +635,10 @@ static void pci_set_bus_speed(struct pci_bus *bus)
                } else if (status & PCI_X_SSTATUS_266MHZ) {
                        max = PCI_SPEED_133MHz_PCIX_266;
                } else if (status & PCI_X_SSTATUS_133MHZ) {
-                        if ((status & PCI_X_SSTATUS_VERS) == PCI_X_SSTATUS_V2) {
+                        if ((status & PCI_X_SSTATUS_VERS) == PCI_X_SSTATUS_V2)
                                max = PCI_SPEED_133MHz_PCIX_ECC;
-                        } else {
+                        else
                                max = PCI_SPEED_133MHz_PCIX;
-                        }
                } else {
                        max = PCI_SPEED_66MHz_PCIX;
                }
@@ -664,7 +662,6 @@ static void pci_set_bus_speed(struct pci_bus *bus)
        }
 }
 static struct pci_bus *pci_alloc_child_bus(struct pci_bus *parent,
                                           struct pci_dev *bridge, int busnr)
 {
@@ -729,7 +726,8 @@ add_dev:
        return child;
 }
-struct pci_bus *pci_add_new_bus(struct pci_bus *parent, struct pci_dev *dev, int busnr)
+struct pci_bus *pci_add_new_bus(struct pci_bus *parent, struct pci_dev *dev,
+                                int busnr)
 {
        struct pci_bus *child;
@@ -888,7 +886,7 @@ int pci_scan_bridge(struct pci_bus *bus, struct pci_dev *dev, int max, int pass)
                         * as cards with a PCI-to-PCI bridge can be
                         * inserted later.
                         */
-                        for (i=0; i<CARDBUS_RESERVE_BUSNR; i++) {
+                        for (i = 0; i < CARDBUS_RESERVE_BUSNR; i++) {
                                struct pci_bus *parent = bus;
                                if (pci_find_bus(pci_domain_nr(bus),
                                                        max+i+1))
@@ -994,7 +992,6 @@ void set_pcie_hotplug_bridge(struct pci_dev *pdev)
                pdev->is_hotplug_bridge = 1;
 }
 /**
 * pci_ext_cfg_is_aliased - is ext config space just an alias of std config?
 * @dev: PCI device
@@ -1285,7 +1282,7 @@ struct pci_dev *pci_alloc_dev(struct pci_bus *bus)
 EXPORT_SYMBOL(pci_alloc_dev);
 bool pci_bus_read_dev_vendor_id(struct pci_bus *bus, int devfn, u32 *l,
-                                 int crs_timeout)
+                                int crs_timeout)
 {
        int delay = 1;
@@ -1719,7 +1716,7 @@ unsigned int pci_scan_child_bus(struct pci_bus *bus)
                bus->is_added = 1;
        }
-        for (pass=0; pass < 2; pass++)
+        for (pass = 0; pass < 2; pass++)
                list_for_each_entry(dev, &bus->devices, bus_list) {
                        if (pci_is_bridge(dev))
                                max = pci_scan_bridge(bus, dev, max, pass);
@@ -2062,7 +2059,8 @@ void pci_unlock_rescan_remove(void)
 }
 EXPORT_SYMBOL_GPL(pci_unlock_rescan_remove);
-static int __init pci_sort_bf_cmp(const struct device *d_a, const struct device *d_b)
+static int __init pci_sort_bf_cmp(const struct device *d_a,
+                                  const struct device *d_b)
 {
        const struct pci_dev *a = to_pci_dev(d_a);
        const struct pci_dev *b = to_pci_dev(d_b);
diff --git a/drivers/pci/proc.c b/drivers/pci/proc.c
index 46d1378f2e9e..3f155e78513f 100644
--- a/drivers/pci/proc.c
+++ b/drivers/pci/proc.c
@@ -17,15 +17,14 @@
 static int proc_initialized;    /* = 0 */
-static loff_t
+static loff_t proc_bus_pci_lseek(struct file *file, loff_t off, int whence)
-proc_bus_pci_lseek(struct file *file, loff_t off, int whence)
 {
        struct pci_dev *dev = PDE_DATA(file_inode(file));
        return fixed_size_llseek(file, off, whence, dev->cfg_size);
 }
-static ssize_t
+static ssize_t proc_bus_pci_read(struct file *file, char __user *buf,
-proc_bus_pci_read(struct file *file, char __user *buf, size_t nbytes, loff_t *ppos)
+                                 size_t nbytes, loff_t *ppos)
 {
        struct pci_dev *dev = PDE_DATA(file_inode(file));
        unsigned int pos = *ppos;
@@ -108,8 +107,8 @@ proc_bus_pci_read(struct file *file, char __user *buf, size_t nbytes, loff_t *pp
        return nbytes;
 }
-static ssize_t
+static ssize_t proc_bus_pci_write(struct file *file, const char __user *buf,
-proc_bus_pci_write(struct file *file, const char __user *buf, size_t nbytes, loff_t *ppos)
+                                  size_t nbytes, loff_t *ppos)
 {
        struct inode *ino = file_inode(file);
        struct pci_dev *dev = PDE_DATA(ino);
@@ -413,7 +412,7 @@ int pci_proc_detach_device(struct pci_dev *dev)
        return 0;
 }
-int pci_proc_detach_bus(struct pci_bus* bus)
+int pci_proc_detach_bus(struct pci_bus *bus)
 {
        proc_remove(bus->procdir);
        return 0;
@@ -423,6 +422,7 @@ static int proc_bus_pci_dev_open(struct inode *inode, struct file *file)
 {
        return seq_open(file, &proc_bus_pci_devices_op);
 }
 static const struct file_operations proc_bus_pci_dev_operations = {
        .owner          = THIS_MODULE,
        .open           = proc_bus_pci_dev_open,
@@ -443,6 +443,4 @@ static int __init pci_proc_init(void)
        return 0;
 }
 device_initcall(pci_proc_init);
diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c
index d3f29dd29876..e0d78d23483a 100644
--- a/drivers/pci/quirks.c
+++ b/drivers/pci/quirks.c
@@ -48,8 +48,8 @@ static void quirk_mellanox_tavor(struct pci_dev *dev)
 {
        dev->broken_parity_status = 1;  /* This device gives false positives */
 }
-DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_MELLANOX,PCI_DEVICE_ID_MELLANOX_TAVOR,quirk_mellanox_tavor);
+DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_MELLANOX, PCI_DEVICE_ID_MELLANOX_TAVOR, quirk_mellanox_tavor);
-DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_MELLANOX,PCI_DEVICE_ID_MELLANOX_TAVOR_BRIDGE,quirk_mellanox_tavor);
+DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_MELLANOX, PCI_DEVICE_ID_MELLANOX_TAVOR_BRIDGE, quirk_mellanox_tavor);
 /* Deal with broken BIOSes that neglect to enable passive release,
   which can cause problems in combination with the 82441FX/PPro MTRRs */
@@ -82,7 +82,7 @@ DECLARE_PCI_FIXUP_RESUME(PCI_VENDOR_ID_INTEL,	PCI_DEVICE_ID_INTEL_82441,	quirk_p
 static void quirk_isa_dma_hangs(struct pci_dev *dev)
 {
        if (!isa_dma_bridge_buggy) {
-                isa_dma_bridge_buggy=1;
+                isa_dma_bridge_buggy = 1;
                dev_info(&dev->dev, "Activating ISA DMA hang workarounds\n");
        }
 }
@@ -123,7 +123,7 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_TGP_LPC, quirk
 */
 static void quirk_nopcipci(struct pci_dev *dev)
 {
-        if ((pci_pci_problems & PCIPCI_FAIL)==0) {
+        if ((pci_pci_problems & PCIPCI_FAIL) == 0) {
                dev_info(&dev->dev, "Disabling direct PCI/PCI transfers\n");
                pci_pci_problems |= PCIPCI_FAIL;
        }
@@ -148,7 +148,7 @@ DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_AMD,	PCI_DEVICE_ID_AMD_8151_0,	quirk_nopci
 */
 static void quirk_triton(struct pci_dev *dev)
 {
-        if ((pci_pci_problems&PCIPCI_TRITON)==0) {
+        if ((pci_pci_problems&PCIPCI_TRITON) == 0) {
                dev_info(&dev->dev, "Limiting direct PCI/PCI transfers\n");
                pci_pci_problems |= PCIPCI_TRITON;
        }
@@ -163,8 +163,8 @@ DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL,	PCI_DEVICE_ID_INTEL_82439TX,	quirk_
 *      Made according to a windows driver based patch by George E. Breese
 *      see PCI Latency Adjust on http://www.viahardware.com/download/viatweak.shtm
 *      and http://www.georgebreese.com/net/software/#PCI
- *      Also see http://www.au-ja.org/review-kt133a-1-en.phtml for
+ *      Also see http://www.au-ja.org/review-kt133a-1-en.phtml for
- *      the info on which Mr Breese based his work.
+ *      the info on which Mr Breese based his work.
 *
 *      Updated based on further information from the site and also on
 *      information provided by VIA
@@ -177,14 +177,14 @@ static void quirk_vialatency(struct pci_dev *dev)
           a buggy southbridge */
        p = pci_get_device(PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_82C686, NULL);
-        if (p!=NULL) {
+        if (p != NULL) {
                /* 0x40 - 0x4f == 686B, 0x10 - 0x2f == 686A; thanks Dan Hollis */
                /* Check for buggy part revisions */
                if (p->revision < 0x40 || p->revision > 0x42)
                        goto exit;
        } else {
                p = pci_get_device(PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_8231, NULL);
-                if (p==NULL)    /* No problem parts */
+                if (p == NULL)  /* No problem parts */
                        goto exit;
                /* Check for buggy part revisions */
                if (p->revision < 0x10 || p->revision > 0x12)
@@ -227,7 +227,7 @@ DECLARE_PCI_FIXUP_RESUME(PCI_VENDOR_ID_VIA,	PCI_DEVICE_ID_VIA_8361,		quirk_viala
 */
 static void quirk_viaetbf(struct pci_dev *dev)
 {
-        if ((pci_pci_problems&PCIPCI_VIAETBF)==0) {
+        if ((pci_pci_problems&PCIPCI_VIAETBF) == 0) {
                dev_info(&dev->dev, "Limiting direct PCI/PCI transfers\n");
                pci_pci_problems |= PCIPCI_VIAETBF;
        }
@@ -236,7 +236,7 @@ DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_VIA,	PCI_DEVICE_ID_VIA_82C597_0,	quirk_via
 static void quirk_vsfx(struct pci_dev *dev)
 {
-        if ((pci_pci_problems&PCIPCI_VSFX)==0) {
+        if ((pci_pci_problems&PCIPCI_VSFX) == 0) {
                dev_info(&dev->dev, "Limiting direct PCI/PCI transfers\n");
                pci_pci_problems |= PCIPCI_VSFX;
        }
@@ -251,7 +251,7 @@ DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_VIA,	PCI_DEVICE_ID_VIA_82C576,	quirk_vsfx)
 */
 static void quirk_alimagik(struct pci_dev *dev)
 {
-        if ((pci_pci_problems&PCIPCI_ALIMAGIK)==0) {
+        if ((pci_pci_problems&PCIPCI_ALIMAGIK) == 0) {
                dev_info(&dev->dev, "Limiting direct PCI/PCI transfers\n");
                pci_pci_problems |= PCIPCI_ALIMAGIK|PCIPCI_TRITON;
        }
@@ -265,7 +265,7 @@ DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_AL,	PCI_DEVICE_ID_AL_M1651,		quirk_alimagi
 */
 static void quirk_natoma(struct pci_dev *dev)
 {
-        if ((pci_pci_problems&PCIPCI_NATOMA)==0) {
+        if ((pci_pci_problems&PCIPCI_NATOMA) == 0) {
                dev_info(&dev->dev, "Limiting direct PCI/PCI transfers\n");
                pci_pci_problems |= PCIPCI_NATOMA;
        }
@@ -703,7 +703,7 @@ static void quirk_via_ioapic(struct pci_dev *dev)
               tmp == 0 ? "Disa" : "Ena");
        /* Offset 0x58: External APIC IRQ output control */
-        pci_write_config_byte (dev, 0x58, tmp);
+        pci_write_config_byte(dev, 0x58, tmp);
 }
 DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_VIA,      PCI_DEVICE_ID_VIA_82C686,       quirk_via_ioapic);
 DECLARE_PCI_FIXUP_RESUME_EARLY(PCI_VENDOR_ID_VIA,       PCI_DEVICE_ID_VIA_82C686,       quirk_via_ioapic);
@@ -916,12 +916,12 @@ static void quirk_amd_ordering(struct pci_dev *dev)
 {
        u32 pcic;
        pci_read_config_dword(dev, 0x4C, &pcic);
-        if ((pcic&6)!=6) {
+        if ((pcic & 6) != 6) {
                pcic |= 6;
                dev_warn(&dev->dev, "BIOS failed to enable PCI standards compliance; fixing this error\n");
                pci_write_config_dword(dev, 0x4C, pcic);
                pci_read_config_dword(dev, 0x84, &pcic);
-                pcic |= (1<<23);        /* Required in this mode */
+                pcic |= (1 << 23);      /* Required in this mode */
                pci_write_config_dword(dev, 0x84, pcic);
        }
 }
@@ -937,7 +937,7 @@ DECLARE_PCI_FIXUP_RESUME_EARLY(PCI_VENDOR_ID_AMD,	PCI_DEVICE_ID_AMD_FE_GATE_700C
 */
 static void quirk_dunord(struct pci_dev *dev)
 {
-        struct resource *r = &dev->resource [1];
+        struct resource *r = &dev->resource[1];
        r->flags |= IORESOURCE_UNSET;
        r->start = 0;
@@ -967,11 +967,12 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_TOSHIBA,	0x605,	quirk_transparent_bridge)
 static void quirk_mediagx_master(struct pci_dev *dev)
 {
        u8 reg;
        pci_read_config_byte(dev, 0x41, &reg);
        if (reg & 2) {
                reg &= ~2;
                dev_info(&dev->dev, "Fixup for MediaGX/Geode Slave Disconnect Boundary (0x41=0x%02x)\n", reg);
-                pci_write_config_byte(dev, 0x41, reg);
+                pci_write_config_byte(dev, 0x41, reg);
        }
 }
 DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_CYRIX,    PCI_DEVICE_ID_CYRIX_PCI_MASTER, quirk_mediagx_master);
@@ -1120,7 +1121,7 @@ static void asus_hides_smbus_hostbridge(struct pci_dev *dev)
 {
        if (unlikely(dev->subsystem_vendor == PCI_VENDOR_ID_ASUSTEK)) {
                if (dev->device == PCI_DEVICE_ID_INTEL_82845_HB)
-                        switch(dev->subsystem_device) {
+                        switch (dev->subsystem_device) {
                        case 0x8025: /* P4B-LX */
                        case 0x8070: /* P4B */
                        case 0x8088: /* P4B533 */
@@ -1128,14 +1129,14 @@ static void asus_hides_smbus_hostbridge(struct pci_dev *dev)
                                asus_hides_smbus = 1;
                        }
                else if (dev->device == PCI_DEVICE_ID_INTEL_82845G_HB)
-                        switch(dev->subsystem_device) {
+                        switch (dev->subsystem_device) {
                        case 0x80b1: /* P4GE-V */
                        case 0x80b2: /* P4PE */
                        case 0x8093: /* P4B533-V */
                                asus_hides_smbus = 1;
                        }
                else if (dev->device == PCI_DEVICE_ID_INTEL_82850_HB)
-                        switch(dev->subsystem_device) {
+                        switch (dev->subsystem_device) {
                        case 0x8030: /* P4T533 */
                                asus_hides_smbus = 1;
                        }
@@ -1175,7 +1176,7 @@ static void asus_hides_smbus_hostbridge(struct pci_dev *dev)
                        }
        } else if (unlikely(dev->subsystem_vendor == PCI_VENDOR_ID_HP)) {
                if (dev->device ==  PCI_DEVICE_ID_INTEL_82855PM_HB)
-                        switch(dev->subsystem_device) {
+                        switch (dev->subsystem_device) {
                        case 0x088C: /* HP Compaq nc8000 */
                        case 0x0890: /* HP Compaq nc6000 */
                                asus_hides_smbus = 1;
@@ -1192,20 +1193,20 @@ static void asus_hides_smbus_hostbridge(struct pci_dev *dev)
                        case 0x12bf: /* HP xw4100 */
                                asus_hides_smbus = 1;
                        }
-       } else if (unlikely(dev->subsystem_vendor == PCI_VENDOR_ID_SAMSUNG)) {
+        } else if (unlikely(dev->subsystem_vendor == PCI_VENDOR_ID_SAMSUNG)) {
-               if (dev->device ==  PCI_DEVICE_ID_INTEL_82855PM_HB)
+                if (dev->device ==  PCI_DEVICE_ID_INTEL_82855PM_HB)
-                       switch(dev->subsystem_device) {
+                        switch (dev->subsystem_device) {
-                       case 0xC00C: /* Samsung P35 notebook */
+                        case 0xC00C: /* Samsung P35 notebook */
-                               asus_hides_smbus = 1;
+                                asus_hides_smbus = 1;
-                       }
+                }
        } else if (unlikely(dev->subsystem_vendor == PCI_VENDOR_ID_COMPAQ)) {
                if (dev->device == PCI_DEVICE_ID_INTEL_82855PM_HB)
-                        switch(dev->subsystem_device) {
+                        switch (dev->subsystem_device) {
                        case 0x0058: /* Compaq Evo N620c */
                                asus_hides_smbus = 1;
                        }
                else if (dev->device == PCI_DEVICE_ID_INTEL_82810_IG3)
-                        switch(dev->subsystem_device) {
+                        switch (dev->subsystem_device) {
                        case 0xB16C: /* Compaq Deskpro EP 401963-001 (PCA# 010174) */
                                /* Motherboard doesn't have Host bridge
                                 * subvendor/subdevice IDs, therefore checking
@@ -1213,7 +1214,7 @@ static void asus_hides_smbus_hostbridge(struct pci_dev *dev)
                                asus_hides_smbus = 1;
                        }
                else if (dev->device == PCI_DEVICE_ID_INTEL_82801DB_2)
-                        switch(dev->subsystem_device) {
+                        switch (dev->subsystem_device) {
                        case 0x00b8: /* Compaq Evo D510 CMT */
                        case 0x00b9: /* Compaq Evo D510 SFF */
                        case 0x00ba: /* Compaq Evo D510 USDT */
@@ -1514,10 +1515,8 @@ static void quirk_alder_ioapic(struct pci_dev *pdev)
        /* The next five BARs all seem to be rubbish, so just clean
         * them out */
-        for (i=1; i < 6; i++) {
+        for (i = 1; i < 6; i++)
                memset(&pdev->resource[i], 0, sizeof(pdev->resource[i]));
-        }
 }
 DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL,   PCI_DEVICE_ID_INTEL_EESSC,      quirk_alder_ioapic);
 #endif
@@ -1552,7 +1551,7 @@ DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_INTEL,	PCI_DEVICE_ID_INTEL_PXHV,	quirk_pci
 * Some Intel PCI Express chipsets have trouble with downstream
 * device power management.
 */
-static void quirk_intel_pcie_pm(struct pci_dev * dev)
+static void quirk_intel_pcie_pm(struct pci_dev *dev)
 {
        pci_pm_d3_delay = 120;
        dev->no_d1d2 = 1;
@@ -2189,8 +2188,7 @@ static int msi_ht_cap_enabled(struct pci_dev *dev)
                u8 flags;
                if (pci_read_config_byte(dev, pos + HT_MSI_FLAGS,
-                                         &flags) == 0)
+                                         &flags) == 0) {
-                {
                        dev_info(&dev->dev, "Found %s HT MSI Mapping\n",
                                flags & HT_MSI_FLAGS_ENABLE ?
                                "enabled" : "disabled");
@@ -3040,7 +3038,7 @@ void pci_fixup_device(enum pci_fixup_pass pass, struct pci_dev *dev)
 {
        struct pci_fixup *start, *end;
-        switch(pass) {
+        switch (pass) {
        case pci_fixup_early:
                start = __start_pci_fixups_early;
                end = __end_pci_fixups_early;
diff --git a/drivers/pci/rom.c b/drivers/pci/rom.c
index 7fdd2200c9cb..f955edb9bea7 100644
--- a/drivers/pci/rom.c
+++ b/drivers/pci/rom.c
@@ -137,7 +137,7 @@ void __iomem *pci_map_rom(struct pci_dev *pdev, size_t *size)
                } else {
                        /* assign the ROM an address if it doesn't have one */
                        if (res->parent == NULL &&
-                            pci_assign_resource(pdev,PCI_ROM_RESOURCE))
+                            pci_assign_resource(pdev, PCI_ROM_RESOURCE))
                                return NULL;
                        start = pci_resource_start(pdev, PCI_ROM_RESOURCE);
                        *size = pci_resource_len(pdev, PCI_ROM_RESOURCE);
@@ -203,7 +203,7 @@ void pci_cleanup_rom(struct pci_dev *pdev)
        struct resource *res = &pdev->resource[PCI_ROM_RESOURCE];
        if (res->flags & IORESOURCE_ROM_COPY) {
-                kfree((void*)(unsigned long)res->start);
+                kfree((void *)(unsigned long)res->start);
                res->flags |= IORESOURCE_UNSET;
                res->flags &= ~IORESOURCE_ROM_COPY;
                res->start = 0;
diff --git a/drivers/pci/search.c b/drivers/pci/search.c
index a66ed7525841..827ad831f1dd 100644
--- a/drivers/pci/search.c
+++ b/drivers/pci/search.c
@@ -110,8 +110,7 @@ int pci_for_each_dma_alias(struct pci_dev *pdev,
 * legacy PCI bridge and the bridge is directly connected to bus 0), return its
 * parent
 */
-struct pci_dev *
+struct pci_dev *pci_find_upstream_pcie_bridge(struct pci_dev *pdev)
-pci_find_upstream_pcie_bridge(struct pci_dev *pdev)
 {
        struct pci_dev *tmp = NULL;
@@ -143,12 +142,12 @@ static struct pci_bus *pci_do_find_bus(struct pci_bus *bus, unsigned char busnr)
        struct pci_bus *child;
        struct pci_bus *tmp;
-        if(bus->number == busnr)
+        if (bus->number == busnr)
                return bus;
        list_for_each_entry(tmp, &bus->children, node) {
                child = pci_do_find_bus(tmp, busnr);
-                if(child)
+                if (child)
                        return child;
        }
        return NULL;
@@ -163,7 +162,7 @@ static struct pci_bus *pci_do_find_bus(struct pci_bus *bus, unsigned char busnr)
 * in the global list of PCI buses.  If the bus is found, a pointer to its
 * data structure is returned.  If no bus is found, %NULL is returned.
 */
-struct pci_bus * pci_find_bus(int domain, int busnr)
+struct pci_bus *pci_find_bus(int domain, int busnr)
 {
        struct pci_bus *bus = NULL;
        struct pci_bus *tmp_bus;
@@ -188,8 +187,7 @@ EXPORT_SYMBOL(pci_find_bus);
 * @from is not %NULL, searches continue from next device on the
 * global list.
 */
-struct pci_bus *
+struct pci_bus *pci_find_next_bus(const struct pci_bus *from)
-pci_find_next_bus(const struct pci_bus *from)
 {
        struct list_head *n;
        struct pci_bus *b = NULL;
@@ -357,8 +355,8 @@ EXPORT_SYMBOL(pci_get_subsys);
 * from next device on the global list.  The reference count for @from is
 * always decremented if it is not %NULL.
 */
-struct pci_dev *
+struct pci_dev *pci_get_device(unsigned int vendor, unsigned int device,
-pci_get_device(unsigned int vendor, unsigned int device, struct pci_dev *from)
+                               struct pci_dev *from)
 {
        return pci_get_subsys(vendor, device, PCI_ANY_ID, PCI_ANY_ID, from);
 }
diff --git a/drivers/pci/setup-bus.c b/drivers/pci/setup-bus.c
index fd9b545c3cf5..2f053922dd5c 100644
--- a/drivers/pci/setup-bus.c
+++ b/drivers/pci/setup-bus.c
@@ -68,7 +68,7 @@ static int add_to_list(struct list_head *head,
        tmp = kzalloc(sizeof(*tmp), GFP_KERNEL);
        if (!tmp) {
-                pr_warning("add_to_list: kmalloc() failed!\n");
+                pr_warn("add_to_list: kmalloc() failed!\n");
                return -ENOMEM;
        }
@@ -736,7 +736,7 @@ static resource_size_t calculate_iosize(resource_size_t size,
 {
        if (size < min_size)
                size = min_size;
-        if (old_size == 1 )
+        if (old_size == 1)
                old_size = 0;
        /* To be fixed in 2.5: we should have sort of HAVE_ISA
           flag in the struct pci_bus. */
@@ -757,7 +757,7 @@ static resource_size_t calculate_memsize(resource_size_t size,
 {
        if (size < min_size)
                size = min_size;
-        if (old_size == 1 )
+        if (old_size == 1)
                old_size = 0;
        if (size < old_size)
                size = old_size;
@@ -1430,10 +1430,10 @@ static void pci_bus_dump_res(struct pci_bus *bus)
        pci_bus_for_each_resource(bus, res, i) {
                if (!res || !res->end || !res->flags)
-                        continue;
+                        continue;
                dev_printk(KERN_DEBUG, &bus->dev, "resource %d %pR\n", i, res);
-        }
+        }
 }
 static void pci_bus_dump_resources(struct pci_bus *bus)
@@ -1458,7 +1458,7 @@ static int pci_bus_get_depth(struct pci_bus *bus)
        int depth = 0;
        struct pci_bus *child_bus;
-        list_for_each_entry(child_bus, &bus->children, node){
+        list_for_each_entry(child_bus, &bus->children, node) {
                int ret;
                ret = pci_bus_get_depth(child_bus);
diff --git a/drivers/pci/setup-irq.c b/drivers/pci/setup-irq.c
index dbc4ffcf42de..4e2d595d50ca 100644
--- a/drivers/pci/setup-irq.c
+++ b/drivers/pci/setup-irq.c
@@ -22,10 +22,9 @@ void __weak pcibios_update_irq(struct pci_dev *dev, int irq)
        pci_write_config_byte(dev, PCI_INTERRUPT_LINE, irq);
 }
-static void
+static void pdev_fixup_irq(struct pci_dev *dev,
-pdev_fixup_irq(struct pci_dev *dev,
+                           u8 (*swizzle)(struct pci_dev *, u8 *),
-               u8 (*swizzle)(struct pci_dev *, u8 *),
+                           int (*map_irq)(const struct pci_dev *, u8, u8))
-               int (*map_irq)(const struct pci_dev *, u8, u8))
 {
        u8 pin, slot;
        int irq = 0;
@@ -58,11 +57,11 @@ pdev_fixup_irq(struct pci_dev *dev,
        pcibios_update_irq(dev, irq);
 }
-void
+void pci_fixup_irqs(u8 (*swizzle)(struct pci_dev *, u8 *),
-pci_fixup_irqs(u8 (*swizzle)(struct pci_dev *, u8 *),
+                    int (*map_irq)(const struct pci_dev *, u8, u8))
-               int (*map_irq)(const struct pci_dev *, u8, u8))
 {
        struct pci_dev *dev = NULL;
        for_each_pci_dev(dev)
                pdev_fixup_irq(dev, swizzle, map_irq);
 }
diff --git a/drivers/pci/syscall.c b/drivers/pci/syscall.c
index 24750a1b39b6..b91c4da68365 100644
--- a/drivers/pci/syscall.c
+++ b/drivers/pci/syscall.c
@@ -99,7 +99,7 @@ SYSCALL_DEFINE5(pciconfig_write, unsigned long, bus, unsigned long, dfn,
        if (!dev)
                return -ENODEV;
-        switch(len) {
+        switch (len) {
        case 1:
                err = get_user(byte, (u8 __user *)buf);
                if (err)