Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 906c1426 authored by Bjorn Helgaas's avatar Bjorn Helgaas
Browse files

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
parents 63ab93f0 1acf8bca

drivers/pci/hotplug/acpiphp_ibm.c

+1 −1
Original line number Diff line number Diff line
@@ -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,

drivers/pci/hotplug/rpadlpar_core.c

+1 −3
Original line number Diff line number Diff line
@@ -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)