diff options
author | Alex Chiang <achiang@hp.com> | 2008-12-11 13:17:55 -0500 |
---|---|---|
committer | Jesse Barnes <jbarnes@virtuousgeek.org> | 2009-01-07 14:12:42 -0500 |
commit | 2a9d35219c593bdf46ec21f2b75a6370af7af1b0 (patch) | |
tree | 770981a1f9c4649ac57bee9e9cdb6c4fb8568597 | |
parent | 104bafcfab7ce3031399e60069949f10acecc022 (diff) |
PCI hotplug: acpiphp whitespace cleanup
Clean up whitespace.
Setting 'let c_space_errors=1' in .vimrc shows all sorts of
ugliness. ;)
Signed-off-by: Alex Chiang <achiang@hp.com>
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
-rw-r--r-- | drivers/pci/hotplug/acpiphp.h | 2 | ||||
-rw-r--r-- | drivers/pci/hotplug/acpiphp_glue.c | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/drivers/pci/hotplug/acpiphp.h b/drivers/pci/hotplug/acpiphp.h index 9bcb6cbd5aa9..4fc168b70095 100644 --- a/drivers/pci/hotplug/acpiphp.h +++ b/drivers/pci/hotplug/acpiphp.h | |||
@@ -44,7 +44,7 @@ | |||
44 | do { \ | 44 | do { \ |
45 | if (acpiphp_debug) \ | 45 | if (acpiphp_debug) \ |
46 | printk(KERN_DEBUG "%s: " format, \ | 46 | printk(KERN_DEBUG "%s: " format, \ |
47 | MY_NAME , ## arg); \ | 47 | MY_NAME , ## arg); \ |
48 | } while (0) | 48 | } while (0) |
49 | #define err(format, arg...) printk(KERN_ERR "%s: " format, MY_NAME , ## arg) | 49 | #define err(format, arg...) printk(KERN_ERR "%s: " format, MY_NAME , ## arg) |
50 | #define info(format, arg...) printk(KERN_INFO "%s: " format, MY_NAME , ## arg) | 50 | #define info(format, arg...) printk(KERN_INFO "%s: " format, MY_NAME , ## arg) |
diff --git a/drivers/pci/hotplug/acpiphp_glue.c b/drivers/pci/hotplug/acpiphp_glue.c index 1b19b7ec3e8c..7a5760426897 100644 --- a/drivers/pci/hotplug/acpiphp_glue.c +++ b/drivers/pci/hotplug/acpiphp_glue.c | |||
@@ -167,9 +167,9 @@ static int post_dock_fixups(struct notifier_block *nb, unsigned long val, | |||
167 | 167 | ||
168 | if (((buses >> 8) & 0xff) != bus->secondary) { | 168 | if (((buses >> 8) & 0xff) != bus->secondary) { |
169 | buses = (buses & 0xff000000) | 169 | buses = (buses & 0xff000000) |
170 | | ((unsigned int)(bus->primary) << 0) | 170 | | ((unsigned int)(bus->primary) << 0) |
171 | | ((unsigned int)(bus->secondary) << 8) | 171 | | ((unsigned int)(bus->secondary) << 8) |
172 | | ((unsigned int)(bus->subordinate) << 16); | 172 | | ((unsigned int)(bus->subordinate) << 16); |
173 | pci_write_config_dword(bus->self, PCI_PRIMARY_BUS, buses); | 173 | pci_write_config_dword(bus->self, PCI_PRIMARY_BUS, buses); |
174 | } | 174 | } |
175 | return NOTIFY_OK; | 175 | return NOTIFY_OK; |