diff options
author | Bjorn Helgaas <bhelgaas@google.com> | 2016-01-20 11:48:25 -0600 |
---|---|---|
committer | Bjorn Helgaas <bhelgaas@google.com> | 2016-01-20 11:48:25 -0600 |
commit | 9662e32c810ad3e6ce49832d5f585a54f8fbdbdb (patch) | |
tree | fd9fd3f8cd44e231b8dc71c2e360eb19963972d5 /drivers/pci/hotplug/pci_hotplug_core.c | |
parent | 904f664b585cc9f3dc134a8c0dd08e9bce6c10bc (diff) | |
parent | bd7900825a3db4c4916fafb400c1f669120039d2 (diff) | |
download | op-kernel-dev-9662e32c810ad3e6ce49832d5f585a54f8fbdbdb.zip op-kernel-dev-9662e32c810ad3e6ce49832d5f585a54f8fbdbdb.tar.gz |
Merge branch 'pci/trivial' into next
* pci/trivial:
PCI: shpchp: Constify hpc_ops structure
PCI: Use kobj_to_dev() instead of open-coding it
PCI: Use to_pci_dev() instead of open-coding it
PCI: Fix all whitespace issues
PCI/MSI: Fix typos in <linux/msi.h>
Diffstat (limited to 'drivers/pci/hotplug/pci_hotplug_core.c')
-rw-r--r-- | drivers/pci/hotplug/pci_hotplug_core.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/pci/hotplug/pci_hotplug_core.c b/drivers/pci/hotplug/pci_hotplug_core.c index fcd5e73..9acd199 100644 --- a/drivers/pci/hotplug/pci_hotplug_core.c +++ b/drivers/pci/hotplug/pci_hotplug_core.c @@ -45,10 +45,10 @@ #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 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) 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) /* local variables */ @@ -226,7 +226,7 @@ static ssize_t test_write_file(struct pci_slot *pci_slot, const char *buf, u32 test; int retval = 0; - ltest = simple_strtoul (buf, NULL, 10); + ltest = simple_strtoul(buf, NULL, 10); test = (u32)(ltest & 0xffffffff); dbg("test = %d\n", test); |