2009-06-17 12:31:20

by Alexander Beregalov

Subject: [PATCH next] PCI hotplug: fix build when !SYSFS

Fix this build error when CONFIG_SYSFS is not set:
drivers/pci/slot.c: In function 'pci_hp_create_module_link':
drivers/pci/slot.c:327: error: 'module_kset' undeclared

Signed-off-by: Alexander Beregalov <[email protected]>
---
drivers/pci/slot.c | 9 +++++++++
1 files changed, 9 insertions(+), 0 deletions(-)

diff --git a/drivers/pci/slot.c b/drivers/pci/slot.c
index eddb074..dd6c097 100644
--- a/drivers/pci/slot.c
+++ b/drivers/pci/slot.c
@@ -308,6 +308,7 @@ void pci_destroy_slot(struct pci_slot *slot)
EXPORT_SYMBOL_GPL(pci_destroy_slot);

#if defined(CONFIG_HOTPLUG_PCI) || defined(CONFIG_HOTPLUG_PCI_MODULE)
+#ifdef CONFIG_SYSFS
#include <linux/pci_hotplug.h>
/**
* pci_hp_create_link - create symbolic link to the hotplug driver module.
@@ -344,6 +345,14 @@ void pci_hp_remove_module_link(struct pci_slot *pci_slot)
sysfs_remove_link(&pci_slot->kobj, "module");
}
EXPORT_SYMBOL_GPL(pci_hp_remove_module_link);
+#else /* CONFIG_SYSFS */
+
+inline void pci_hp_create_module_link(struct pci_slot *pci_slot) {}
+EXPORT_SYMBOL_GPL(pci_hp_create_module_link);
+
+inline void pci_hp_remove_module_link(struct pci_slot *pci_slot) {}
+EXPORT_SYMBOL_GPL(pci_hp_remove_module_link);
+#endif /* CONFIG_SYSFS */
#endif

static int pci_slot_init(void)
--
1.6.2.4

2009-06-18 19:57:43

by Jesse Barnes

Subject: Re: [PATCH next] PCI hotplug: fix build when !SYSFS

On Wed, 17 Jun 2009 16:23:17 +0400
Alexander Beregalov <[email protected]> wrote:

> Fix this build error when CONFIG_SYSFS is not set:
> drivers/pci/slot.c: In function 'pci_hp_create_module_link':
> drivers/pci/slot.c:327: error: 'module_kset' undeclared
>
> Signed-off-by: Alexander Beregalov <[email protected]>
> ---
> drivers/pci/slot.c | 9 +++++++++
> 1 files changed, 9 insertions(+), 0 deletions(-)

Thanks Alexander, but this one has been obsoleted by the one from Alex
Chiang, which describes the dependencies in Kconfig instead...

Thanks,
--
Jesse Barnes, Intel Open Source Technology Center