system/linux
system/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux synced 2024-09-20 02:57:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

PCI: Add space before open parenthesis

Browse source 
Add space before open parenthesis as is conventional.

No functional change.

[bhelgaas: fix a few more in ibmphp, shpchp]
Signed-off-by: Quentin Lambert <lambert.quentin@gmail.com>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
This commit is contained in:
Quentin Lambert 2014-09-07 20:02:04 +02:00 committed by Bjorn Helgaas
parent 52addcf9d6
commit 382a9c9adc
8 changed files with 39 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
drivers/pci/hotplug/acpiphp_ibm.c
View file

@ -302,7 +302,7 @@ static int ibm_get_table_from_acpi(char **bufp)
goto read_table_done; goto read_table_done;
} }
for(size = 0, i = 0; i < package->package.count; i++) { for (size = 0, i = 0; i < package->package.count; i++) {
if (package->package.elements[i].type != ACPI_TYPE_BUFFER) { if (package->package.elements[i].type != ACPI_TYPE_BUFFER) {
pr_err("%s: Invalid APCI element %d\n", __func__, i); pr_err("%s: Invalid APCI element %d\n", __func__, i);
goto read_table_done; goto read_table_done;

28
drivers/pci/hotplug/cpcihp_generic.c
View file

@ -56,7 +56,7 @@
if (debug) \ if (debug) \
printk (KERN_DEBUG "%s: " format "\n", \ printk (KERN_DEBUG "%s: " format "\n", \
MY_NAME , ## arg); \ MY_NAME , ## arg); \
} while(0) } while (0)
#define err(format, arg...) printk(KERN_ERR "%s: " format "\n", MY_NAME , ## arg) #define err(format, arg...) printk(KERN_ERR "%s: " format "\n", MY_NAME , ## arg)
#define info(format, arg...) printk(KERN_INFO "%s: " format "\n", MY_NAME , ## arg) #define info(format, arg...) printk(KERN_INFO "%s: " format "\n", MY_NAME , ## arg)
#define warn(format, arg...) printk(KERN_WARNING "%s: " format "\n", MY_NAME , ## arg) #define warn(format, arg...) printk(KERN_WARNING "%s: " format "\n", MY_NAME , ## arg)
@ -82,28 +82,28 @@ static int __init validate_parameters(void)
char *p; char *p;
unsigned long tmp; unsigned long tmp;
if(!bridge) { if (!bridge) {
info("not configured, disabling."); info("not configured, disabling.");
return -EINVAL; return -EINVAL;
} }
str = bridge; str = bridge;
if(!*str) if (!*str)
return -EINVAL; return -EINVAL;
tmp = simple_strtoul(str, &p, 16); tmp = simple_strtoul(str, &p, 16);
if(p == str || tmp > 0xff) { if (p == str || tmp > 0xff) {
err("Invalid hotplug bus bridge device bus number"); err("Invalid hotplug bus bridge device bus number");
return -EINVAL; return -EINVAL;
} }
bridge_busnr = (u8) tmp; bridge_busnr = (u8) tmp;
dbg("bridge_busnr = 0x%02x", bridge_busnr); dbg("bridge_busnr = 0x%02x", bridge_busnr);
if(*p != ':') { if (*p != ':') {
err("Invalid hotplug bus bridge device"); err("Invalid hotplug bus bridge device");
return -EINVAL; return -EINVAL;
} }
str = p + 1; str = p + 1;
tmp = simple_strtoul(str, &p, 16); tmp = simple_strtoul(str, &p, 16);
if(p == str || tmp > 0x1f) { if (p == str || tmp > 0x1f) {
err("Invalid hotplug bus bridge device slot number"); err("Invalid hotplug bus bridge device slot number");
return -EINVAL; return -EINVAL;
} }
@ -112,18 +112,18 @@ static int __init validate_parameters(void)
dbg("first_slot = 0x%02x", first_slot); dbg("first_slot = 0x%02x", first_slot);
dbg("last_slot = 0x%02x", last_slot); dbg("last_slot = 0x%02x", last_slot);
if(!(first_slot && last_slot)) { if (!(first_slot && last_slot)) {
err("Need to specify first_slot and last_slot"); err("Need to specify first_slot and last_slot");
return -EINVAL; return -EINVAL;
} }
if(last_slot < first_slot) { if (last_slot < first_slot) {
err("first_slot must be less than last_slot"); err("first_slot must be less than last_slot");
return -EINVAL; return -EINVAL;
} }
dbg("port = 0x%04x", port); dbg("port = 0x%04x", port);
dbg("enum_bit = 0x%02x", enum_bit); dbg("enum_bit = 0x%02x", enum_bit);
if(enum_bit > 7) { if (enum_bit > 7) {
err("Invalid #ENUM bit"); err("Invalid #ENUM bit");
return -EINVAL; return -EINVAL;
} }
@ -151,12 +151,12 @@ static int __init cpcihp_generic_init(void)
return status; return status;
r = request_region(port, 1, "#ENUM hotswap signal register"); r = request_region(port, 1, "#ENUM hotswap signal register");
if(!r) if (!r)
return -EBUSY; return -EBUSY;
dev = pci_get_domain_bus_and_slot(0, bridge_busnr, dev = pci_get_domain_bus_and_slot(0, bridge_busnr,
PCI_DEVFN(bridge_slot, 0)); PCI_DEVFN(bridge_slot, 0));
if(!dev || dev->hdr_type != PCI_HEADER_TYPE_BRIDGE) { if (!dev || dev->hdr_type != PCI_HEADER_TYPE_BRIDGE) {
err("Invalid bridge device %s", bridge); err("Invalid bridge device %s", bridge);
pci_dev_put(dev); pci_dev_put(dev);
return -EINVAL; return -EINVAL;
@ -169,21 +169,21 @@ static int __init cpcihp_generic_init(void)
generic_hpc.ops = &generic_hpc_ops; generic_hpc.ops = &generic_hpc_ops;
status = cpci_hp_register_controller(&generic_hpc); status = cpci_hp_register_controller(&generic_hpc);
if(status != 0) { if (status != 0) {
err("Could not register cPCI hotplug controller"); err("Could not register cPCI hotplug controller");
return -ENODEV; return -ENODEV;
} }
dbg("registered controller"); dbg("registered controller");
status = cpci_hp_register_bus(bus, first_slot, last_slot); status = cpci_hp_register_bus(bus, first_slot, last_slot);
if(status != 0) { if (status != 0) {
err("Could not register cPCI hotplug bus"); err("Could not register cPCI hotplug bus");
goto init_bus_register_error; goto init_bus_register_error;
} }
dbg("registered bus"); dbg("registered bus");
status = cpci_hp_start(); status = cpci_hp_start();
if(status != 0) { if (status != 0) {
err("Could not started cPCI hotplug system"); err("Could not started cPCI hotplug system");
goto init_start_error; goto init_start_error;
} }

36
drivers/pci/hotplug/cpcihp_zt5550.c
View file

@ -51,7 +51,7 @@
if (debug) \ if (debug) \
printk (KERN_DEBUG "%s: " format "\n", \ printk (KERN_DEBUG "%s: " format "\n", \
MY_NAME , ## arg); \ MY_NAME , ## arg); \
} while(0) } while (0)
#define err(format, arg...) printk(KERN_ERR "%s: " format "\n", MY_NAME , ## arg) #define err(format, arg...) printk(KERN_ERR "%s: " format "\n", MY_NAME , ## arg)
#define info(format, arg...) printk(KERN_INFO "%s: " format "\n", MY_NAME , ## arg) #define info(format, arg...) printk(KERN_INFO "%s: " format "\n", MY_NAME , ## arg)
#define warn(format, arg...) printk(KERN_WARNING "%s: " format "\n", MY_NAME , ## arg) #define warn(format, arg...) printk(KERN_WARNING "%s: " format "\n", MY_NAME , ## arg)
@ -82,13 +82,13 @@ static int zt5550_hc_config(struct pci_dev *pdev)
int ret; int ret;
/* Since we know that no boards exist with two HC chips, treat it as an error */ /* Since we know that no boards exist with two HC chips, treat it as an error */
if(hc_dev) { if (hc_dev) {
err("too many host controller devices?"); err("too many host controller devices?");
return -EBUSY; return -EBUSY;
} }
ret = pci_enable_device(pdev); ret = pci_enable_device(pdev);
if(ret) { if (ret) {
err("cannot enable %s\n", pci_name(pdev)); err("cannot enable %s\n", pci_name(pdev));
return ret; return ret;
} }
@ -98,7 +98,7 @@ static int zt5550_hc_config(struct pci_dev *pdev)
dbg("pci resource start %llx", (unsigned long long)pci_resource_start(hc_dev, 1)); dbg("pci resource start %llx", (unsigned long long)pci_resource_start(hc_dev, 1));
dbg("pci resource len %llx", (unsigned long long)pci_resource_len(hc_dev, 1)); dbg("pci resource len %llx", (unsigned long long)pci_resource_len(hc_dev, 1));
if(!request_mem_region(pci_resource_start(hc_dev, 1), if (!request_mem_region(pci_resource_start(hc_dev, 1),
pci_resource_len(hc_dev, 1), MY_NAME)) { pci_resource_len(hc_dev, 1), MY_NAME)) {
err("cannot reserve MMIO region"); err("cannot reserve MMIO region");
ret = -ENOMEM; ret = -ENOMEM;
@ -107,7 +107,7 @@ static int zt5550_hc_config(struct pci_dev *pdev)
hc_registers = hc_registers =
ioremap(pci_resource_start(hc_dev, 1), pci_resource_len(hc_dev, 1)); ioremap(pci_resource_start(hc_dev, 1), pci_resource_len(hc_dev, 1));
if(!hc_registers) { if (!hc_registers) {
err("cannot remap MMIO region %llx @ %llx", err("cannot remap MMIO region %llx @ %llx",
(unsigned long long)pci_resource_len(hc_dev, 1), (unsigned long long)pci_resource_len(hc_dev, 1),
(unsigned long long)pci_resource_start(hc_dev, 1)); (unsigned long long)pci_resource_start(hc_dev, 1));
@ -146,7 +146,7 @@ static int zt5550_hc_config(struct pci_dev *pdev)
static int zt5550_hc_cleanup(void) static int zt5550_hc_cleanup(void)
{ {
if(!hc_dev) if (!hc_dev)
return -ENODEV; return -ENODEV;
iounmap(hc_registers); iounmap(hc_registers);
@ -170,9 +170,9 @@ static int zt5550_hc_check_irq(void *dev_id)
u8 reg; u8 reg;
ret = 0; ret = 0;
if(dev_id == zt5550_hpc.dev_id) { if (dev_id == zt5550_hpc.dev_id) {
reg = readb(csr_int_status); reg = readb(csr_int_status);
if(reg) if (reg)
ret = 1; ret = 1;
} }
return ret; return ret;
@ -182,7 +182,7 @@ static int zt5550_hc_enable_irq(void)
{ {
u8 reg; u8 reg;
if(hc_dev == NULL) { if (hc_dev == NULL) {
return -ENODEV; return -ENODEV;
} }
reg = readb(csr_int_mask); reg = readb(csr_int_mask);
@ -195,7 +195,7 @@ static int zt5550_hc_disable_irq(void)
{ {
u8 reg; u8 reg;
if(hc_dev == NULL) { if (hc_dev == NULL) {
return -ENODEV; return -ENODEV;
} }
@ -210,7 +210,7 @@ static int zt5550_hc_init_one (struct pci_dev *pdev, const struct pci_device_id
int status; int status;
status = zt5550_hc_config(pdev); status = zt5550_hc_config(pdev);
if(status != 0) { if (status != 0) {
return status; return status;
} }
dbg("returned from zt5550_hc_config"); dbg("returned from zt5550_hc_config");
@ -218,7 +218,7 @@ static int zt5550_hc_init_one (struct pci_dev *pdev, const struct pci_device_id
memset(&zt5550_hpc, 0, sizeof (struct cpci_hp_controller)); memset(&zt5550_hpc, 0, sizeof (struct cpci_hp_controller));
zt5550_hpc_ops.query_enum = zt5550_hc_query_enum; zt5550_hpc_ops.query_enum = zt5550_hc_query_enum;
zt5550_hpc.ops = &zt5550_hpc_ops; zt5550_hpc.ops = &zt5550_hpc_ops;
if(!poll) { if (!poll) {
zt5550_hpc.irq = hc_dev->irq; zt5550_hpc.irq = hc_dev->irq;
zt5550_hpc.irq_flags = IRQF_SHARED; zt5550_hpc.irq_flags = IRQF_SHARED;
zt5550_hpc.dev_id = hc_dev; zt5550_hpc.dev_id = hc_dev;
@ -231,14 +231,14 @@ static int zt5550_hc_init_one (struct pci_dev *pdev, const struct pci_device_id
} }
status = cpci_hp_register_controller(&zt5550_hpc); status = cpci_hp_register_controller(&zt5550_hpc);
if(status != 0) { if (status != 0) {
err("could not register cPCI hotplug controller"); err("could not register cPCI hotplug controller");
goto init_hc_error; goto init_hc_error;
} }
dbg("registered controller"); dbg("registered controller");
/* Look for first device matching cPCI bus's bridge vendor and device IDs */ /* Look for first device matching cPCI bus's bridge vendor and device IDs */
if(!(bus0_dev = pci_get_device(PCI_VENDOR_ID_DEC, if (!(bus0_dev = pci_get_device(PCI_VENDOR_ID_DEC,
PCI_DEVICE_ID_DEC_21154, NULL))) { PCI_DEVICE_ID_DEC_21154, NULL))) {
status = -ENODEV; status = -ENODEV;
goto init_register_error; goto init_register_error;
@ -247,14 +247,14 @@ static int zt5550_hc_init_one (struct pci_dev *pdev, const struct pci_device_id
pci_dev_put(bus0_dev); pci_dev_put(bus0_dev);
status = cpci_hp_register_bus(bus0, 0x0a, 0x0f); status = cpci_hp_register_bus(bus0, 0x0a, 0x0f);
if(status != 0) { if (status != 0) {
err("could not register cPCI hotplug bus"); err("could not register cPCI hotplug bus");
goto init_register_error; goto init_register_error;
} }
dbg("registered bus"); dbg("registered bus");
status = cpci_hp_start(); status = cpci_hp_start();
if(status != 0) { if (status != 0) {
err("could not started cPCI hotplug system"); err("could not started cPCI hotplug system");
cpci_hp_unregister_bus(bus0); cpci_hp_unregister_bus(bus0);
goto init_register_error; goto init_register_error;
@ -300,11 +300,11 @@ static int __init zt5550_init(void)
info(DRIVER_DESC " version: " DRIVER_VERSION); info(DRIVER_DESC " version: " DRIVER_VERSION);
r = request_region(ENUM_PORT, 1, "#ENUM hotswap signal register"); r = request_region(ENUM_PORT, 1, "#ENUM hotswap signal register");
if(!r) if (!r)
return -EBUSY; return -EBUSY;
rc = pci_register_driver(&zt5550_hc_driver); rc = pci_register_driver(&zt5550_hc_driver);
if(rc < 0) if (rc < 0)
release_region(ENUM_PORT, 1); release_region(ENUM_PORT, 1);
return rc; return rc;
} }

2
drivers/pci/hotplug/cpqphp.h
View file

@ -690,7 +690,7 @@ static inline int cpq_get_latch_status(struct controller *ctrl,
status = (readl(ctrl->hpc_reg + INT_INPUT_CLEAR) & (0x01L << hp_slot)); status = (readl(ctrl->hpc_reg + INT_INPUT_CLEAR) & (0x01L << hp_slot));
return(status == 0) ? 1 : 0; return (status == 0) ? 1 : 0;
} }

4
drivers/pci/hotplug/cpqphp_ctrl.c
View file

@ -1143,7 +1143,7 @@ static u8 set_controller_speed(struct controller *ctrl, u8 adapter_speed, u8 hp_
/* We don't allow freq/mode changes if we find another adapter running /* We don't allow freq/mode changes if we find another adapter running
* in another slot on this controller * in another slot on this controller
*/ */
for(slot = ctrl->slot; slot; slot = slot->next) { for (slot = ctrl->slot; slot; slot = slot->next) {
if (slot->device == (hp_slot + ctrl->slot_device_offset)) if (slot->device == (hp_slot + ctrl->slot_device_offset))
continue; continue;
if (!slot->hotplug_slot || !slot->hotplug_slot->info) if (!slot->hotplug_slot || !slot->hotplug_slot->info)
@ -1193,7 +1193,7 @@ static u8 set_controller_speed(struct controller *ctrl, u8 adapter_speed, u8 hp_
reg16 = readw(ctrl->hpc_reg + NEXT_CURR_FREQ); reg16 = readw(ctrl->hpc_reg + NEXT_CURR_FREQ);
reg16 &= ~0x000F; reg16 &= ~0x000F;
switch(adapter_speed) { switch (adapter_speed) {
case(PCI_SPEED_133MHz_PCIX): case(PCI_SPEED_133MHz_PCIX):
reg = 0x75; reg = 0x75;
reg16 |= 0xB; reg16 |= 0xB;

2
drivers/pci/hotplug/ibmphp_res.c
View file

@ -1335,7 +1335,7 @@ int ibmphp_check_resource (struct resource_node *res, u8 bridge)
return -EINVAL; return -EINVAL;
} }
} }
} /* end if(!res_cur) */ } /* end if (!res_cur) */
return -EINVAL; return -EINVAL;
} }

2
drivers/pci/hotplug/shpchp_ctrl.c
View file

@ -595,7 +595,7 @@ static int shpchp_enable_slot (struct slot *p_slot)
ctrl_dbg(ctrl, "%s: p_slot->pwr_save %x\n", __func__, p_slot->pwr_save); ctrl_dbg(ctrl, "%s: p_slot->pwr_save %x\n", __func__, p_slot->pwr_save);
p_slot->hpc_ops->get_latch_status(p_slot, &getstatus); p_slot->hpc_ops->get_latch_status(p_slot, &getstatus);
if(((p_slot->ctrl->pci_dev->vendor == PCI_VENDOR_ID_AMD) || if (((p_slot->ctrl->pci_dev->vendor == PCI_VENDOR_ID_AMD) ||
(p_slot->ctrl->pci_dev->device == PCI_DEVICE_ID_AMD_POGO_7458)) (p_slot->ctrl->pci_dev->device == PCI_DEVICE_ID_AMD_POGO_7458))
&& p_slot->ctrl->num_slots == 1) { && p_slot->ctrl->num_slots == 1) {
/* handle amd pogo errata; this must be done before enable */ /* handle amd pogo errata; this must be done before enable */

2
drivers/pci/hotplug/shpchp_hpc.c
View file

@ -798,7 +798,7 @@ static irqreturn_t shpc_isr(int irq, void *dev_id)
ctrl_dbg(ctrl, "%s: intr_loc = %x\n", __func__, intr_loc); ctrl_dbg(ctrl, "%s: intr_loc = %x\n", __func__, intr_loc);
if(!shpchp_poll_mode) { if (!shpchp_poll_mode) {
/* /*
* Mask Global Interrupt Mask - see implementation * Mask Global Interrupt Mask - see implementation
* note on p. 139 of SHPC spec rev 1.0 * note on p. 139 of SHPC spec rev 1.0