drivers:pci Fix all whitespace issues
Subsystems (8)
PATCH 1/1 drivers:pci Fix all whitespace issues
This patch fixes all whitespace issues( missing or needed whitespace) in all files in drivers/pci folder. 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.
--- drivers/pci/access.c | 8 +- drivers/pci/host/pci-imx6.c | 2 +- drivers/pci/hotplug/acpi_pcihp.c | 10 +- drivers/pci/hotplug/acpiphp.h | 2 +- drivers/pci/hotplug/acpiphp_core.c | 14 +- drivers/pci/hotplug/acpiphp_glue.c | 2 +- drivers/pci/hotplug/acpiphp_ibm.c | 2 +- drivers/pci/hotplug/cpci_hotplug.h | 14 +- drivers/pci/hotplug/cpci_hotplug_core.c | 16 +- drivers/pci/hotplug/cpci_hotplug_pci.c | 10 +- drivers/pci/hotplug/cpcihp_generic.c | 12 +- drivers/pci/hotplug/cpcihp_zt5550.c | 14 +- drivers/pci/hotplug/cpqphp.h | 14 +- drivers/pci/hotplug/cpqphp_core.c | 32 +- drivers/pci/hotplug/cpqphp_ctrl.c | 200 ++++----- drivers/pci/hotplug/cpqphp_nvram.c | 92 ++-- drivers/pci/hotplug/cpqphp_pci.c | 84 ++-- drivers/pci/hotplug/cpqphp_sysfs.c | 6 +- drivers/pci/hotplug/ibmphp.h | 12 +- drivers/pci/hotplug/ibmphp_core.c | 30 +- drivers/pci/hotplug/ibmphp_ebda.c | 524 +++++++++++------------ drivers/pci/hotplug/ibmphp_hpc.c | 386 ++++++++--------- drivers/pci/hotplug/ibmphp_pci.c | 728 ++++++++++++++++---------------- drivers/pci/hotplug/ibmphp_res.c | 518 +++++++++++------------ drivers/pci/hotplug/pci_hotplug_core.c | 10 +- drivers/pci/hotplug/pciehp.h | 8 +- drivers/pci/hotplug/pciehp_core.c | 16 +- drivers/pci/hotplug/pcihp_skeleton.c | 24 +- drivers/pci/hotplug/rpaphp.h | 8 +- drivers/pci/hotplug/rpaphp_core.c | 2 +- drivers/pci/hotplug/rpaphp_pci.c | 2 +- drivers/pci/hotplug/rpaphp_slot.c | 2 +- drivers/pci/hotplug/sgi_hotplug.c | 6 +- drivers/pci/hotplug/shpchp.h | 10 +- drivers/pci/hotplug/shpchp_core.c | 28 +- drivers/pci/hotplug/shpchp_hpc.c | 2 +- drivers/pci/hotplug/shpchp_sysfs.c | 10 +- drivers/pci/pci.c | 2 +- drivers/pci/setup-bus.c | 2 +- 39 files changed, 1432 insertions(+), 1432 deletions(-)
drivers/pci/access.c +4 -4
@@ -25,7 +25,7 @@ DEFINE_RAW_SPINLOCK(pci_lock);#define PCI_word_BAD (pos & 1)#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 \ (struct pci_bus *bus, unsigned int devfn, int pos, type *value) \ { \
@@ -40,7 +40,7 @@ int pci_bus_read_config_##size \return res; \ } -#define PCI_OP_WRITE (size,type,len) \ +#define PCI_OP_WRITE (size, type, len) \ int pci_bus_write_config_##size \ (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) }/* 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 \ (struct pci_dev *dev, int pos, type *val) \ { \
@@ -251,7 +251,7 @@ int pci_user_read_config_##size \ EXPORT_SYMBOL_GPL(pci_user_read_config_##size);/* 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 \ (struct pci_dev *dev, int pos, type val) \ { \
drivers/pci/host/pci-imx6.c +1 -1
@@ -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) */ -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;int ret;
drivers/pci/hotplug/acpi_pcihp.c +5 -5
@@ -36,10 +36,10 @@#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 err(format, arg...) printk(KERN_ERR "%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 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 info(format, arg...) printk(KERN_INFO "%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_OSHP "OSHP"
@@ -132,7 +132,7 @@ int acpi_get_hp_hw_control_from_firmware(struct pci_dev *pdev, u32 flags)while (handle) {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); status =acpi_run_oshp (handle);if (ACPI_SUCCESS (status))
drivers/pci/hotplug/acpiphp.h +1 -1
@@ -181,7 +181,7 @@ struct acpiphp_attention_info/* function prototypes */ /* 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_register_hotplug_slot (struct acpiphp_slot *slot,unsigned int sun);void acpiphp_unregister_hotplug_slot (struct acpiphp_slot *slot);
drivers/pci/hotplug/acpiphp_core.c +7 -7
@@ -63,13 +63,13 @@ MODULE_LICENSE("GPL");MODULE_PARM_DESC (disable,"disable acpiphp driver" );module_param_named (disable, acpiphp_disabled, bool,0444 ); -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_latch_status (struct hotplug_slot *slot,u8 *value); -static int get_adapter_status (struct hotplug_slot *slot,u8 *value); +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_latch_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 = { .enable_slot = enable_slot,
drivers/pci/hotplug/acpiphp_glue.c +1 -1
@@ -707,7 +707,7 @@ static void acpiphp_sanitize_bus(struct pci_bus *bus)unsigned long type_mask =IORESOURCE_IO |IORESOURCE_MEM ;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];if ((res->flags & type_mask) && !res->start && res->end) {
drivers/pci/hotplug/acpiphp_ibm.c +1 -1
@@ -325,7 +325,7 @@ static int ibm_get_table_from_acpi(char **bufp) } size =0 ; -for (i=0 ; i<package->package.count; i++) { +for (i =0 ; i < package->package.count; i++) {memcpy (&lbuf[size], package->package.elements[i].buffer.pointer, package->package.elements[i].buffer.length);
drivers/pci/hotplug/cpci_hotplug.h +7 -7
@@ -52,13 +52,13 @@ struct slot { };struct cpci_hp_controller_ops { -int (*query_enum) (void ); -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 (*query_enum)(void ); +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); };struct cpci_hp_controller {
drivers/pci/hotplug/cpci_hotplug_core.c +8 -8
@@ -45,12 +45,12 @@ #define dbg(format, arg...) \ do { \ if (cpci_debug) \ - printk (KERN_DEBUG "%s: " format "\n", \ - MY_NAME , ## arg); \ + printk(KERN_DEBUG "%s: " format "\n", \ + MY_NAME, ## arg); \ } while (0) -#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 warn(format, arg...) printk(KERN_WARNING "%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 warn(format, arg...) printk(KERN_WARNING "%s: " format "\n", MY_NAME, ## arg)/* local variables */ static DECLARE_RWSEM (list_rwsem);
@@ -238,21 +238,21 @@ cpci_hp_register_bus(struct pci_bus *bus, u8 first, u8 last)* with the pci_hotplug subsystem. */ for (i = first; i <= last; ++i) { - slot =kzalloc (sizeof (struct slot ),GFP_KERNEL ); + slot =kzalloc (sizeof (struct slot ),GFP_KERNEL );if (!slot) { status = -ENOMEM ; goto error; } hotplug_slot = -kzalloc (sizeof (struct hotplug_slot ),GFP_KERNEL ); +kzalloc (sizeof (struct hotplug_slot ),GFP_KERNEL );if (!hotplug_slot) { status = -ENOMEM ; goto error_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) { status = -ENOMEM ; goto error_hpslot;
drivers/pci/hotplug/cpci_hotplug_pci.c +5 -5
@@ -38,12 +38,12 @@ extern int cpci_debug; #define dbg(format, arg...) \ do { \ if (cpci_debug) \ - printk (KERN_DEBUG "%s: " format "\n", \ - MY_NAME , ## arg); \ + printk(KERN_DEBUG "%s: " format "\n", \ + MY_NAME, ## arg); \ } while (0) -#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 warn(format, arg...) printk(KERN_WARNING "%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 warn(format, arg...) printk(KERN_WARNING "%s: " format "\n", MY_NAME, ## arg)u8 cpci_get_attention_status (struct slot *slot)
drivers/pci/hotplug/cpcihp_generic.c +6 -6
@@ -54,12 +54,12 @@ #define dbg(format, arg...) \ do { \ if (debug) \ - printk (KERN_DEBUG "%s: " format "\n", \ - MY_NAME , ## arg); \ + printk(KERN_DEBUG "%s: " format "\n", \ + MY_NAME, ## arg); \ } while (0) -#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 warn(format, arg...) printk(KERN_WARNING "%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 warn(format, arg...) printk(KERN_WARNING "%s: " format "\n", MY_NAME, ## arg)/* local variables */ static bool debug;
@@ -164,7 +164,7 @@ static int __init cpcihp_generic_init(void) bus = dev->subordinate;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 = &generic_hpc_ops;
drivers/pci/hotplug/cpcihp_zt5550.c +7 -7
@@ -49,12 +49,12 @@ #define dbg(format, arg...) \ do { \ if (debug) \ - printk (KERN_DEBUG "%s: " format "\n", \ - MY_NAME , ## arg); \ + printk(KERN_DEBUG "%s: " format "\n", \ + MY_NAME, ## arg); \ } while (0) -#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 warn(format, arg...) printk(KERN_WARNING "%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 warn(format, arg...) printk(KERN_WARNING "%s: " format "\n", MY_NAME, ## arg)/* local variables */ static bool debug;
@@ -204,7 +204,7 @@ static int zt5550_hc_disable_irq(void)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;
@@ -214,7 +214,7 @@ static int zt5550_hc_init_one (struct pci_dev *pdev, const struct pci_device_iddbg ("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 = &zt5550_hpc_ops;if (!poll) {
drivers/pci/hotplug/cpqphp.h +7 -7
@@ -36,10 +36,10 @@#define MY_NAME "cpqphp" -#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 info(format, arg...) printk(KERN_INFO "%s: " format , MY_NAME , ## arg) -#define warn(format, arg...) printk(KERN_WARNING "%s: " format , MY_NAME , ## arg) +#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 info(format, arg...) printk(KERN_INFO "%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);int cpqhp_hardware_test (struct controller *ctrl,int test_num);/* resource functions */ -int cpqhp_resource_sort_and_combine (struct pci_resource **head); +int cpqhp_resource_sort_and_combine (struct pci_resource **head);/* pci functions */ 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,u8 hp_slot; 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); status = (readl (ctrl->hpc_reg +INT_INPUT_CLEAR ) & (0x01L << hp_slot));
@@ -712,7 +712,7 @@ static inline int get_presence_status(struct controller *ctrl,static inline int wait_for_ctrl_irq (struct controller *ctrl) { -DECLARE_WAITQUEUE (wait, current); +DECLARE_WAITQUEUE (wait, current);int retval =0 ;dbg ("%s - start\n" , __func__);
drivers/pci/hotplug/cpqphp_core.c +16 -16
@@ -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;
@@ -301,7 +301,7 @@ static int ctrl_slot_cleanup (struct controller *ctrl)while (old_slot) {/* memory will be freed by the release_slot callback */ next_slot = old_slot->next; -pci_hp_deregister (old_slot->hotplug_slot); +pci_hp_deregister (old_slot->hotplug_slot); old_slot = next_slot; }
@@ -413,9 +413,9 @@ cpqhp_set_attention_status(struct controller *ctrl, struct pci_func *func,mutex_lock (&ctrl->crit_sect);if (status ==1 ) -amber_LED_on (ctrl, hp_slot); +amber_LED_on (ctrl, hp_slot);else if (status ==0 ) -amber_LED_off (ctrl, hp_slot); +amber_LED_off (ctrl, hp_slot);else {/* Done with exclusive hardware access */ mutex_unlock (&ctrl->crit_sect);
@@ -425,7 +425,7 @@ cpqhp_set_attention_status(struct controller *ctrl, struct pci_func *func,set_SOGO (ctrl);/* Wait for SOBS to be unset */ -wait_for_ctrl_irq (ctrl); +wait_for_ctrl_irq (ctrl);/* Done with exclusive hardware access */ mutex_unlock (&ctrl->crit_sect);
@@ -439,7 +439,7 @@ cpqhp_set_attention_status(struct controller *ctrl, struct pci_func *func,* @hotplug_slot: slot to change LED on * @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 slot *slot = hotplug_slot->private;
@@ -610,7 +610,7 @@ static int ctrl_slot_setup(struct controller *ctrl,u8 ctrl_slot;u32 tempdword;char name[SLOT_NAME_SIZE ]; -void __iomem *slot_entry=NULL ; +void __iomem *slot_entry =NULL ;int result;dbg ("%s\n" , __func__);
@@ -755,7 +755,7 @@ static int one_time_init(void)if (cpqhp_debug)pci_print_IRQ_route (); -dbg ("Initialize + Start the notification mechanism \n" ); +dbg ("Initialize + Start the notification mechanism\n" ); retval =cpqhp_event_start_thread ();if (retval)
@@ -772,7 +772,7 @@ static int one_time_init(void)/* Map rom address */ cpqhp_rom_start =ioremap (ROM_PHY_ADDR ,ROM_PHY_LEN );if (!cpqhp_rom_start) { -err ("Could not ioremap memory region for ROM\n" ); +err ("Could not ioremap memory region for ROM\n" ); retval = -EIO ; goto error; }
@@ -786,7 +786,7 @@ static int one_time_init(void) smbios_table =detect_SMBIOS_pointer (cpqhp_rom_start, cpqhp_rom_start +ROM_PHY_LEN );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 ; goto error_rom_start; }
@@ -794,7 +794,7 @@ static int one_time_init(void) smbios_start =ioremap (readl (smbios_table +ST_ADDRESS ),readw (smbios_table +ST_LENGTH ));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 ; goto error_smbios_start; }
@@ -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 */ 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 ;
@@ -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 );/* 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,IRQF_SHARED ,MY_NAME , ctrl)) { err("Can't get irq %d for the hotplug pci controller\n",
@@ -1321,7 +1321,7 @@ static void __exit unload_cpqphpd(void)while (ctrl) {if (ctrl->hpc_reg) {u16 misc; - rc =read_slot_enable (ctrl); + rc =read_slot_enable (ctrl);writeb (0 , ctrl->hpc_reg +SLOT_SERR );writel (0xFFFFFFC0L | ~rc, ctrl->hpc_reg +INT_MASK );
@@ -1361,7 +1361,7 @@ static void __exit unload_cpqphpd(void)kfree (tres); } -kfree (ctrl->pci_bus); +kfree (ctrl->pci_bus); tctrl = ctrl; ctrl = ctrl->next;
@@ -1446,7 +1446,7 @@ static int __init cpqhpc_init(void) cpqhp_debug = debug; -info (DRIVER_DESC " version: " DRIVER_VERSION "\n" ); +info (DRIVER_DESC " version: " DRIVER_VERSION "\n" );cpqhp_initialize_debugfs (); result =pci_register_driver (&cpqhpc_driver);dbg ("pci_register_driver = %d\n" , result);
drivers/pci/hotplug/cpqphp_ctrl.c +100 -100
635 lines not on this page · raw message
drivers/pci/hotplug/cpqphp_nvram.c +46 -46
278 lines not on this page · raw message
drivers/pci/hotplug/cpqphp_pci.c +42 -42
296 lines not on this page · raw message
drivers/pci/hotplug/cpqphp_sysfs.c +3 -3
@@ -39,7 +39,7 @@#include "cpqphp.h" 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;int index;
@@ -77,7 +77,7 @@ static int show_ctrl (struct controller *ctrl, char *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;int index;
@@ -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); res = res->next; } - slot=slot->next; + slot = slot->next; }return out - buf;
drivers/pci/hotplug/ibmphp.h +6 -6
@@ -39,11 +39,11 @@ extern int ibmphp_debug;#else #define MY_NAME THIS_MODULE->name#endif -#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 err(format, arg...) printk(KERN_ERR "%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 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 err(format, arg...) printk(KERN_ERR "%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)/* EBDA stuff */
@@ -603,7 +603,7 @@ void ibmphp_hpc_stop_poll_thread(void);#define SLOT_CONNECT (s) ((u8) ((s & HPC_SLOT_CONNECT) \ ? 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 \ : ((s & HPC_SLOT_ATTN) ? HPC_SLOT_ATTN_ON : HPC_SLOT_ATTN_OFF)))
drivers/pci/hotplug/ibmphp_core.c +15 -15
@@ -39,11 +39,11 @@#include <asm/io_apic.h> #include "ibmphp.h" -#define attn_on (sl) ibmphp_hpc_writeslot (sl, HPC_SLOT_ATTNON) -#define attn_off (sl) ibmphp_hpc_writeslot (sl, HPC_SLOT_ATTNOFF) -#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_hpc_options (sl, opt) ibmphp_hpc_readslot (sl, READ_HPCOPTIONS, opt) +#define attn_on (sl) ibmphp_hpc_writeslot(sl, HPC_SLOT_ATTNON) +#define attn_off (sl) ibmphp_hpc_writeslot(sl, HPC_SLOT_ATTNOFF) +#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_hpc_options (sl, opt) ibmphp_hpc_readslot(sl, READ_HPCOPTIONS, opt)#define DRIVER_VERSION "0.6"#define DRIVER_DESC "IBM Hot Plug PCI Controller Driver"
@@ -52,9 +52,9 @@ int ibmphp_debug;static bool debug;module_param (debug, bool,S_IRUGO |S_IWUSR ); -MODULE_PARM_DESC (debug,"Debugging mode enabled or not" ); -MODULE_LICENSE ("GPL" ); -MODULE_DESCRIPTION (DRIVER_DESC ); +MODULE_PARM_DESC (debug,"Debugging mode enabled or not" ); +MODULE_LICENSE ("GPL" ); +MODULE_DESCRIPTION (DRIVER_DESC );struct pci_bus *ibmphp_pci_bus;static int max_slots;
@@ -113,7 +113,7 @@ static inline int slot_update(struct slot **sl)return rc; } -static int __init get_max_slots (void ) +static int __init get_max_slots (void ) {struct slot *slot_cur;struct list_head *tmp;
@@ -459,7 +459,7 @@ static int get_max_adapter_speed_1(struct hotplug_slot *hotplug_slot, u8 *value, *value =SLOT_SPEED (myslot.ext_status); }else *value =MAX_ADAPTER_NONE ; - } + } }if (flag)
@@ -620,11 +620,11 @@ int ibmphp_update_slot_info(struct slot *slot_cur) info->attention_status =SLOT_ATTN (slot_cur->status, slot_cur->ext_status); info->latch_status =SLOT_LATCH (slot_cur->status); -if (!SLOT_PRESENT (slot_cur->status)) { - info->adapter_status =0 ; +if (!SLOT_PRESENT (slot_cur->status)) { + info->adapter_status =0 ;/* info->max_adapter_speed_status = MAX_ADAPTER_NONE; */ }else { - info->adapter_status =1 ; + info->adapter_status =1 ;/* get_max_adapter_speed_1(slot_cur->hotplug_slot, &info->max_adapter_speed_status, 0); */ }
@@ -866,7 +866,7 @@ static int set_bus(struct slot *slot_cur)int retval;static struct pci_device_id ciobx[] = { {PCI_DEVICE (PCI_VENDOR_ID_SERVERWORKS ,0x0101 ) }, - { }, + { }, };debug ("%s - entry slot # %d\n" , __func__, slot_cur->number);
@@ -1182,7 +1182,7 @@ error_power:* HOT REMOVING ADAPTER CARD * * INPUT: POINTER TO THE HOTPLUG SLOT STRUCTURE * * OUTPUT: SUCCESS 0 ; FAILURE: UNCONFIGURE , VALIDATE * -DISABLE POWER , * +* DISABLE POWER , * **************************************************************/ static int ibmphp_disable_slot (struct hotplug_slot *hotplug_slot) {
drivers/pci/hotplug/ibmphp_ebda.c +262 -262
1,101 lines not on this page · raw message
drivers/pci/hotplug/ibmphp_hpc.c +193 -193
165 lines not on this page · raw message
drivers/pci/hotplug/ibmphp_pci.c +364 -364
728 lines not on this page · raw message
drivers/pci/hotplug/ibmphp_res.c +259 -259
518 lines not on this page · raw message
The rest of this diff is not shown. View the raw message.
Signature · 1 line
2.5.0
Part of the diff is not shown here. View the raw message.
Bjorn Helgaas
AppliedQuoted 6 lines · Bogicevic Sasa
This patch fixes all whitespace issues( missing or needed whitespace) in all files in
drivers/pcifolder. 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 Bogicevic Sasa <[email protected]>
Applied to pci/trivial for v4.5, thanks!
Bjorn
A message that is not in the archive (sent off-list or not yet received): [email protected]
A message that is not in the archive (sent off-list or not yet received): CAErSpo7oaZ220hv5=LfCdWiytjJGYciwUz4qHYx6E_ZW8GBe+g@mail.gmail.com
Thanks!
This is great, so basically all drivers from pcie need to be moved to pci folder, right ?
Thanks, Sasa
{
name: Bogicevic Sasa
phone: +381606006200
}Quoted 42 lines · Bjorn Helgaas
I have sort of a to-do list here:
https://docs.google.com/spreadsheets/d/1VgEMqaG5FFkde4Se64nNaMpNzBfXdlgihXuGKVEzMbA/edit?usp=sharing
Most of those items are fairly significant, but I can help if you have questions (please post on linux-pci so others can benefit as well).
Integrating PCIe
Kconfiginto PCIKconfigshould be relatively straightforward (though far from trivial).Welcome to Linux and PCI!
Bjorn
Quoted 25 lines · sasa bogicevic
Thanks!
If you have some more tasks for me I would appreciate it. I am still new so I do only these kind of fixes for now but if there is something more complex that trivial coding style issues but not too complex for the start I would be glad to contribute some more. Just let me know and Ill get on it.Thanks, Sasa
{
name: Bogicevic Sasa
phone: +381606006200
}Quoted 13 lines · Bjorn Helgaas
Quoted 6 lines · Bogicevic Sasa
This patch fixes all whitespace issues( missing or needed whitespace) in all files in
drivers/pcifolder. 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 Bogicevic Sasa <[email protected]>Applied to pci/trivial for v4.5, thanks!
Bjorn
Bjorn Helgaas
maintainerNo, this change would only affect Kconfig files. For example, arch/x86/Kconfig contains:
source "drivers/pci/pcie/Kconfig"
source "drivers/pci/Kconfig"
source "drivers/pci/hotplug/Kconfig"
I would like it to contain only the "drivers/pci/Kconfig" line. The drivers/pci/Kconfig file should take care of including pcie/Kconfig and pci/hotplug/Kconfig itself.
Other arches have the same issue.
Quoted 54 lines · sasa bogicevic
Thanks!
This is great, so basically all drivers from pcie need to be moved to pci folder, right ?Thanks, Sasa
{
name: Bogicevic Sasa
phone: +381606006200
}Quoted 42 lines · Bjorn Helgaas
I have sort of a to-do list here:
https://docs.google.com/spreadsheets/d/1VgEMqaG5FFkde4Se64nNaMpNzBfXdlgihXuGKVEzMbA/edit?usp=sharing
Most of those items are fairly significant, but I can help if you have questions (please post on linux-pci so others can benefit as well).
Integrating PCIe
Kconfiginto PCIKconfigshould be relatively straightforward (though far from trivial).Welcome to Linux and PCI!
Bjorn
Quoted 25 lines · sasa bogicevic
Thanks!
If you have some more tasks for me I would appreciate it. I am still new so I do only these kind of fixes for now but if there is something more complex that trivial coding style issues but not too complex for the start I would be glad to contribute some more. Just let me know and Ill get on it.Thanks, Sasa
{
name: Bogicevic Sasa
phone: +381606006200
}Quoted 13 lines · Bjorn Helgaas
Quoted 6 lines · Bogicevic Sasa
This patch fixes all whitespace issues( missing or needed whitespace) in all files in
drivers/pcifolder. 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 Bogicevic Sasa <[email protected]>Applied to pci/trivial for v4.5, thanks!
Bjorn
Thanks for the info, Ill shout if I need further help
Thanks, Sasa
{
name: Bogicevic Sasa
phone: +381606006200
}Quoted 71 lines · Bjorn Helgaas
No, this change would only affect
Kconfigfiles. For example,arch/x86/Kconfigcontains:source "
drivers/pci/pcie/Kconfig"
source "drivers/pci/Kconfig"
source "drivers/pci/hotplug/Kconfig"I would like it to contain only the "
drivers/pci/Kconfig" line. Thedrivers/pci/Kconfigfile should take care of including pcie/Kconfig and pci/hotplug/Kconfig itself.Other arches have the same issue.
Quoted 54 lines · sasa bogicevic
Thanks!
This is great, so basically all drivers from pcie need to be moved to pci folder, right ?Thanks, Sasa
{
name: Bogicevic Sasa
phone: +381606006200
}Quoted 42 lines · Bjorn Helgaas
I have sort of a to-do list here:
https://docs.google.com/spreadsheets/d/1VgEMqaG5FFkde4Se64nNaMpNzBfXdlgihXuGKVEzMbA/edit?usp=sharing
Most of those items are fairly significant, but I can help if you have questions (please post on linux-pci so others can benefit as well).
Integrating PCIe
Kconfiginto PCIKconfigshould be relatively straightforward (though far from trivial).Welcome to Linux and PCI!
Bjorn
Quoted 25 lines · sasa bogicevic
Thanks!
If you have some more tasks for me I would appreciate it. I am still new so I do only these kind of fixes for now but if there is something more complex that trivial coding style issues but not too complex for the start I would be glad to contribute some more. Just let me know and Ill get on it.Thanks, Sasa
{
name: Bogicevic Sasa
phone: +381606006200
}Quoted 13 lines · Bjorn Helgaas
Quoted 6 lines · Bogicevic Sasa
This patch fixes all whitespace issues( missing or needed whitespace) in all files in
drivers/pcifolder. 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 Bogicevic Sasa <[email protected]>Applied to pci/trivial for v4.5, thanks!
Bjorn