[PATCH 2.6.13-rc2] pci: fix PCI && !HOTPLUG compile error

[PATCH 2.6.13-rc2] pci: fix PCI && !HOTPLUG compile error

[Mikael Pettersson]

2.6.13-rc2 triggers compile errors in pci-driver.c
when hotplug is disabled:

drivers/pci/pci-driver.c: In function 'pci_match_device':
drivers/pci/pci-driver.c:156: error: dereferencing pointer to incomplete type
drivers/pci/pci-driver.c:156: warning: type defaults to 'int' in declaration of 'type name'
drivers/pci/pci-driver.c:156: error: request for member 'node' in something not a structure or union
drivers/pci/pci-driver.c:156: warning: type defaults to 'int' in declaration of '__mptr'
drivers/pci/pci-driver.c:156: warning: initialization from incompatible pointer type
etc

This is because 2.6.13-rc2 added a code block to this function which references
hotplug-only stuff. Fixed crudely by #ifdef CONFIG_HOTPLUG around it.

Signed-off-by: Mikael Pettersson <mikpe@csd.uu.se>

--- linux-2.6.13-rc2/drivers/pci/pci-driver.c.~1~	2005-07-06 15:20:41.000000000 +0200
+++ linux-2.6.13-rc2/drivers/pci/pci-driver.c	2005-07-06 15:49:18.000000000 +0200
@@ -145,12 +145,15 @@ const struct pci_device_id *pci_match_de
 					     struct pci_dev *dev)
 {
 	const struct pci_device_id *id;
+#ifdef CONFIG_HOTPLUG
 	struct pci_dynid *dynid;
+#endif
 
 	id = pci_match_id(drv->id_table, dev);
 	if (id)
 		return id;
 
+#ifdef CONFIG_HOTPLUG
 	/* static ids didn't match, lets look at the dynamic ones */
 	spin_lock(&drv->dynids.lock);
 	list_for_each_entry(dynid, &drv->dynids.list, node) {
@@ -160,6 +163,7 @@ const struct pci_device_id *pci_match_de
 		}
 	}
 	spin_unlock(&drv->dynids.lock);
+#endif
 	return NULL;
 }
 

Re: [PATCH 2.6.13-rc2] pci: fix PCI && !HOTPLUG compile error

[Greg KH]

On Wed, Jul 06, 2005 at 05:02:41PM +0200, Mikael Pettersson wrote:
> 2.6.13-rc2 triggers compile errors in pci-driver.c
> when hotplug is disabled:
> 
> drivers/pci/pci-driver.c: In function 'pci_match_device':
> drivers/pci/pci-driver.c:156: error: dereferencing pointer to incomplete type
> drivers/pci/pci-driver.c:156: warning: type defaults to 'int' in declaration of 'type name'
> drivers/pci/pci-driver.c:156: error: request for member 'node' in something not a structure or union
> drivers/pci/pci-driver.c:156: warning: type defaults to 'int' in declaration of '__mptr'
> drivers/pci/pci-driver.c:156: warning: initialization from incompatible pointer type
> etc
> 
> This is because 2.6.13-rc2 added a code block to this function which references
> hotplug-only stuff. Fixed crudely by #ifdef CONFIG_HOTPLUG around it.

No, use this patch instead, it's smaller and cleaner, and is what I ment
the code to look like in the first place :)

thanks,

greg k-h

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

---
 drivers/pci/pci-driver.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

--- gregkh-2.6.orig/drivers/pci/pci-driver.c	2005-07-06 01:03:26.000000000 -0700
+++ gregkh-2.6/drivers/pci/pci-driver.c	2005-07-06 09:07:09.000000000 -0700
@@ -17,13 +17,13 @@
  * Dynamic device IDs are disabled for !CONFIG_HOTPLUG
  */
 
-#ifdef CONFIG_HOTPLUG
-
 struct pci_dynid {
 	struct list_head node;
 	struct pci_device_id id;
 };
 
+#ifdef CONFIG_HOTPLUG
+
 /**
  * store_new_id
  *