Commit ff3ce480 authored by Bogicevic Sasa's avatar Bogicevic Sasa Committed by Bjorn Helgaas

PCI: Fix all whitespace issues

Fix all whitespace issues (missing or needed whitespace) in all files in
drivers/pci.  Code is compiled with allyesconfig before and after code
changes and objects are recorded and checked with objdiff and they are not
changed after this commit.
Signed-off-by: default avatarBogicevic Sasa <brutallesale@gmail.com>
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
parent 1d1e8cdc
...@@ -25,7 +25,7 @@ DEFINE_RAW_SPINLOCK(pci_lock); ...@@ -25,7 +25,7 @@ DEFINE_RAW_SPINLOCK(pci_lock);
#define PCI_word_BAD (pos & 1) #define PCI_word_BAD (pos & 1)
#define PCI_dword_BAD (pos & 3) #define PCI_dword_BAD (pos & 3)
#define PCI_OP_READ(size,type,len) \ #define PCI_OP_READ(size, type, len) \
int pci_bus_read_config_##size \ int pci_bus_read_config_##size \
(struct pci_bus *bus, unsigned int devfn, int pos, type *value) \ (struct pci_bus *bus, unsigned int devfn, int pos, type *value) \
{ \ { \
...@@ -40,7 +40,7 @@ int pci_bus_read_config_##size \ ...@@ -40,7 +40,7 @@ int pci_bus_read_config_##size \
return res; \ return res; \
} }
#define PCI_OP_WRITE(size,type,len) \ #define PCI_OP_WRITE(size, type, len) \
int pci_bus_write_config_##size \ int pci_bus_write_config_##size \
(struct pci_bus *bus, unsigned int devfn, int pos, type value) \ (struct pci_bus *bus, unsigned int devfn, int pos, type value) \
{ \ { \
...@@ -231,7 +231,7 @@ static noinline void pci_wait_cfg(struct pci_dev *dev) ...@@ -231,7 +231,7 @@ static noinline void pci_wait_cfg(struct pci_dev *dev)
} }
/* Returns 0 on success, negative values indicate error. */ /* Returns 0 on success, negative values indicate error. */
#define PCI_USER_READ_CONFIG(size,type) \ #define PCI_USER_READ_CONFIG(size, type) \
int pci_user_read_config_##size \ int pci_user_read_config_##size \
(struct pci_dev *dev, int pos, type *val) \ (struct pci_dev *dev, int pos, type *val) \
{ \ { \
...@@ -251,7 +251,7 @@ int pci_user_read_config_##size \ ...@@ -251,7 +251,7 @@ int pci_user_read_config_##size \
EXPORT_SYMBOL_GPL(pci_user_read_config_##size); EXPORT_SYMBOL_GPL(pci_user_read_config_##size);
/* Returns 0 on success, negative values indicate error. */ /* Returns 0 on success, negative values indicate error. */
#define PCI_USER_WRITE_CONFIG(size,type) \ #define PCI_USER_WRITE_CONFIG(size, type) \
int pci_user_write_config_##size \ int pci_user_write_config_##size \
(struct pci_dev *dev, int pos, type val) \ (struct pci_dev *dev, int pos, type val) \
{ \ { \
......
...@@ -122,7 +122,7 @@ static int pcie_phy_wait_ack(void __iomem *dbi_base, int addr) ...@@ -122,7 +122,7 @@ static int pcie_phy_wait_ack(void __iomem *dbi_base, int addr)
} }
/* Read from the 16-bit PCIe PHY control registers (not memory-mapped) */ /* Read from the 16-bit PCIe PHY control registers (not memory-mapped) */
static int pcie_phy_read(void __iomem *dbi_base, int addr , int *data) static int pcie_phy_read(void __iomem *dbi_base, int addr, int *data)
{ {
u32 val, phy_ctl; u32 val, phy_ctl;
int ret; int ret;
......
...@@ -36,10 +36,10 @@ ...@@ -36,10 +36,10 @@
#define MY_NAME "acpi_pcihp" #define MY_NAME "acpi_pcihp"
#define dbg(fmt, arg...) do { if (debug_acpi) printk(KERN_DEBUG "%s: %s: " fmt , MY_NAME , __func__ , ## arg); } while (0) #define dbg(fmt, arg...) do { if (debug_acpi) printk(KERN_DEBUG "%s: %s: " fmt, MY_NAME, __func__, ## arg); } while (0)
#define err(format, arg...) printk(KERN_ERR "%s: " format , MY_NAME , ## arg) #define err(format, arg...) printk(KERN_ERR "%s: " format, MY_NAME, ## arg)
#define info(format, arg...) printk(KERN_INFO "%s: " format , MY_NAME , ## arg) #define info(format, arg...) printk(KERN_INFO "%s: " format, MY_NAME, ## arg)
#define warn(format, arg...) printk(KERN_WARNING "%s: " format , MY_NAME , ## arg) #define warn(format, arg...) printk(KERN_WARNING "%s: " format, MY_NAME, ## arg)
#define METHOD_NAME__SUN "_SUN" #define METHOD_NAME__SUN "_SUN"
#define METHOD_NAME_OSHP "OSHP" #define METHOD_NAME_OSHP "OSHP"
...@@ -132,7 +132,7 @@ int acpi_get_hp_hw_control_from_firmware(struct pci_dev *pdev, u32 flags) ...@@ -132,7 +132,7 @@ int acpi_get_hp_hw_control_from_firmware(struct pci_dev *pdev, u32 flags)
while (handle) { while (handle) {
acpi_get_name(handle, ACPI_FULL_PATHNAME, &string); acpi_get_name(handle, ACPI_FULL_PATHNAME, &string);
dbg("Trying to get hotplug control for %s \n", dbg("Trying to get hotplug control for %s\n",
(char *)string.pointer); (char *)string.pointer);
status = acpi_run_oshp(handle); status = acpi_run_oshp(handle);
if (ACPI_SUCCESS(status)) if (ACPI_SUCCESS(status))
......
...@@ -181,7 +181,7 @@ struct acpiphp_attention_info ...@@ -181,7 +181,7 @@ struct acpiphp_attention_info
/* function prototypes */ /* function prototypes */
/* acpiphp_core.c */ /* acpiphp_core.c */
int acpiphp_register_attention(struct acpiphp_attention_info*info); int acpiphp_register_attention(struct acpiphp_attention_info *info);
int acpiphp_unregister_attention(struct acpiphp_attention_info *info); int acpiphp_unregister_attention(struct acpiphp_attention_info *info);
int acpiphp_register_hotplug_slot(struct acpiphp_slot *slot, unsigned int sun); int acpiphp_register_hotplug_slot(struct acpiphp_slot *slot, unsigned int sun);
void acpiphp_unregister_hotplug_slot(struct acpiphp_slot *slot); void acpiphp_unregister_hotplug_slot(struct acpiphp_slot *slot);
......
...@@ -63,13 +63,13 @@ MODULE_LICENSE("GPL"); ...@@ -63,13 +63,13 @@ MODULE_LICENSE("GPL");
MODULE_PARM_DESC(disable, "disable acpiphp driver"); MODULE_PARM_DESC(disable, "disable acpiphp driver");
module_param_named(disable, acpiphp_disabled, bool, 0444); module_param_named(disable, acpiphp_disabled, bool, 0444);
static int enable_slot (struct hotplug_slot *slot); static int enable_slot(struct hotplug_slot *slot);
static int disable_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 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_latch_status (struct hotplug_slot *slot, u8 *value); static int get_latch_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 struct hotplug_slot_ops acpi_hotplug_slot_ops = { static struct hotplug_slot_ops acpi_hotplug_slot_ops = {
.enable_slot = enable_slot, .enable_slot = enable_slot,
......
...@@ -707,7 +707,7 @@ static void acpiphp_sanitize_bus(struct pci_bus *bus) ...@@ -707,7 +707,7 @@ static void acpiphp_sanitize_bus(struct pci_bus *bus)
unsigned long type_mask = IORESOURCE_IO | IORESOURCE_MEM; unsigned long type_mask = IORESOURCE_IO | IORESOURCE_MEM;
list_for_each_entry_safe_reverse(dev, tmp, &bus->devices, bus_list) { list_for_each_entry_safe_reverse(dev, tmp, &bus->devices, bus_list) {
for (i=0; i<PCI_BRIDGE_RESOURCES; i++) { for (i = 0; i < PCI_BRIDGE_RESOURCES; i++) {
struct resource *res = &dev->resource[i]; struct resource *res = &dev->resource[i];
if ((res->flags & type_mask) && !res->start && if ((res->flags & type_mask) && !res->start &&
res->end) { res->end) {
......
...@@ -325,7 +325,7 @@ static int ibm_get_table_from_acpi(char **bufp) ...@@ -325,7 +325,7 @@ static int ibm_get_table_from_acpi(char **bufp)
} }
size = 0; size = 0;
for (i=0; i<package->package.count; i++) { for (i = 0; i < package->package.count; i++) {
memcpy(&lbuf[size], memcpy(&lbuf[size],
package->package.elements[i].buffer.pointer, package->package.elements[i].buffer.pointer,
package->package.elements[i].buffer.length); package->package.elements[i].buffer.length);
......
...@@ -52,13 +52,13 @@ struct slot { ...@@ -52,13 +52,13 @@ struct slot {
}; };
struct cpci_hp_controller_ops { struct cpci_hp_controller_ops {
int (*query_enum) (void); int (*query_enum)(void);
int (*enable_irq) (void); int (*enable_irq)(void);
int (*disable_irq) (void); int (*disable_irq)(void);
int (*check_irq) (void *dev_id); 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 { struct cpci_hp_controller {
......
...@@ -45,12 +45,12 @@ ...@@ -45,12 +45,12 @@
#define dbg(format, arg...) \ #define dbg(format, arg...) \
do { \ do { \
if (cpci_debug) \ if (cpci_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)
/* local variables */ /* local variables */
static DECLARE_RWSEM(list_rwsem); static DECLARE_RWSEM(list_rwsem);
...@@ -238,21 +238,21 @@ cpci_hp_register_bus(struct pci_bus *bus, u8 first, u8 last) ...@@ -238,21 +238,21 @@ cpci_hp_register_bus(struct pci_bus *bus, u8 first, u8 last)
* with the pci_hotplug subsystem. * with the pci_hotplug subsystem.
*/ */
for (i = first; i <= last; ++i) { for (i = first; i <= last; ++i) {
slot = kzalloc(sizeof (struct slot), GFP_KERNEL); slot = kzalloc(sizeof(struct slot), GFP_KERNEL);
if (!slot) { if (!slot) {
status = -ENOMEM; status = -ENOMEM;
goto error; goto error;
} }
hotplug_slot = hotplug_slot =
kzalloc(sizeof (struct hotplug_slot), GFP_KERNEL); kzalloc(sizeof(struct hotplug_slot), GFP_KERNEL);
if (!hotplug_slot) { if (!hotplug_slot) {
status = -ENOMEM; status = -ENOMEM;
goto error_slot; goto error_slot;
} }
slot->hotplug_slot = hotplug_slot; slot->hotplug_slot = hotplug_slot;
info = kzalloc(sizeof (struct hotplug_slot_info), GFP_KERNEL); info = kzalloc(sizeof(struct hotplug_slot_info), GFP_KERNEL);
if (!info) { if (!info) {
status = -ENOMEM; status = -ENOMEM;
goto error_hpslot; goto error_hpslot;
......
...@@ -38,12 +38,12 @@ extern int cpci_debug; ...@@ -38,12 +38,12 @@ extern int cpci_debug;
#define dbg(format, arg...) \ #define dbg(format, arg...) \
do { \ do { \
if (cpci_debug) \ if (cpci_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)
u8 cpci_get_attention_status(struct slot *slot) u8 cpci_get_attention_status(struct slot *slot)
......
...@@ -54,12 +54,12 @@ ...@@ -54,12 +54,12 @@
#define dbg(format, arg...) \ #define dbg(format, arg...) \
do { \ do { \
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)
/* local variables */ /* local variables */
static bool debug; static bool debug;
...@@ -164,7 +164,7 @@ static int __init cpcihp_generic_init(void) ...@@ -164,7 +164,7 @@ static int __init cpcihp_generic_init(void)
bus = dev->subordinate; bus = dev->subordinate;
pci_dev_put(dev); pci_dev_put(dev);
memset(&generic_hpc, 0, sizeof (struct cpci_hp_controller)); memset(&generic_hpc, 0, sizeof(struct cpci_hp_controller));
generic_hpc_ops.query_enum = query_enum; generic_hpc_ops.query_enum = query_enum;
generic_hpc.ops = &generic_hpc_ops; generic_hpc.ops = &generic_hpc_ops;
......
...@@ -49,12 +49,12 @@ ...@@ -49,12 +49,12 @@
#define dbg(format, arg...) \ #define dbg(format, arg...) \
do { \ do { \
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)
/* local variables */ /* local variables */
static bool debug; static bool debug;
...@@ -204,7 +204,7 @@ static int zt5550_hc_disable_irq(void) ...@@ -204,7 +204,7 @@ static int zt5550_hc_disable_irq(void)
return 0; return 0;
} }
static int zt5550_hc_init_one (struct pci_dev *pdev, const struct pci_device_id *ent) static int zt5550_hc_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
{ {
int status; int status;
...@@ -214,7 +214,7 @@ static int zt5550_hc_init_one (struct pci_dev *pdev, const struct pci_device_id ...@@ -214,7 +214,7 @@ static int zt5550_hc_init_one (struct pci_dev *pdev, const struct pci_device_id
dbg("returned from zt5550_hc_config"); dbg("returned from zt5550_hc_config");
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) {
......
...@@ -36,10 +36,10 @@ ...@@ -36,10 +36,10 @@
#define MY_NAME "cpqphp" #define MY_NAME "cpqphp"
#define dbg(fmt, arg...) do { if (cpqhp_debug) printk(KERN_DEBUG "%s: " fmt , MY_NAME , ## arg); } while (0) #define dbg(fmt, arg...) do { if (cpqhp_debug) printk(KERN_DEBUG "%s: " fmt, MY_NAME, ## arg); } while (0)
#define err(format, arg...) printk(KERN_ERR "%s: " format , MY_NAME , ## arg) #define err(format, arg...) printk(KERN_ERR "%s: " format, MY_NAME, ## arg)
#define info(format, arg...) printk(KERN_INFO "%s: " format , MY_NAME , ## arg) #define info(format, arg...) printk(KERN_INFO "%s: " format, MY_NAME, ## arg)
#define warn(format, arg...) printk(KERN_WARNING "%s: " format , MY_NAME , ## arg) #define warn(format, arg...) printk(KERN_WARNING "%s: " format, MY_NAME, ## arg)
...@@ -424,7 +424,7 @@ int cpqhp_process_SS(struct controller *ctrl, struct pci_func *func); ...@@ -424,7 +424,7 @@ int cpqhp_process_SS(struct controller *ctrl, struct pci_func *func);
int cpqhp_hardware_test(struct controller *ctrl, int test_num); int cpqhp_hardware_test(struct controller *ctrl, int test_num);
/* resource functions */ /* resource functions */
int cpqhp_resource_sort_and_combine (struct pci_resource **head); int cpqhp_resource_sort_and_combine(struct pci_resource **head);
/* pci functions */ /* pci functions */
int cpqhp_set_irq(u8 bus_num, u8 dev_num, u8 int_pin, u8 irq_num); int cpqhp_set_irq(u8 bus_num, u8 dev_num, u8 int_pin, u8 irq_num);
...@@ -685,7 +685,7 @@ static inline int cpq_get_latch_status(struct controller *ctrl, ...@@ -685,7 +685,7 @@ static inline int cpq_get_latch_status(struct controller *ctrl,
u8 hp_slot; u8 hp_slot;
hp_slot = slot->device - ctrl->slot_device_offset; hp_slot = slot->device - ctrl->slot_device_offset;
dbg("%s: slot->device = %d, ctrl->slot_device_offset = %d \n", dbg("%s: slot->device = %d, ctrl->slot_device_offset = %d\n",
__func__, slot->device, ctrl->slot_device_offset); __func__, slot->device, ctrl->slot_device_offset);
status = (readl(ctrl->hpc_reg + INT_INPUT_CLEAR) & (0x01L << hp_slot)); status = (readl(ctrl->hpc_reg + INT_INPUT_CLEAR) & (0x01L << hp_slot));
...@@ -712,7 +712,7 @@ static inline int get_presence_status(struct controller *ctrl, ...@@ -712,7 +712,7 @@ static inline int get_presence_status(struct controller *ctrl,
static inline int wait_for_ctrl_irq(struct controller *ctrl) static inline int wait_for_ctrl_irq(struct controller *ctrl)
{ {
DECLARE_WAITQUEUE(wait, current); DECLARE_WAITQUEUE(wait, current);
int retval = 0; int retval = 0;
dbg("%s - start\n", __func__); dbg("%s - start\n", __func__);
......
...@@ -291,7 +291,7 @@ static void release_slot(struct hotplug_slot *hotplug_slot) ...@@ -291,7 +291,7 @@ static void release_slot(struct hotplug_slot *hotplug_slot)
kfree(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; struct slot *old_slot, *next_slot;
...@@ -301,7 +301,7 @@ static int ctrl_slot_cleanup (struct controller *ctrl) ...@@ -301,7 +301,7 @@ static int ctrl_slot_cleanup (struct controller *ctrl)
while (old_slot) { while (old_slot) {
/* memory will be freed by the release_slot callback */ /* memory will be freed by the release_slot callback */
next_slot = old_slot->next; next_slot = old_slot->next;
pci_hp_deregister (old_slot->hotplug_slot); pci_hp_deregister(old_slot->hotplug_slot);
old_slot = next_slot; old_slot = next_slot;
} }
...@@ -413,9 +413,9 @@ cpqhp_set_attention_status(struct controller *ctrl, struct pci_func *func, ...@@ -413,9 +413,9 @@ cpqhp_set_attention_status(struct controller *ctrl, struct pci_func *func,
mutex_lock(&ctrl->crit_sect); mutex_lock(&ctrl->crit_sect);
if (status == 1) if (status == 1)
amber_LED_on (ctrl, hp_slot); amber_LED_on(ctrl, hp_slot);
else if (status == 0) else if (status == 0)
amber_LED_off (ctrl, hp_slot); amber_LED_off(ctrl, hp_slot);
else { else {
/* Done with exclusive hardware access */ /* Done with exclusive hardware access */
mutex_unlock(&ctrl->crit_sect); mutex_unlock(&ctrl->crit_sect);
...@@ -425,7 +425,7 @@ cpqhp_set_attention_status(struct controller *ctrl, struct pci_func *func, ...@@ -425,7 +425,7 @@ cpqhp_set_attention_status(struct controller *ctrl, struct pci_func *func,
set_SOGO(ctrl); set_SOGO(ctrl);
/* Wait for SOBS to be unset */ /* Wait for SOBS to be unset */
wait_for_ctrl_irq (ctrl); wait_for_ctrl_irq(ctrl);
/* Done with exclusive hardware access */ /* Done with exclusive hardware access */
mutex_unlock(&ctrl->crit_sect); mutex_unlock(&ctrl->crit_sect);
...@@ -439,7 +439,7 @@ cpqhp_set_attention_status(struct controller *ctrl, struct pci_func *func, ...@@ -439,7 +439,7 @@ cpqhp_set_attention_status(struct controller *ctrl, struct pci_func *func,
* @hotplug_slot: slot to change LED on * @hotplug_slot: slot to change LED on
* @status: LED control flag * @status: LED control flag
*/ */
static int set_attention_status (struct hotplug_slot *hotplug_slot, u8 status) static int set_attention_status(struct hotplug_slot *hotplug_slot, u8 status)
{ {
struct pci_func *slot_func; struct pci_func *slot_func;
struct slot *slot = hotplug_slot->private; struct slot *slot = hotplug_slot->private;
...@@ -610,7 +610,7 @@ static int ctrl_slot_setup(struct controller *ctrl, ...@@ -610,7 +610,7 @@ static int ctrl_slot_setup(struct controller *ctrl,
u8 ctrl_slot; u8 ctrl_slot;
u32 tempdword; u32 tempdword;
char name[SLOT_NAME_SIZE]; char name[SLOT_NAME_SIZE];
void __iomem *slot_entry= NULL; void __iomem *slot_entry = NULL;
int result; int result;
dbg("%s\n", __func__); dbg("%s\n", __func__);
...@@ -755,7 +755,7 @@ static int one_time_init(void) ...@@ -755,7 +755,7 @@ static int one_time_init(void)
if (cpqhp_debug) if (cpqhp_debug)
pci_print_IRQ_route(); pci_print_IRQ_route();
dbg("Initialize + Start the notification mechanism \n"); dbg("Initialize + Start the notification mechanism\n");
retval = cpqhp_event_start_thread(); retval = cpqhp_event_start_thread();
if (retval) if (retval)
...@@ -772,7 +772,7 @@ static int one_time_init(void) ...@@ -772,7 +772,7 @@ static int one_time_init(void)
/* Map rom address */ /* Map rom address */
cpqhp_rom_start = ioremap(ROM_PHY_ADDR, ROM_PHY_LEN); cpqhp_rom_start = ioremap(ROM_PHY_ADDR, ROM_PHY_LEN);
if (!cpqhp_rom_start) { if (!cpqhp_rom_start) {
err ("Could not ioremap memory region for ROM\n"); err("Could not ioremap memory region for ROM\n");
retval = -EIO; retval = -EIO;
goto error; goto error;
} }
...@@ -786,7 +786,7 @@ static int one_time_init(void) ...@@ -786,7 +786,7 @@ static int one_time_init(void)
smbios_table = detect_SMBIOS_pointer(cpqhp_rom_start, smbios_table = detect_SMBIOS_pointer(cpqhp_rom_start,
cpqhp_rom_start + ROM_PHY_LEN); cpqhp_rom_start + ROM_PHY_LEN);
if (!smbios_table) { if (!smbios_table) {
err ("Could not find the SMBIOS pointer in memory\n"); err("Could not find the SMBIOS pointer in memory\n");
retval = -EIO; retval = -EIO;
goto error_rom_start; goto error_rom_start;
} }
...@@ -794,7 +794,7 @@ static int one_time_init(void) ...@@ -794,7 +794,7 @@ static int one_time_init(void)
smbios_start = ioremap(readl(smbios_table + ST_ADDRESS), smbios_start = ioremap(readl(smbios_table + ST_ADDRESS),
readw(smbios_table + ST_LENGTH)); readw(smbios_table + ST_LENGTH));
if (!smbios_start) { if (!smbios_start) {
err ("Could not ioremap memory region taken from SMBIOS values\n"); err("Could not ioremap memory region taken from SMBIOS values\n");
retval = -EIO; retval = -EIO;
goto error_smbios_start; goto error_smbios_start;
} }
...@@ -1181,7 +1181,7 @@ static int cpqhpc_probe(struct pci_dev *pdev, const struct pci_device_id *ent) ...@@ -1181,7 +1181,7 @@ static int cpqhpc_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
* Finish setting up the hot plug ctrl device * Finish setting up the hot plug ctrl device
*/ */
ctrl->slot_device_offset = readb(ctrl->hpc_reg + SLOT_MASK) >> 4; ctrl->slot_device_offset = readb(ctrl->hpc_reg + SLOT_MASK) >> 4;
dbg("NumSlots %d \n", ctrl->slot_device_offset); dbg("NumSlots %d\n", ctrl->slot_device_offset);
ctrl->next_event = 0; ctrl->next_event = 0;
...@@ -1198,7 +1198,7 @@ static int cpqhpc_probe(struct pci_dev *pdev, const struct pci_device_id *ent) ...@@ -1198,7 +1198,7 @@ static int cpqhpc_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
writel(0xFFFFFFFFL, ctrl->hpc_reg + INT_MASK); writel(0xFFFFFFFFL, ctrl->hpc_reg + INT_MASK);
/* set up the interrupt */ /* set up the interrupt */
dbg("HPC interrupt = %d \n", ctrl->interrupt); dbg("HPC interrupt = %d\n", ctrl->interrupt);
if (request_irq(ctrl->interrupt, cpqhp_ctrl_intr, if (request_irq(ctrl->interrupt, cpqhp_ctrl_intr,
IRQF_SHARED, MY_NAME, ctrl)) { IRQF_SHARED, MY_NAME, ctrl)) {
err("Can't get irq %d for the hotplug pci controller\n", err("Can't get irq %d for the hotplug pci controller\n",
...@@ -1321,7 +1321,7 @@ static void __exit unload_cpqphpd(void) ...@@ -1321,7 +1321,7 @@ static void __exit unload_cpqphpd(void)
while (ctrl) { while (ctrl) {
if (ctrl->hpc_reg) { if (ctrl->hpc_reg) {
u16 misc; u16 misc;
rc = read_slot_enable (ctrl); rc = read_slot_enable(ctrl);
writeb(0, ctrl->hpc_reg + SLOT_SERR); writeb(0, ctrl->hpc_reg + SLOT_SERR);
writel(0xFFFFFFC0L | ~rc, ctrl->hpc_reg + INT_MASK); writel(0xFFFFFFC0L | ~rc, ctrl->hpc_reg + INT_MASK);
...@@ -1361,7 +1361,7 @@ static void __exit unload_cpqphpd(void) ...@@ -1361,7 +1361,7 @@ static void __exit unload_cpqphpd(void)
kfree(tres); kfree(tres);
} }
kfree (ctrl->pci_bus); kfree(ctrl->pci_bus);
tctrl = ctrl; tctrl = ctrl;
ctrl = ctrl->next; ctrl = ctrl->next;
...@@ -1446,7 +1446,7 @@ static int __init cpqhpc_init(void) ...@@ -1446,7 +1446,7 @@ static int __init cpqhpc_init(void)
cpqhp_debug = debug; cpqhp_debug = debug;
info (DRIVER_DESC " version: " DRIVER_VERSION "\n"); info(DRIVER_DESC " version: " DRIVER_VERSION "\n");
cpqhp_initialize_debugfs(); cpqhp_initialize_debugfs();
result = pci_register_driver(&cpqhpc_driver); result = pci_register_driver(&cpqhpc_driver);
dbg("pci_register_driver = %d\n", result); dbg("pci_register_driver = %d\n", result);
......
This diff is collapsed.
...@@ -114,10 +114,10 @@ static u32 add_byte(u32 **p_buffer, u8 value, u32 *used, u32 *avail) ...@@ -114,10 +114,10 @@ static u32 add_byte(u32 **p_buffer, u8 value, u32 *used, u32 *avail)
if ((*used + 1) > *avail) if ((*used + 1) > *avail)
return(1); return(1);
*((u8*)*p_buffer) = value; *((u8 *)*p_buffer) = value;
tByte = (u8**)p_buffer; tByte = (u8 **)p_buffer;
(*tByte)++; (*tByte)++;
*used+=1; *used += 1;
return(0); return(0);
} }
...@@ -129,7 +129,7 @@ static u32 add_dword(u32 **p_buffer, u32 value, u32 *used, u32 *avail) ...@@ -129,7 +129,7 @@ static u32 add_dword(u32 **p_buffer, u32 value, u32 *used, u32 *avail)
**p_buffer = value; **p_buffer = value;
(*p_buffer)++; (*p_buffer)++;
*used+=4; *used += 4;
return(0); return(0);
} }
...@@ -141,7 +141,7 @@ static u32 add_dword(u32 **p_buffer, u32 value, u32 *used, u32 *avail) ...@@ -141,7 +141,7 @@ static u32 add_dword(u32 **p_buffer, u32 value, u32 *used, u32 *avail)
* *
* returns 0 for non-Compaq ROM, 1 for Compaq ROM * returns 0 for non-Compaq ROM, 1 for Compaq ROM
*/ */
static int check_for_compaq_ROM (void __iomem *rom_start) static int check_for_compaq_ROM(void __iomem *rom_start)
{ {
u8 temp1, temp2, temp3, temp4, temp5, temp6; u8 temp1, temp2, temp3, temp4, temp5, temp6;
int result = 0; int result = 0;
...@@ -160,12 +160,12 @@ static int check_for_compaq_ROM (void __iomem *rom_start) ...@@ -160,12 +160,12 @@ static int check_for_compaq_ROM (void __iomem *rom_start)
(temp6 == 'Q')) { (temp6 == 'Q')) {
result = 1; result = 1;
} }
dbg ("%s - returned %d\n", __func__, result); dbg("%s - returned %d\n", __func__, result);
return result; return result;
} }
static u32 access_EV (u16 operation, u8 *ev_name, u8 *buffer, u32 *buf_size) static u32 access_EV(u16 operation, u8 *ev_name, u8 *buffer, u32 *buf_size)
{ {
unsigned long flags; unsigned long flags;
int op = operation; int op = operation;
...@@ -197,7 +197,7 @@ static u32 access_EV (u16 operation, u8 *ev_name, u8 *buffer, u32 *buf_size) ...@@ -197,7 +197,7 @@ static u32 access_EV (u16 operation, u8 *ev_name, u8 *buffer, u32 *buf_size)
* *
* Read the hot plug Resource Table from NVRAM * Read the hot plug Resource Table from NVRAM
*/ */
static int load_HRT (void __iomem *rom_start) static int load_HRT(void __iomem *rom_start)
{ {
u32 available; u32 available;
u32 temp_dword; u32 temp_dword;
...@@ -232,7 +232,7 @@ static int load_HRT (void __iomem *rom_start) ...@@ -232,7 +232,7 @@ static int load_HRT (void __iomem *rom_start)
* *
* Save the hot plug Resource Table in NVRAM * Save the hot plug Resource Table in NVRAM
*/ */
static u32 store_HRT (void __iomem *rom_start) static u32 store_HRT(void __iomem *rom_start)
{ {
u32 *buffer; u32 *buffer;
u32 *pFill; u32 *pFill;
...@@ -252,7 +252,7 @@ static u32 store_HRT (void __iomem *rom_start) ...@@ -252,7 +252,7 @@ static u32 store_HRT (void __iomem *rom_start)
if (!check_for_compaq_ROM(rom_start)) if (!check_for_compaq_ROM(rom_start))
return(1); return(1);
buffer = (u32*) evbuffer; buffer = (u32 *) evbuffer;
if (!buffer) if (!buffer)
return(1); return(1);
...@@ -306,7 +306,7 @@ static u32 store_HRT (void __iomem *rom_start) ...@@ -306,7 +306,7 @@ static u32 store_HRT (void __iomem *rom_start)
loop = 0; loop = 0;
while (resNode) { while (resNode) {
loop ++; loop++;
/* base */ /* base */
rc = add_dword(&pFill, resNode->base, &usedbytes, &available); rc = add_dword(&pFill, resNode->base, &usedbytes, &available);
...@@ -331,7 +331,7 @@ static u32 store_HRT (void __iomem *rom_start) ...@@ -331,7 +331,7 @@ static u32 store_HRT (void __iomem *rom_start)
loop = 0; loop = 0;
while (resNode) { while (resNode) {
loop ++; loop++;
/* base */ /* base */
rc = add_dword(&pFill, resNode->base, &usedbytes, &available); rc = add_dword(&pFill, resNode->base, &usedbytes, &available);
...@@ -356,7 +356,7 @@ static u32 store_HRT (void __iomem *rom_start) ...@@ -356,7 +356,7 @@ static u32 store_HRT (void __iomem *rom_start)
loop = 0; loop = 0;
while (resNode) { while (resNode) {
loop ++; loop++;
/* base */ /* base */
rc = add_dword(&pFill, resNode->base, &usedbytes, &available); rc = add_dword(&pFill, resNode->base, &usedbytes, &available);
...@@ -381,7 +381,7 @@ static u32 store_HRT (void __iomem *rom_start) ...@@ -381,7 +381,7 @@ static u32 store_HRT (void __iomem *rom_start)
loop = 0; loop = 0;
while (resNode) { while (resNode) {
loop ++; loop++;
/* base */ /* base */
rc = add_dword(&pFill, resNode->base, &usedbytes, &available); rc = add_dword(&pFill, resNode->base, &usedbytes, &available);
...@@ -408,7 +408,7 @@ static u32 store_HRT (void __iomem *rom_start) ...@@ -408,7 +408,7 @@ static u32 store_HRT (void __iomem *rom_start)
temp_dword = usedbytes; temp_dword = usedbytes;
rc = access_EV(WRITE_EV, "CQTHPS", (u8*) buffer, &temp_dword); rc = access_EV(WRITE_EV, "CQTHPS", (u8 *) buffer, &temp_dword);
dbg("usedbytes = 0x%x, length = 0x%x\n", usedbytes, temp_dword); dbg("usedbytes = 0x%x, length = 0x%x\n", usedbytes, temp_dword);
...@@ -423,7 +423,7 @@ static u32 store_HRT (void __iomem *rom_start) ...@@ -423,7 +423,7 @@ static u32 store_HRT (void __iomem *rom_start)
} }
void compaq_nvram_init (void __iomem *rom_start) void compaq_nvram_init(void __iomem *rom_start)
{ {
if (rom_start) if (rom_start)
compaq_int15_entry_point = (rom_start + ROM_INT15_PHY_ADDR - ROM_PHY_ADDR); compaq_int15_entry_point = (rom_start + ROM_INT15_PHY_ADDR - ROM_PHY_ADDR);
...@@ -435,7 +435,7 @@ void compaq_nvram_init (void __iomem *rom_start) ...@@ -435,7 +435,7 @@ void compaq_nvram_init (void __iomem *rom_start)
} }
int compaq_nvram_load (void __iomem *rom_start, struct controller *ctrl) int compaq_nvram_load(void __iomem *rom_start, struct controller *ctrl)
{ {
u8 bus, device, function; u8 bus, device, function;
u8 nummem, numpmem, numio, numbus; u8 nummem, numpmem, numio, numbus;
...@@ -451,7 +451,7 @@ int compaq_nvram_load (void __iomem *rom_start, struct controller *ctrl) ...@@ -451,7 +451,7 @@ int compaq_nvram_load (void __iomem *rom_start, struct controller *ctrl)
if (!evbuffer_init) { if (!evbuffer_init) {
/* Read the resource list information in from NVRAM */ /* Read the resource list information in from NVRAM */
if (load_HRT(rom_start)) if (load_HRT(rom_start))
memset (evbuffer, 0, 1024); memset(evbuffer, 0, 1024);
evbuffer_init = 1; evbuffer_init = 1;
} }
...@@ -472,7 +472,7 @@ int compaq_nvram_load (void __iomem *rom_start, struct controller *ctrl) ...@@ -472,7 +472,7 @@ int compaq_nvram_load (void __iomem *rom_start, struct controller *ctrl)
p_byte += 3; p_byte += 3;
if (p_byte > ((u8*)p_EV_header + evbuffer_length)) if (p_byte > ((u8 *)p_EV_header + evbuffer_length))
return 2; return 2;
bus = p_ev_ctrl->bus; bus = p_ev_ctrl->bus;
...@@ -489,20 +489,20 @@ int compaq_nvram_load (void __iomem *rom_start, struct controller *ctrl) ...@@ -489,20 +489,20 @@ int compaq_nvram_load (void __iomem *rom_start, struct controller *ctrl)
p_byte += 4; p_byte += 4;
if (p_byte > ((u8*)p_EV_header + evbuffer_length)) if (p_byte > ((u8 *)p_EV_header + evbuffer_length))
return 2; return 2;
/* Skip forward to the next entry */ /* Skip forward to the next entry */
p_byte += (nummem + numpmem + numio + numbus) * 8; p_byte += (nummem + numpmem + numio + numbus) * 8;
if (p_byte > ((u8*)p_EV_header + evbuffer_length)) if (p_byte > ((u8 *)p_EV_header + evbuffer_length))
return 2; return 2;
p_ev_ctrl = (struct ev_hrt_ctrl *) p_byte; p_ev_ctrl = (struct ev_hrt_ctrl *) p_byte;
p_byte += 3; p_byte += 3;
if (p_byte > ((u8*)p_EV_header + evbuffer_length)) if (p_byte > ((u8 *)p_EV_header + evbuffer_length))
return 2; return 2;
bus = p_ev_ctrl->bus; bus = p_ev_ctrl->bus;
...@@ -517,7 +517,7 @@ int compaq_nvram_load (void __iomem *rom_start, struct controller *ctrl) ...@@ -517,7 +517,7 @@ int compaq_nvram_load (void __iomem *rom_start, struct controller *ctrl)
p_byte += 4; p_byte += 4;
if (p_byte > ((u8*)p_EV_header + evbuffer_length)) if (p_byte > ((u8 *)p_EV_header + evbuffer_length))
return 2; return 2;
while (nummem--) { while (nummem--) {
...@@ -526,20 +526,20 @@ int compaq_nvram_load (void __iomem *rom_start, struct controller *ctrl) ...@@ -526,20 +526,20 @@ int compaq_nvram_load (void __iomem *rom_start, struct controller *ctrl)
if (!mem_node) if (!mem_node)
break; break;
mem_node->base = *(u32*)p_byte; mem_node->base = *(u32 *)p_byte;
dbg("mem base = %8.8x\n",mem_node->base); dbg("mem base = %8.8x\n", mem_node->base);
p_byte += 4; p_byte += 4;
if (p_byte > ((u8*)p_EV_header + evbuffer_length)) { if (p_byte > ((u8 *)p_EV_header + evbuffer_length)) {
kfree(mem_node); kfree(mem_node);
return 2; return 2;
} }
mem_node->length = *(u32*)p_byte; mem_node->length = *(u32 *)p_byte;
dbg("mem length = %8.8x\n",mem_node->length); dbg("mem length = %8.8x\n", mem_node->length);
p_byte += 4; p_byte += 4;
if (p_byte > ((u8*)p_EV_header + evbuffer_length)) { if (p_byte > ((u8 *)p_EV_header + evbuffer_length)) {
kfree(mem_node); kfree(mem_node);
return 2; return 2;
} }
...@@ -554,20 +554,20 @@ int compaq_nvram_load (void __iomem *rom_start, struct controller *ctrl) ...@@ -554,20 +554,20 @@ int compaq_nvram_load (void __iomem *rom_start, struct controller *ctrl)
if (!p_mem_node) if (!p_mem_node)
break; break;
p_mem_node->base = *(u32*)p_byte; p_mem_node->base = *(u32 *)p_byte;
dbg("pre-mem base = %8.8x\n",p_mem_node->base); dbg("pre-mem base = %8.8x\n", p_mem_node->base);
p_byte += 4; p_byte += 4;
if (p_byte > ((u8*)p_EV_header + evbuffer_length)) { if (p_byte > ((u8 *)p_EV_header + evbuffer_length)) {
kfree(p_mem_node); kfree(p_mem_node);
return 2; return 2;
} }
p_mem_node->length = *(u32*)p_byte; p_mem_node->length = *(u32 *)p_byte;
dbg("pre-mem length = %8.8x\n",p_mem_node->length); dbg("pre-mem length = %8.8x\n", p_mem_node->length);
p_byte += 4; p_byte += 4;
if (p_byte > ((u8*)p_EV_header + evbuffer_length)) { if (p_byte > ((u8 *)p_EV_header + evbuffer_length)) {
kfree(p_mem_node); kfree(p_mem_node);
return 2; return 2;
} }
...@@ -582,20 +582,20 @@ int compaq_nvram_load (void __iomem *rom_start, struct controller *ctrl) ...@@ -582,20 +582,20 @@ int compaq_nvram_load (void __iomem *rom_start, struct controller *ctrl)
if (!io_node) if (!io_node)
break; break;
io_node->base = *(u32*)p_byte; io_node->base = *(u32 *)p_byte;
dbg("io base = %8.8x\n",io_node->base); dbg("io base = %8.8x\n", io_node->base);
p_byte += 4; p_byte += 4;
if (p_byte > ((u8*)p_EV_header + evbuffer_length)) { if (p_byte > ((u8 *)p_EV_header + evbuffer_length)) {
kfree(io_node); kfree(io_node);
return 2; return 2;
} }
io_node->length = *(u32*)p_byte; io_node->length = *(u32 *)p_byte;
dbg("io length = %8.8x\n",io_node->length); dbg("io length = %8.8x\n", io_node->length);
p_byte += 4; p_byte += 4;
if (p_byte > ((u8*)p_EV_header + evbuffer_length)) { if (p_byte > ((u8 *)p_EV_header + evbuffer_length)) {
kfree(io_node); kfree(io_node);
return 2; return 2;
} }
...@@ -610,18 +610,18 @@ int compaq_nvram_load (void __iomem *rom_start, struct controller *ctrl) ...@@ -610,18 +610,18 @@ int compaq_nvram_load (void __iomem *rom_start, struct controller *ctrl)
if (!bus_node) if (!bus_node)
break; break;
bus_node->base = *(u32*)p_byte; bus_node->base = *(u32 *)p_byte;
p_byte += 4; p_byte += 4;
if (p_byte > ((u8*)p_EV_header + evbuffer_length)) { if (p_byte > ((u8 *)p_EV_header + evbuffer_length)) {
kfree(bus_node); kfree(bus_node);
return 2; return 2;
} }
bus_node->length = *(u32*)p_byte; bus_node->length = *(u32 *)p_byte;
p_byte += 4; p_byte += 4;
if (p_byte > ((u8*)p_EV_header + evbuffer_length)) { if (p_byte > ((u8 *)p_EV_header + evbuffer_length)) {
kfree(bus_node); kfree(bus_node);
return 2; return 2;
} }
...@@ -650,7 +650,7 @@ int compaq_nvram_load (void __iomem *rom_start, struct controller *ctrl) ...@@ -650,7 +650,7 @@ int compaq_nvram_load (void __iomem *rom_start, struct controller *ctrl)
} }
int compaq_nvram_store (void __iomem *rom_start) int compaq_nvram_store(void __iomem *rom_start)
{ {
int rc = 1; int rc = 1;
......
This diff is collapsed.
...@@ -39,7 +39,7 @@ ...@@ -39,7 +39,7 @@
#include "cpqphp.h" #include "cpqphp.h"
static DEFINE_MUTEX(cpqphp_mutex); static DEFINE_MUTEX(cpqphp_mutex);
static int show_ctrl (struct controller *ctrl, char *buf) static int show_ctrl(struct controller *ctrl, char *buf)
{ {
char *out = buf; char *out = buf;
int index; int index;
...@@ -77,7 +77,7 @@ static int show_ctrl (struct controller *ctrl, char *buf) ...@@ -77,7 +77,7 @@ static int show_ctrl (struct controller *ctrl, char *buf)
return out - buf; return out - buf;
} }
static int show_dev (struct controller *ctrl, char *buf) static int show_dev(struct controller *ctrl, char *buf)
{ {
char *out = buf; char *out = buf;
int index; int index;
...@@ -119,7 +119,7 @@ static int show_dev (struct controller *ctrl, char *buf) ...@@ -119,7 +119,7 @@ static int show_dev (struct controller *ctrl, char *buf)
out += sprintf(out, "start = %8.8x, length = %8.8x\n", res->base, res->length); out += sprintf(out, "start = %8.8x, length = %8.8x\n", res->base, res->length);
res = res->next; res = res->next;
} }
slot=slot->next; slot = slot->next;
} }
return out - buf; return out - buf;
......
...@@ -39,11 +39,11 @@ extern int ibmphp_debug; ...@@ -39,11 +39,11 @@ extern int ibmphp_debug;
#else #else
#define MY_NAME THIS_MODULE->name #define MY_NAME THIS_MODULE->name
#endif #endif
#define debug(fmt, arg...) do { if (ibmphp_debug == 1) printk(KERN_DEBUG "%s: " fmt , MY_NAME , ## arg); } while (0) #define debug(fmt, arg...) do { if (ibmphp_debug == 1) printk(KERN_DEBUG "%s: " fmt, MY_NAME, ## arg); } while (0)
#define debug_pci(fmt, arg...) do { if (ibmphp_debug) printk(KERN_DEBUG "%s: " fmt , MY_NAME , ## arg); } while (0) #define debug_pci(fmt, arg...) do { if (ibmphp_debug) printk(KERN_DEBUG "%s: " fmt, MY_NAME, ## arg); } while (0)
#define err(format, arg...) printk(KERN_ERR "%s: " format , MY_NAME , ## arg) #define err(format, arg...) printk(KERN_ERR "%s: " format, MY_NAME, ## arg)
#define info(format, arg...) printk(KERN_INFO "%s: " format , MY_NAME , ## arg) #define info(format, arg...) printk(KERN_INFO "%s: " format, MY_NAME, ## arg)
#define warn(format, arg...) printk(KERN_WARNING "%s: " format , MY_NAME , ## arg) #define warn(format, arg...) printk(KERN_WARNING "%s: " format, MY_NAME, ## arg)
/* EBDA stuff */ /* EBDA stuff */
...@@ -603,7 +603,7 @@ void ibmphp_hpc_stop_poll_thread(void); ...@@ -603,7 +603,7 @@ void ibmphp_hpc_stop_poll_thread(void);
#define SLOT_CONNECT(s) ((u8) ((s & HPC_SLOT_CONNECT) \ #define SLOT_CONNECT(s) ((u8) ((s & HPC_SLOT_CONNECT) \
? HPC_SLOT_DISCONNECTED : HPC_SLOT_CONNECTED)) ? HPC_SLOT_DISCONNECTED : HPC_SLOT_CONNECTED))
#define SLOT_ATTN(s,es) ((u8) ((es & HPC_SLOT_BLINK_ATTN) \ #define SLOT_ATTN(s, es) ((u8) ((es & HPC_SLOT_BLINK_ATTN) \
? HPC_SLOT_ATTN_BLINK \ ? HPC_SLOT_ATTN_BLINK \
: ((s & HPC_SLOT_ATTN) ? HPC_SLOT_ATTN_ON : HPC_SLOT_ATTN_OFF))) : ((s & HPC_SLOT_ATTN) ? HPC_SLOT_ATTN_ON : HPC_SLOT_ATTN_OFF)))
......
...@@ -39,11 +39,11 @@ ...@@ -39,11 +39,11 @@
#include <asm/io_apic.h> #include <asm/io_apic.h>
#include "ibmphp.h" #include "ibmphp.h"
#define attn_on(sl) ibmphp_hpc_writeslot (sl, HPC_SLOT_ATTNON) #define attn_on(sl) ibmphp_hpc_writeslot(sl, HPC_SLOT_ATTNON)
#define attn_off(sl) ibmphp_hpc_writeslot (sl, HPC_SLOT_ATTNOFF) #define attn_off(sl) ibmphp_hpc_writeslot(sl, HPC_SLOT_ATTNOFF)
#define attn_LED_blink(sl) ibmphp_hpc_writeslot (sl, HPC_SLOT_BLINKLED) #define attn_LED_blink(sl) ibmphp_hpc_writeslot(sl, HPC_SLOT_BLINKLED)
#define get_ctrl_revision(sl, rev) ibmphp_hpc_readslot (sl, READ_REVLEVEL, rev) #define get_ctrl_revision(sl, rev) ibmphp_hpc_readslot(sl, READ_REVLEVEL, rev)
#define get_hpc_options(sl, opt) ibmphp_hpc_readslot (sl, READ_HPCOPTIONS, opt) #define get_hpc_options(sl, opt) ibmphp_hpc_readslot(sl, READ_HPCOPTIONS, opt)
#define DRIVER_VERSION "0.6" #define DRIVER_VERSION "0.6"
#define DRIVER_DESC "IBM Hot Plug PCI Controller Driver" #define DRIVER_DESC "IBM Hot Plug PCI Controller Driver"
...@@ -52,9 +52,9 @@ int ibmphp_debug; ...@@ -52,9 +52,9 @@ int ibmphp_debug;
static bool debug; static bool debug;
module_param(debug, bool, S_IRUGO | S_IWUSR); module_param(debug, bool, S_IRUGO | S_IWUSR);
MODULE_PARM_DESC (debug, "Debugging mode enabled or not"); MODULE_PARM_DESC(debug, "Debugging mode enabled or not");
MODULE_LICENSE ("GPL"); MODULE_LICENSE("GPL");
MODULE_DESCRIPTION (DRIVER_DESC); MODULE_DESCRIPTION(DRIVER_DESC);
struct pci_bus *ibmphp_pci_bus; struct pci_bus *ibmphp_pci_bus;
static int max_slots; static int max_slots;
...@@ -113,7 +113,7 @@ static inline int slot_update(struct slot **sl) ...@@ -113,7 +113,7 @@ static inline int slot_update(struct slot **sl)
return rc; return rc;
} }
static int __init get_max_slots (void) static int __init get_max_slots(void)
{ {
struct slot *slot_cur; struct slot *slot_cur;
struct list_head *tmp; struct list_head *tmp;
...@@ -459,7 +459,7 @@ static int get_max_adapter_speed_1(struct hotplug_slot *hotplug_slot, u8 *value, ...@@ -459,7 +459,7 @@ static int get_max_adapter_speed_1(struct hotplug_slot *hotplug_slot, u8 *value,
*value = SLOT_SPEED(myslot.ext_status); *value = SLOT_SPEED(myslot.ext_status);
} else } else
*value = MAX_ADAPTER_NONE; *value = MAX_ADAPTER_NONE;
} }
} }
if (flag) if (flag)
...@@ -620,11 +620,11 @@ int ibmphp_update_slot_info(struct slot *slot_cur) ...@@ -620,11 +620,11 @@ int ibmphp_update_slot_info(struct slot *slot_cur)
info->attention_status = SLOT_ATTN(slot_cur->status, info->attention_status = SLOT_ATTN(slot_cur->status,
slot_cur->ext_status); slot_cur->ext_status);
info->latch_status = SLOT_LATCH(slot_cur->status); info->latch_status = SLOT_LATCH(slot_cur->status);
if (!SLOT_PRESENT(slot_cur->status)) { if (!SLOT_PRESENT(slot_cur->status)) {
info->adapter_status = 0; info->adapter_status = 0;
/* info->max_adapter_speed_status = MAX_ADAPTER_NONE; */ /* info->max_adapter_speed_status = MAX_ADAPTER_NONE; */
} else { } else {
info->adapter_status = 1; info->adapter_status = 1;
/* get_max_adapter_speed_1(slot_cur->hotplug_slot, /* get_max_adapter_speed_1(slot_cur->hotplug_slot,
&info->max_adapter_speed_status, 0); */ &info->max_adapter_speed_status, 0); */
} }
...@@ -866,7 +866,7 @@ static int set_bus(struct slot *slot_cur) ...@@ -866,7 +866,7 @@ static int set_bus(struct slot *slot_cur)
int retval; int retval;
static struct pci_device_id ciobx[] = { static struct pci_device_id ciobx[] = {
{ PCI_DEVICE(PCI_VENDOR_ID_SERVERWORKS, 0x0101) }, { PCI_DEVICE(PCI_VENDOR_ID_SERVERWORKS, 0x0101) },
{ }, { },
}; };
debug("%s - entry slot # %d\n", __func__, slot_cur->number); debug("%s - entry slot # %d\n", __func__, slot_cur->number);
...@@ -1182,7 +1182,7 @@ static int enable_slot(struct hotplug_slot *hs) ...@@ -1182,7 +1182,7 @@ static int enable_slot(struct hotplug_slot *hs)
* HOT REMOVING ADAPTER CARD * * HOT REMOVING ADAPTER CARD *
* INPUT: POINTER TO THE HOTPLUG SLOT STRUCTURE * * INPUT: POINTER TO THE HOTPLUG SLOT STRUCTURE *
* OUTPUT: SUCCESS 0 ; FAILURE: UNCONFIGURE , VALIDATE * * OUTPUT: SUCCESS 0 ; FAILURE: UNCONFIGURE , VALIDATE *
DISABLE POWER , * * DISABLE POWER , *
**************************************************************/ **************************************************************/
static int ibmphp_disable_slot(struct hotplug_slot *hotplug_slot) static int ibmphp_disable_slot(struct hotplug_slot *hotplug_slot)
{ {
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
...@@ -45,10 +45,10 @@ ...@@ -45,10 +45,10 @@
#define MY_NAME "pci_hotplug" #define MY_NAME "pci_hotplug"
#define dbg(fmt, arg...) do { if (debug) printk(KERN_DEBUG "%s: %s: " fmt , MY_NAME , __func__ , ## arg); } while (0) #define dbg(fmt, arg...) do { if (debug) printk(KERN_DEBUG "%s: %s: " fmt, MY_NAME, __func__, ## arg); } while (0)
#define err(format, arg...) printk(KERN_ERR "%s: " format , MY_NAME , ## arg) #define err(format, arg...) printk(KERN_ERR "%s: " format, MY_NAME, ## arg)
#define info(format, arg...) printk(KERN_INFO "%s: " format , MY_NAME , ## arg) #define info(format, arg...) printk(KERN_INFO "%s: " format, MY_NAME, ## arg)
#define warn(format, arg...) printk(KERN_WARNING "%s: " format , MY_NAME , ## arg) #define warn(format, arg...) printk(KERN_WARNING "%s: " format, MY_NAME, ## arg)
/* local variables */ /* local variables */
...@@ -226,7 +226,7 @@ static ssize_t test_write_file(struct pci_slot *pci_slot, const char *buf, ...@@ -226,7 +226,7 @@ static ssize_t test_write_file(struct pci_slot *pci_slot, const char *buf,
u32 test; u32 test;
int retval = 0; int retval = 0;
ltest = simple_strtoul (buf, NULL, 10); ltest = simple_strtoul(buf, NULL, 10);
test = (u32)(ltest & 0xffffffff); test = (u32)(ltest & 0xffffffff);
dbg("test = %d\n", test); dbg("test = %d\n", test);
......
...@@ -47,14 +47,14 @@ extern bool pciehp_debug; ...@@ -47,14 +47,14 @@ extern bool pciehp_debug;
#define dbg(format, arg...) \ #define dbg(format, arg...) \
do { \ do { \
if (pciehp_debug) \ if (pciehp_debug) \
printk(KERN_DEBUG "%s: " format, MY_NAME , ## arg); \ printk(KERN_DEBUG "%s: " format, MY_NAME, ## arg); \
} while (0) } while (0)
#define err(format, arg...) \ #define err(format, arg...) \
printk(KERN_ERR "%s: " format, MY_NAME , ## arg) printk(KERN_ERR "%s: " format, MY_NAME, ## arg)
#define info(format, arg...) \ #define info(format, arg...) \
printk(KERN_INFO "%s: " format, MY_NAME , ## arg) printk(KERN_INFO "%s: " format, MY_NAME, ## arg)
#define warn(format, arg...) \ #define warn(format, arg...) \
printk(KERN_WARNING "%s: " format, MY_NAME , ## arg) printk(KERN_WARNING "%s: " format, MY_NAME, ## arg)
#define ctrl_dbg(ctrl, format, arg...) \ #define ctrl_dbg(ctrl, format, arg...) \
do { \ do { \
......
...@@ -62,14 +62,14 @@ MODULE_PARM_DESC(pciehp_force, "Force pciehp, even if OSHP is missing"); ...@@ -62,14 +62,14 @@ MODULE_PARM_DESC(pciehp_force, "Force pciehp, even if OSHP is missing");
#define PCIE_MODULE_NAME "pciehp" #define PCIE_MODULE_NAME "pciehp"
static int set_attention_status (struct hotplug_slot *slot, u8 value); static int set_attention_status(struct hotplug_slot *slot, u8 value);
static int enable_slot (struct hotplug_slot *slot); static int enable_slot(struct hotplug_slot *slot);
static int disable_slot (struct hotplug_slot *slot); static int disable_slot(struct hotplug_slot *slot);
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_latch_status (struct hotplug_slot *slot, u8 *value); static int get_latch_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 reset_slot (struct hotplug_slot *slot, int probe); static int reset_slot(struct hotplug_slot *slot, int probe);
/** /**
* release_slot - free up the memory used by a slot * release_slot - free up the memory used by a slot
......
...@@ -52,11 +52,11 @@ static LIST_HEAD(slot_list); ...@@ -52,11 +52,11 @@ static LIST_HEAD(slot_list);
do { \ do { \
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)
/* local variables */ /* local variables */
static bool debug; static bool debug;
...@@ -72,14 +72,14 @@ MODULE_LICENSE("GPL"); ...@@ -72,14 +72,14 @@ MODULE_LICENSE("GPL");
module_param(debug, bool, 0644); module_param(debug, bool, 0644);
MODULE_PARM_DESC(debug, "Debugging mode enabled or not"); MODULE_PARM_DESC(debug, "Debugging mode enabled or not");
static int enable_slot (struct hotplug_slot *slot); static int enable_slot(struct hotplug_slot *slot);
static int disable_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 set_attention_status(struct hotplug_slot *slot, u8 value);
static int hardware_test (struct hotplug_slot *slot, u32 value); static int hardware_test(struct hotplug_slot *slot, u32 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_latch_status (struct hotplug_slot *slot, u8 *value); static int get_latch_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 struct hotplug_slot_ops skel_hotplug_slot_ops = { static struct hotplug_slot_ops skel_hotplug_slot_ops = {
.enable_slot = enable_slot, .enable_slot = enable_slot,
......
...@@ -51,11 +51,11 @@ extern bool rpaphp_debug; ...@@ -51,11 +51,11 @@ extern bool rpaphp_debug;
do { \ do { \
if (rpaphp_debug) \ if (rpaphp_debug) \
printk(KERN_DEBUG "%s: " format, \ printk(KERN_DEBUG "%s: " format, \
MY_NAME , ## arg); \ MY_NAME, ## arg); \
} while (0) } while (0)
#define err(format, arg...) printk(KERN_ERR "%s: " format, MY_NAME , ## arg) #define err(format, arg...) printk(KERN_ERR "%s: " format, MY_NAME, ## arg)
#define info(format, arg...) printk(KERN_INFO "%s: " format, MY_NAME , ## arg) #define info(format, arg...) printk(KERN_INFO "%s: " format, MY_NAME, ## arg)
#define warn(format, arg...) printk(KERN_WARNING "%s: " format, MY_NAME , ## arg) #define warn(format, arg...) printk(KERN_WARNING "%s: " format, MY_NAME, ## arg)
/* slot states */ /* slot states */
......
...@@ -94,7 +94,7 @@ static int get_power_status(struct hotplug_slot *hotplug_slot, u8 *value) ...@@ -94,7 +94,7 @@ static int get_power_status(struct hotplug_slot *hotplug_slot, u8 *value)
int retval, level; int retval, level;
struct slot *slot = (struct slot *)hotplug_slot->private; struct slot *slot = (struct slot *)hotplug_slot->private;
retval = rtas_get_power_level (slot->power_domain, &level); retval = rtas_get_power_level(slot->power_domain, &level);
if (!retval) if (!retval)
*value = level; *value = level;
return retval; return retval;
......
...@@ -126,7 +126,7 @@ int rpaphp_enable_slot(struct slot *slot) ...@@ -126,7 +126,7 @@ int rpaphp_enable_slot(struct slot *slot)
if (rpaphp_debug) { if (rpaphp_debug) {
struct pci_dev *dev; struct pci_dev *dev;
dbg("%s: pci_devs of slot[%s]\n", __func__, slot->dn->full_name); dbg("%s: pci_devs of slot[%s]\n", __func__, slot->dn->full_name);
list_for_each_entry (dev, &bus->devices, bus_list) list_for_each_entry(dev, &bus->devices, bus_list)
dbg("\t%s\n", pci_name(dev)); dbg("\t%s\n", pci_name(dev));
} }
} }
......
...@@ -48,7 +48,7 @@ void dealloc_slot_struct(struct slot *slot) ...@@ -48,7 +48,7 @@ void dealloc_slot_struct(struct slot *slot)
} }
struct slot *alloc_slot_struct(struct device_node *dn, struct slot *alloc_slot_struct(struct device_node *dn,
int drc_index, char *drc_name, int power_domain) int drc_index, char *drc_name, int power_domain)
{ {
struct slot *slot; struct slot *slot;
......
...@@ -99,7 +99,7 @@ static ssize_t path_show(struct pci_slot *pci_slot, char *buf) ...@@ -99,7 +99,7 @@ static ssize_t path_show(struct pci_slot *pci_slot, char *buf)
if (!slot) if (!slot)
return retval; return retval;
retval = sprintf (buf, "%s\n", slot->physical_path); retval = sprintf(buf, "%s\n", slot->physical_path);
return retval; return retval;
} }
...@@ -313,7 +313,7 @@ static int sn_slot_disable(struct hotplug_slot *bss_hotplug_slot, ...@@ -313,7 +313,7 @@ static int sn_slot_disable(struct hotplug_slot *bss_hotplug_slot,
} }
if ((action == PCI_REQ_SLOT_DISABLE) && rc) { if ((action == PCI_REQ_SLOT_DISABLE) && rc) {
dev_dbg(&slot->pci_bus->self->dev,"remove failed rc = %d\n", rc); dev_dbg(&slot->pci_bus->self->dev, "remove failed rc = %d\n", rc);
} }
return rc; return rc;
...@@ -488,7 +488,7 @@ static int disable_slot(struct hotplug_slot *bss_hotplug_slot) ...@@ -488,7 +488,7 @@ static int disable_slot(struct hotplug_slot *bss_hotplug_slot)
/* free the ACPI resources for the slot */ /* free the ACPI resources for the slot */
if (SN_ACPI_BASE_SUPPORT() && if (SN_ACPI_BASE_SUPPORT() &&
PCI_CONTROLLER(slot->pci_bus)->companion) { PCI_CONTROLLER(slot->pci_bus)->companion) {
unsigned long long adr; unsigned long long adr;
struct acpi_device *device; struct acpi_device *device;
acpi_handle phandle; acpi_handle phandle;
......
...@@ -50,14 +50,14 @@ extern bool shpchp_debug; ...@@ -50,14 +50,14 @@ extern bool shpchp_debug;
#define dbg(format, arg...) \ #define dbg(format, arg...) \
do { \ do { \
if (shpchp_debug) \ if (shpchp_debug) \
printk(KERN_DEBUG "%s: " format, MY_NAME , ## arg); \ printk(KERN_DEBUG "%s: " format, MY_NAME, ## arg); \
} while (0) } while (0)
#define err(format, arg...) \ #define err(format, arg...) \
printk(KERN_ERR "%s: " format, MY_NAME , ## arg) printk(KERN_ERR "%s: " format, MY_NAME, ## arg)
#define info(format, arg...) \ #define info(format, arg...) \
printk(KERN_INFO "%s: " format, MY_NAME , ## arg) printk(KERN_INFO "%s: " format, MY_NAME, ## arg)
#define warn(format, arg...) \ #define warn(format, arg...) \
printk(KERN_WARNING "%s: " format, MY_NAME , ## arg) printk(KERN_WARNING "%s: " format, MY_NAME, ## arg)
#define ctrl_dbg(ctrl, format, arg...) \ #define ctrl_dbg(ctrl, format, arg...) \
do { \ do { \
...@@ -295,7 +295,7 @@ static inline void amd_pogo_errata_restore_misc_reg(struct slot *p_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); pci_write_config_dword(p_slot->ctrl->pci_dev, PCIX_MEM_BASE_LIMIT_OFFSET, rse_set);
} }
/* restore MiscII register */ /* 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) if (p_slot->ctrl->pcix_misc2_reg & SERRFATALENABLE_MASK)
pcix_misc2_temp |= SERRFATALENABLE_MASK; pcix_misc2_temp |= SERRFATALENABLE_MASK;
......
...@@ -57,13 +57,13 @@ MODULE_PARM_DESC(shpchp_poll_time, "Polling mechanism frequency, in seconds"); ...@@ -57,13 +57,13 @@ MODULE_PARM_DESC(shpchp_poll_time, "Polling mechanism frequency, in seconds");
#define SHPC_MODULE_NAME "shpchp" #define SHPC_MODULE_NAME "shpchp"
static int set_attention_status (struct hotplug_slot *slot, u8 value); static int set_attention_status(struct hotplug_slot *slot, u8 value);
static int enable_slot (struct hotplug_slot *slot); static int enable_slot(struct hotplug_slot *slot);
static int disable_slot (struct hotplug_slot *slot); static int disable_slot(struct hotplug_slot *slot);
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_latch_status (struct hotplug_slot *slot, u8 *value); static int get_latch_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 struct hotplug_slot_ops shpchp_hotplug_slot_ops = { static struct hotplug_slot_ops shpchp_hotplug_slot_ops = {
.set_attention_status = set_attention_status, .set_attention_status = set_attention_status,
...@@ -194,7 +194,7 @@ void cleanup_slots(struct controller *ctrl) ...@@ -194,7 +194,7 @@ void cleanup_slots(struct controller *ctrl)
/* /*
* set_attention_status - Turns the Amber LED for a slot on, off or blink * set_attention_status - Turns the Amber LED for a slot on, off or blink
*/ */
static int set_attention_status (struct hotplug_slot *hotplug_slot, u8 status) static int set_attention_status(struct hotplug_slot *hotplug_slot, u8 status)
{ {
struct slot *slot = get_slot(hotplug_slot); struct slot *slot = get_slot(hotplug_slot);
...@@ -207,7 +207,7 @@ static int set_attention_status (struct hotplug_slot *hotplug_slot, u8 status) ...@@ -207,7 +207,7 @@ static int set_attention_status (struct hotplug_slot *hotplug_slot, u8 status)
return 0; return 0;
} }
static int enable_slot (struct hotplug_slot *hotplug_slot) static int enable_slot(struct hotplug_slot *hotplug_slot)
{ {
struct slot *slot = get_slot(hotplug_slot); struct slot *slot = get_slot(hotplug_slot);
...@@ -217,7 +217,7 @@ static int enable_slot (struct hotplug_slot *hotplug_slot) ...@@ -217,7 +217,7 @@ static int enable_slot (struct hotplug_slot *hotplug_slot)
return shpchp_sysfs_enable_slot(slot); return shpchp_sysfs_enable_slot(slot);
} }
static int disable_slot (struct hotplug_slot *hotplug_slot) static int disable_slot(struct hotplug_slot *hotplug_slot)
{ {
struct slot *slot = get_slot(hotplug_slot); struct slot *slot = get_slot(hotplug_slot);
...@@ -227,7 +227,7 @@ static int disable_slot (struct hotplug_slot *hotplug_slot) ...@@ -227,7 +227,7 @@ static int disable_slot (struct hotplug_slot *hotplug_slot)
return shpchp_sysfs_disable_slot(slot); return shpchp_sysfs_disable_slot(slot);
} }
static int get_power_status (struct hotplug_slot *hotplug_slot, u8 *value) static int get_power_status(struct hotplug_slot *hotplug_slot, u8 *value)
{ {
struct slot *slot = get_slot(hotplug_slot); struct slot *slot = get_slot(hotplug_slot);
int retval; int retval;
...@@ -242,7 +242,7 @@ static int get_power_status (struct hotplug_slot *hotplug_slot, u8 *value) ...@@ -242,7 +242,7 @@ static int get_power_status (struct hotplug_slot *hotplug_slot, u8 *value)
return 0; return 0;
} }
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 = get_slot(hotplug_slot); struct slot *slot = get_slot(hotplug_slot);
int retval; int retval;
...@@ -257,7 +257,7 @@ static int get_attention_status (struct hotplug_slot *hotplug_slot, u8 *value) ...@@ -257,7 +257,7 @@ static int get_attention_status (struct hotplug_slot *hotplug_slot, u8 *value)
return 0; return 0;
} }
static int get_latch_status (struct hotplug_slot *hotplug_slot, u8 *value) static int get_latch_status(struct hotplug_slot *hotplug_slot, u8 *value)
{ {
struct slot *slot = get_slot(hotplug_slot); struct slot *slot = get_slot(hotplug_slot);
int retval; int retval;
...@@ -272,7 +272,7 @@ static int get_latch_status (struct hotplug_slot *hotplug_slot, u8 *value) ...@@ -272,7 +272,7 @@ static int get_latch_status (struct hotplug_slot *hotplug_slot, u8 *value)
return 0; 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 = get_slot(hotplug_slot); struct slot *slot = get_slot(hotplug_slot);
int retval; int retval;
......
...@@ -542,7 +542,7 @@ static int hpc_set_attention_status(struct slot *slot, u8 value) ...@@ -542,7 +542,7 @@ static int hpc_set_attention_status(struct slot *slot, u8 value)
u8 slot_cmd = 0; u8 slot_cmd = 0;
switch (value) { switch (value) {
case 0 : case 0:
slot_cmd = SET_ATTN_OFF; /* OFF */ slot_cmd = SET_ATTN_OFF; /* OFF */
break; break;
case 1: case 1:
......
...@@ -35,7 +35,7 @@ ...@@ -35,7 +35,7 @@
/* A few routines that create sysfs entries for the hot plug controller */ /* A few routines that create sysfs entries for the hot plug controller */
static ssize_t show_ctrl (struct device *dev, struct device_attribute *attr, char *buf) static ssize_t show_ctrl(struct device *dev, struct device_attribute *attr, char *buf)
{ {
struct pci_dev *pdev; struct pci_dev *pdev;
char *out = buf; char *out = buf;
...@@ -43,7 +43,7 @@ static ssize_t show_ctrl (struct device *dev, struct device_attribute *attr, cha ...@@ -43,7 +43,7 @@ static ssize_t show_ctrl (struct device *dev, struct device_attribute *attr, cha
struct resource *res; struct resource *res;
struct pci_bus *bus; struct pci_bus *bus;
pdev = container_of (dev, struct pci_dev, dev); pdev = container_of(dev, struct pci_dev, dev);
bus = pdev->subordinate; bus = pdev->subordinate;
out += sprintf(buf, "Free resources: memory\n"); out += sprintf(buf, "Free resources: memory\n");
...@@ -83,11 +83,11 @@ static ssize_t show_ctrl (struct device *dev, struct device_attribute *attr, cha ...@@ -83,11 +83,11 @@ static ssize_t show_ctrl (struct device *dev, struct device_attribute *attr, cha
return out - buf; return out - buf;
} }
static DEVICE_ATTR (ctrl, S_IRUGO, show_ctrl, NULL); static DEVICE_ATTR(ctrl, S_IRUGO, show_ctrl, NULL);
int shpchp_create_ctrl_files (struct controller *ctrl) int shpchp_create_ctrl_files(struct controller *ctrl)
{ {
return device_create_file (&ctrl->pci_dev->dev, &dev_attr_ctrl); return device_create_file(&ctrl->pci_dev->dev, &dev_attr_ctrl);
} }
void shpchp_remove_ctrl_files(struct controller *ctrl) void shpchp_remove_ctrl_files(struct controller *ctrl)
......
...@@ -1534,7 +1534,7 @@ void __weak pcibios_release_device(struct pci_dev *dev) {} ...@@ -1534,7 +1534,7 @@ void __weak pcibios_release_device(struct pci_dev *dev) {}
* is the default implementation. Architecture implementations can * is the default implementation. Architecture implementations can
* override this. * override this.
*/ */
void __weak pcibios_disable_device (struct pci_dev *dev) {} void __weak pcibios_disable_device(struct pci_dev *dev) {}
/** /**
* pcibios_penalize_isa_irq - penalize an ISA IRQ * pcibios_penalize_isa_irq - penalize an ISA IRQ
......
...@@ -442,7 +442,7 @@ static void __assign_resources_sorted(struct list_head *head, ...@@ -442,7 +442,7 @@ static void __assign_resources_sorted(struct list_head *head,
break; break;
} }
} }
} }
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment