diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2017-02-15 11:56:09 -0600 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2017-02-15 11:56:09 -0600 |
| commit | 906c142634def5dd3dda533d5d20bd3c1c19d1fb (patch) | |
| tree | fab0c7ee3d97abd856c6cb22570e87a7c9386508 /drivers | |
| parent | 63ab93f021ecd815d848c3e9d3e326fa9628e5a9 (diff) | |
| parent | 1acf8bca9cdb2443a8707ff0afc3aadbfb5669f4 (diff) | |
| download | linux-906c142634def5dd3dda533d5d20bd3c1c19d1fb.tar.bz2 | |
Merge branch 'pci/hotplug' into next
* pci/hotplug:
PCI: acpiphp_ibm: Make ibm_apci_table_attr __ro_after_init
PCI: rpadlpar: Remove unnecessary return statement
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/pci/hotplug/acpiphp_ibm.c | 2 | ||||
| -rw-r--r-- | drivers/pci/hotplug/rpadlpar_core.c | 4 |
2 files changed, 2 insertions, 4 deletions
diff --git a/drivers/pci/hotplug/acpiphp_ibm.c b/drivers/pci/hotplug/acpiphp_ibm.c index 68d105aaf4e2..984c7e8cec5a 100644 --- a/drivers/pci/hotplug/acpiphp_ibm.c +++ b/drivers/pci/hotplug/acpiphp_ibm.c @@ -107,7 +107,7 @@ static void __exit ibm_acpiphp_exit(void); static acpi_handle ibm_acpi_handle; static struct notification ibm_note; -static struct bin_attribute ibm_apci_table_attr = { +static struct bin_attribute ibm_apci_table_attr __ro_after_init = { .attr = { .name = "apci_table", .mode = S_IRUGO, diff --git a/drivers/pci/hotplug/rpadlpar_core.c b/drivers/pci/hotplug/rpadlpar_core.c index c614ff7c3bc3..3f93a4e79595 100644 --- a/drivers/pci/hotplug/rpadlpar_core.c +++ b/drivers/pci/hotplug/rpadlpar_core.c @@ -463,7 +463,6 @@ static inline int is_dlpar_capable(void) int __init rpadlpar_io_init(void) { - int rc = 0; if (!is_dlpar_capable()) { printk(KERN_WARNING "%s: partition not DLPAR capable\n", @@ -471,8 +470,7 @@ int __init rpadlpar_io_init(void) return -EPERM; } - rc = dlpar_sysfs_init(); - return rc; + return dlpar_sysfs_init(); } void rpadlpar_io_exit(void) |