diff options
| author | Sebastian Ott <sebott@linux.vnet.ibm.com> | 2013-08-29 21:33:16 +0400 |
|---|---|---|
| committer | Martin Schwidefsky <schwidefsky@de.ibm.com> | 2013-08-30 10:57:07 +0400 |
| commit | 67f43f38eeb34da43b624a29d57b703f4c4844b4 (patch) | |
| tree | f38156d87f7bce9e1b32cb8214de0d24447e2dd6 /arch/s390/pci | |
| parent | 0944fe3f4a323f436180d39402cae7f9c46ead17 (diff) | |
| download | linux-67f43f38eeb34da43b624a29d57b703f4c4844b4.tar.xz | |
s390/pci/hotplug: convert to be builtin only
Convert s390' pci hotplug to be builtin only, with no module option.
Suggested-by: Bjorn Helgaas <bhelgaas@google.com>
Signed-off-by: Sebastian Ott <sebott@linux.vnet.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Diffstat (limited to 'arch/s390/pci')
| -rw-r--r-- | arch/s390/pci/pci.c | 34 |
1 files changed, 6 insertions, 28 deletions
diff --git a/arch/s390/pci/pci.c b/arch/s390/pci/pci.c index d65dc4f50e2a..56f8a1c4d9bf 100644 --- a/arch/s390/pci/pci.c +++ b/arch/s390/pci/pci.c @@ -45,11 +45,8 @@ #define ZPCI_NR_DEVICES CONFIG_PCI_NR_FUNCTIONS /* list of all detected zpci devices */ -LIST_HEAD(zpci_list); -EXPORT_SYMBOL_GPL(zpci_list); -DEFINE_MUTEX(zpci_list_lock); -EXPORT_SYMBOL_GPL(zpci_list_lock); - +static LIST_HEAD(zpci_list); +static DEFINE_MUTEX(zpci_list_lock); static void zpci_enable_irq(struct irq_data *data); static void zpci_disable_irq(struct irq_data *data); @@ -60,8 +57,6 @@ static struct irq_chip zpci_irq_chip = { .irq_mask = zpci_disable_irq, }; -static struct pci_hp_callback_ops *hotplug_ops; - static DECLARE_BITMAP(zpci_domain, ZPCI_NR_DEVICES); static DEFINE_SPINLOCK(zpci_domain_lock); @@ -828,10 +823,10 @@ int zpci_create_device(struct zpci_dev *zdev) mutex_lock(&zpci_list_lock); list_add_tail(&zdev->entry, &zpci_list); - if (hotplug_ops) - hotplug_ops->create_slot(zdev); mutex_unlock(&zpci_list_lock); + zpci_init_slot(zdev); + return 0; out_disable: @@ -884,24 +879,7 @@ static void zpci_mem_exit(void) kmem_cache_destroy(zdev_fmb_cache); } -void zpci_register_hp_ops(struct pci_hp_callback_ops *ops) -{ - mutex_lock(&zpci_list_lock); - hotplug_ops = ops; - mutex_unlock(&zpci_list_lock); -} -EXPORT_SYMBOL_GPL(zpci_register_hp_ops); - -void zpci_deregister_hp_ops(void) -{ - mutex_lock(&zpci_list_lock); - hotplug_ops = NULL; - mutex_unlock(&zpci_list_lock); -} -EXPORT_SYMBOL_GPL(zpci_deregister_hp_ops); - -unsigned int s390_pci_probe; -EXPORT_SYMBOL_GPL(s390_pci_probe); +static unsigned int s390_pci_probe; char * __init pcibios_setup(char *str) { @@ -960,4 +938,4 @@ out_mem: out: return rc; } -subsys_initcall(pci_base_init); +subsys_initcall_sync(pci_base_init); |