From 2c0c31883e925fdbefaa7d4cc6c989ce553b91a3 Mon Sep 17 00:00:00 2001 From: Keir Fraser Date: Fri, 9 Jul 2010 12:37:02 +0100 Subject: [PATCH] pci/iomulti: adjustments for CONFIG_HOTPLUG_PCI=m The code supposed to deal with hot added/removed devices is also needed when the core PCI hotplug code lives in a module. Signed-off-by: Jan Beulich --- drivers/pci/iomulti.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/pci/iomulti.c b/drivers/pci/iomulti.c index 34729fb7..f14aff7d 100644 --- a/drivers/pci/iomulti.c +++ b/drivers/pci/iomulti.c @@ -245,7 +245,7 @@ static void pci_iomul_switch_add_locked(struct pci_iomul_switch *sw) list_add(&sw->list, &switch_list); } -#ifdef CONFIG_HOTPLUG_PCI +#if defined(CONFIG_HOTPLUG_PCI) || defined(CONFIG_HOTPLUG_PCI_MODULE) static void pci_iomul_switch_del_locked(struct pci_iomul_switch *sw) { BUG_ON(!mutex_is_locked(&switch_list_lock)); @@ -337,7 +337,7 @@ static void pci_iomul_slot_add_locked(struct pci_iomul_switch *sw, list_add(&slot->sibling, &sw->slots); } -#ifdef CONFIG_HOTPLUG_PCI +#if defined(CONFIG_HOTPLUG_PCI) || defined(CONFIG_HOTPLUG_PCI_MODULE) static void pci_iomul_slot_del_locked(struct pci_iomul_switch *sw, struct pci_iomul_slot *slot) { @@ -895,7 +895,7 @@ DECLARE_PCI_FIXUP_FINAL(PCI_ANY_ID, PCI_ANY_ID, quirk_iomul_reassign_ioresource); /*****************************************************************************/ -#ifdef CONFIG_HOTPLUG_PCI +#if defined(CONFIG_HOTPLUG_PCI) || defined(CONFIG_HOTPLUG_PCI_MODULE) static int __devinit __pci_iomul_notifier_del_device(struct pci_dev *pdev) { struct pci_iomul_switch *sw; @@ -990,7 +990,7 @@ static int __devinit pci_iomul_notifier(struct notifier_block *nb, return 0; } -static struct notifier_block pci_iomul_nb = { +static struct notifier_block __devinitdata pci_iomul_nb = { .notifier_call = pci_iomul_notifier, }; @@ -1383,7 +1383,7 @@ static struct miscdevice pci_iomul_miscdev = { .fops = &pci_iomul_fops, }; -static int pci_iomul_init(void) +static int __init pci_iomul_init(void) { int error; error = misc_register(&pci_iomul_miscdev); -- 2.39.5