diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2013-04-17 10:31:34 -0600 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2013-04-17 10:31:34 -0600 |
| commit | 723ec4d06cb2eed481436cfe008f5f63c45e88fd (patch) | |
| tree | e59112af8616e8fbc0cc6c2219b49fd2f05bfc41 /drivers/pci/slot.c | |
| parent | a3b6bbd5774c13dab89d72f79976ba762913b2f2 (diff) | |
| parent | f39d5b72913e2a9ff00ba5ab145ee05a888b1286 (diff) | |
Merge branch 'pci/cleanup' into next
* pci/cleanup:
PCI: Remove "extern" from function declarations
PCI: Warn about failures instead of "must_check" functions
PCI: Remove __must_check from definitions
PCI: Remove unused variables
PCI: Move cpci_hotplug_init() proto to header file
PCI: Make local functions/structs static
PCI: Fix missing prototype for pcie_port_acpi_setup()
Conflicts:
drivers/pci/hotplug/acpiphp.h
include/linux/pci.h
Diffstat (limited to 'drivers/pci/slot.c')
| -rw-r--r-- | drivers/pci/slot.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/pci/slot.c b/drivers/pci/slot.c index ac6412fb8d6..c1e9284a677 100644 --- a/drivers/pci/slot.c +++ b/drivers/pci/slot.c @@ -377,14 +377,17 @@ void pci_hp_create_module_link(struct pci_slot *pci_slot) { struct hotplug_slot *slot = pci_slot->hotplug; struct kobject *kobj = NULL; - int no_warn; + int ret; if (!slot || !slot->ops) return; kobj = kset_find_obj(module_kset, slot->ops->mod_name); if (!kobj) return; - no_warn = sysfs_create_link(&pci_slot->kobj, kobj, "module"); + ret = sysfs_create_link(&pci_slot->kobj, kobj, "module"); + if (ret) + dev_err(&pci_slot->bus->dev, "Error creating sysfs link (%d)\n", + ret); kobject_put(kobj); } EXPORT_SYMBOL_GPL(pci_hp_create_module_link); |