Skip to content

Commit

Permalink
PCI: Whitespace cleanup
Browse files Browse the repository at this point in the history 
Fix various whitespace errors.

No functional change.

[bhelgaas: fix other similar problems]
Signed-off-by: Ryan Desfosses <ryan@desfo.org>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
  • Loading branch information
Ryan Desfosses authored and Bjorn Helgaas committed Jun 11, 2014
1 parent b7fe943 commit 3c78bc6
Show file tree
Hide file tree
Showing 45 changed files with 517 additions and 588 deletions.
17 changes: 9 additions & 8 deletions drivers/pci/host/pci-mvebu.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 *
mvebu_pcie_find_port(struct mvebu_pcie *pcie, struct pci_bus *bus,
int devfn)
static struct mvebu_pcie_port *mvebu_pcie_find_port(struct mvebu_pcie *pcie,
struct pci_bus *bus,
int devfn)
{
int i;

Expand Down Expand Up @@ -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,
resource_size_t start,
resource_size_t size,
resource_size_t align)
const struct resource *res,
resource_size_t start,
resource_size_t size,
resource_size_t align)
{
if (dev->bus->number != 0)
return start;
Expand Down Expand Up @@ -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;
Expand Down
18 changes: 9 additions & 9 deletions drivers/pci/hotplug/cpci_hotplug.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);
u8 (*get_power) (struct slot* slot);
int (*set_power) (struct slot* slot, int value);
int (*hardware_test) (struct slot *slot, u32 value);
u8 (*get_power) (struct slot *slot);
int (*set_power) (struct slot *slot, int value);
};

struct cpci_hp_controller {
Expand Down Expand Up @@ -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_ext(struct slot * slot);
int cpci_clear_ext(struct slot * slot);
int cpci_led_on(struct slot * slot);
int cpci_led_off(struct slot * slot);
int cpci_check_and_clear_ins(struct slot *slot);
int cpci_check_ext(struct slot *slot);
int cpci_clear_ext(struct slot *slot);
int cpci_led_on(struct slot *slot);
int cpci_led_off(struct slot *slot);
int cpci_configure_slot(struct slot *slot);
int cpci_unconfigure_slot(struct slot *slot);

Expand Down
18 changes: 9 additions & 9 deletions drivers/pci/hotplug/cpci_hotplug_core.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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_attention_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_power_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_latch_status(struct hotplug_slot *slot, u8 *value);

static struct hotplug_slot_ops cpci_hotplug_slot_ops = {
.enable_slot = enable_slot,
Expand Down Expand Up @@ -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;

Expand All @@ -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;

Expand All @@ -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;
Expand Down Expand Up @@ -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);
Expand Down
18 changes: 9 additions & 9 deletions drivers/pci/hotplug/cpci_hotplug_pci.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
Expand All @@ -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;
Expand All @@ -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;
Expand Down Expand Up @@ -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;
Expand All @@ -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;
Expand All @@ -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;
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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;

Expand Down
8 changes: 4 additions & 4 deletions drivers/pci/hotplug/cpcihp_generic.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -78,8 +78,8 @@ static struct cpci_hp_controller generic_hpc;

static int __init validate_parameters(void)
{
char* str;
char* p;
char *str;
char *p;
unsigned long tmp;

if(!bridge) {
Expand Down Expand Up @@ -142,8 +142,8 @@ static int query_enum(void)
static int __init cpcihp_generic_init(void)
{
int status;
struct resource* r;
struct pci_dev* dev;
struct resource *r;
struct pci_dev *dev;

info(DRIVER_DESC " version: " DRIVER_VERSION);
status = validate_parameters();
Expand Down
2 changes: 1 addition & 1 deletion drivers/pci/hotplug/cpcihp_zt5550.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
4 changes: 2 additions & 2 deletions drivers/pci/hotplug/cpqphp.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand All @@ -278,7 +278,7 @@ struct slot {
};

struct pci_resource {
struct pci_resource * next;
struct pci_resource *next;
u32 base;
u32 length;
};
Expand Down
6 changes: 3 additions & 3 deletions drivers/pci/hotplug/cpqphp_core.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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;

Expand Down
26 changes: 13 additions & 13 deletions drivers/pci/hotplug/cpqphp_ctrl.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand All @@ -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;
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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;

Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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;

Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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;

Expand Down Expand Up @@ -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,
u8 behind_bridge, struct resource_lists * resources)
static u32 configure_new_device(struct controller *ctrl, struct pci_func *func,
u8 behind_bridge, struct resource_lists *resources)
{
u8 temp_byte, function, max_functions, stop_it;
int rc;
Expand Down
Loading

0 comments on commit 3c78bc6

Please sign in to comment.