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

drivers/pci/hotplug/acpiphp_ibm.c

···
 
 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,

drivers/pci/hotplug/rpadlpar_core.c

···
 
 int __init rpadlpar_io_init(void)
 {
-	int rc = 0;
 
 	if (!is_dlpar_capable()) {
 		printk(KERN_WARNING "%s: partition not DLPAR capable\n",
···
 		return -EPERM;
 	}
 
-	rc = dlpar_sysfs_init();
-	return rc;
+	return dlpar_sysfs_init();
 }
 
 void rpadlpar_io_exit(void)