[PATCH] add "pnpacpi=off", print info during discovery

[Bjorn Helgaas <bjorn.helgaas-VXdhtT5mjnY@public.gmane.org>]

Make PNPACPI IDs uppercase, not lower (the specs, etc, are
typically uppercase, but if you prefer it lower for some
reason, feel free to ignore this hunk).  Print info about
devices found via PNPACPI.  Add "pnpacpi=off" option to
disable PNPACPI even when compiled in.

Signed-off-by: Bjorn Helgaas <bjorn.helgaas-VXdhtT5mjnY@public.gmane.org>

--- pnp1/drivers/pnp/pnpacpi/core.c.1	2005-01-11 15:36:30.000000000 -0700
+++ pnp1/drivers/pnp/pnpacpi/core.c	2005-01-11 15:41:02.000000000 -0700
@@ -77,10 +77,10 @@
 	str[0] = id[0];
 	str[1] = id[1];
 	str[2] = id[2];
-	str[3] = tolower(id[3]);
-	str[4] = tolower(id[4]);
-	str[5] = tolower(id[5]);
-	str[6] = tolower(id[6]);
+	str[3] = id[3];
+	str[4] = id[4];
+	str[5] = id[5];
+	str[6] = id[6];
 	str[7] = '\0';
 }
 
@@ -142,7 +142,6 @@
 		is_exclusive_device(device))
 		return 0;
 
-	pnp_dbg("ACPI device : hid %s", acpi_device_hid(device));
 	dev =  pnpacpi_kmalloc(sizeof(struct pnp_dev), GFP_KERNEL);
 	if (!dev) {
 		pnp_err("Out of memory");
@@ -220,6 +219,9 @@
 	pnp_add_device(dev);
 	num++;
 
+	pnp_info("%s ACPI device %s (%s)", dev->dev.bus_id, dev->name,
+		acpi_device_hid(device));
+
 	return AE_OK;
 err1:
 	kfree(dev_id);
@@ -240,8 +242,24 @@
 	return AE_OK;
 }
 
+static int __initdata pnpacpi_disabled;
+
+static int __init pnpacpi_setup(char *str)
+{
+	if (strncmp(str, "off", 3) == 0)
+		pnpacpi_disabled = 1;
+
+	return 1;
+}
+__setup("pnpacpi=", pnpacpi_setup);
+
 int __init pnpacpi_init(void)
 {
+	if (pnpacpi_disabled) {
+		pnp_info("PnP ACPI: Disabled");
+		return 0;
+	}
+
 	if (acpi_disabled) {
 		pnp_info("PnP ACPI: ACPI disabled");
 		return 0;
===== Documentation/kernel-parameters.txt 1.67 vs edited =====
--- 1.67/Documentation/kernel-parameters.txt	2005-01-07 22:44:15 -07:00
+++ edited/Documentation/kernel-parameters.txt	2005-01-11 15:58:28 -07:00
@@ -1010,6 +1010,9 @@
 			Format: { parport<nr> | timid | 0 }
 			See also Documentation/parport.txt.
 
+	pnpacpi=	[PNPACPI]
+		off	Don't use ACPI to find PNP devices
+
 	pnpbios=	[ISAPNP]
 			{ on | off | curr | res | no-curr | no-res }
 




-------------------------------------------------------
The SF.Net email is sponsored by: Beat the post-holiday blues
Get a FREE limited edition SourceForge.net t-shirt from ThinkGeek.
It's fun and FREE -- well, almost....http://www.thinkgeek.com/sfshirt