Skip to contentSkip to conversation

PCI Hotplug changes for 2.4.20

PATCH New Greg KH 1 participant 2 messages Dec 6, 2002

lore
Share & tools
lore

Greg KH

author
#0 lore raw

PATCH 1/1 PCI Hotplug changes for 2.4.20

Hi,

Here is an update for the PCI Hotplug ACPI driver.

Please pull from: bk://linuxusb.bkbits.net/pci_hp-2.4

The raw patch will follow.

thanks,

greg k-h

 drivers/hotplug/Makefile       |    3 
 drivers/hotplug/acpiphp.h      |   20 +--
 drivers/hotplug/acpiphp_core.c |  215 ++++++++++++++++++++++---------------
 drivers/hotplug/acpiphp_glue.c |  232 +++++++++++++++++++----------------------
 drivers/hotplug/acpiphp_pci.c  |  148 +++++++-------------------
 drivers/hotplug/acpiphp_res.c  |   59 ++++------
 6 files changed, 314 insertions(+), 363 deletions(-)

-----

[email protected], 2002-12-06 09:31:02-08:00, [email protected]
[PATCH] ACPI PCI hotplug updates

These are updates of the acpiphp driver for 2.4 This is mainly for backporting of bugfixes in 2.5 to 2.4. Please apply.
- backport of 2.5 changes & bugfixes
- whitespace cleanup
- message cleanup

 drivers/hotplug/Makefile       |    3 
 drivers/hotplug/acpiphp.h      |   20 +--
 drivers/hotplug/acpiphp_core.c |  215 ++++++++++++++++++++++---------------
 drivers/hotplug/acpiphp_glue.c |  232 +++++++++++++++++++----------------------
 drivers/hotplug/acpiphp_pci.c  |  148 +++++++-------------------
 drivers/hotplug/acpiphp_res.c  |   59 ++++------
 6 files changed, 314 insertions(+), 363 deletions(-)

------

author
#1 lore raw

PATCH 1/1 PCI Hotplug changes for 2.4.20

ChangeSet 1.828, 2002/12/06 09:31:02-08:00, [email protected]

[PATCH] ACPI PCI hotplug updates

These are updates of the acpiphp driver for 2.4 This is mainly for backporting of bugfixes in 2.5 to 2.4. Please apply.
- backport of 2.5 changes & bugfixes
- whitespace cleanup
- message cleanup

drivers/hotplug/Makefile +0 -3
diff -Nru a/drivers/hotplug/Makefile b/drivers/hotplug/Makefile
@@ -29,9 +29,6 @@
 
 ifdef CONFIG_HOTPLUG_PCI_ACPI
   EXTRA_CFLAGS	+= -D_LINUX -I$(CURDIR)/../acpi
-  ifdef CONFIG_ACPI_DEBUG
-    EXTRA_CFLAGS += -DACPI_DEBUG -Wno-unused
-  endif
 endif
 
 acpiphp_objs		:=	acpiphp_core.o	\
drivers/hotplug/acpiphp.h +10 -10
diff -Nru a/drivers/hotplug/acpiphp.h b/drivers/hotplug/acpiphp.h
@@ -97,17 +97,17 @@
 
 #define dbg(format, arg...)					\
 	do {							\
-		if (debug)					\
-			printk (KERN_DEBUG "%s: " format "\n",	\
+		if (acpiphp_debug)				\
+			printk(KERN_DEBUG "%s: " format,	\
 				MY_NAME , ## arg); 		\
 	} while (0)
-#define err(format, arg...) printk (KERN_ERR "%s: " format "\n", MY_NAME , ## arg)
-#define info(format, arg...) printk (KERN_INFO "%s: " format "\n", MY_NAME , ## arg)
-#define warn(format, arg...) printk (KERN_WARNING "%s: " format "\n", MY_NAME , ## arg)
+#define err(format, arg...) printk(KERN_ERR "%s: " format, MY_NAME , ## arg)
+#define info(format, arg...) printk(KERN_INFO "%s: " format, MY_NAME , ## arg)
+#define warn(format, arg...) printk(KERN_WARNING "%s: " format, MY_NAME , ## arg)
 
 #define SLOT_MAGIC	0x67267322
 /* name size which is used for entries in pcihpfs */
-#define SLOT_NAME_SIZE	16		/* ACPIxxxx */
+#define SLOT_NAME_SIZE	32		/* ACPI{_SUN}-{BUS}:{DEV} */
 
 struct acpiphp_bridge;
 struct acpiphp_slot;

@@ -122,8 +122,6 @@
 	struct hotplug_slot	*hotplug_slot;
 	struct list_head	slot_list;
 
-	/* if there are multiple corresponding ACPI slot objects,
-	   this points to one of them */
 	struct acpiphp_slot	*acpi_slot;
 };
 

@@ -200,7 +198,6 @@
 	struct acpiphp_bridge *bridge;	/* parent */
 	struct list_head funcs;		/* one slot may have different
 					   objects (i.e. for each function) */
-	struct acpiphp_func *func;	/* functions */
 	struct semaphore crit_sect;
 
 	u32		id;		/* slot id (serial #) for hotplug core */

@@ -213,7 +210,7 @@
 
 
 /**
- * struct acpiphp_func - PCI slot information
+ * struct acpiphp_func - PCI function information
  *
  * PCI function information for each object in ACPI namespace
  * typically 8 objects per slot (i.e. for each PCI function)

@@ -318,5 +315,8 @@
 extern void acpiphp_free_resource (struct pci_resource **res);
 extern void acpiphp_dump_resource (struct acpiphp_bridge *bridge); /* debug */
 extern void acpiphp_dump_func_resource (struct acpiphp_func *func); /* debug */
+
+/* variables */
+extern int acpiphp_debug;
 
 #endif /* _ACPIPHP_H */
drivers/hotplug/acpiphp_core.c +125 -90

412 lines not on this page · raw message

drivers/hotplug/acpiphp_glue.c +109 -123

775 lines not on this page · raw message

drivers/hotplug/acpiphp_pci.c +45 -103

367 lines not on this page · raw message

drivers/hotplug/acpiphp_res.c +25 -34

166 lines not on this page · raw message