applied thanks, -Len >-----Original Message----- >From: akpm@xxxxxxxx [mailto:akpm@xxxxxxxx] >Sent: Tuesday, March 28, 2006 5:04 PM >To: Brown, Len >Cc: linux-acpi@xxxxxxxxxxxxxxx; akpm@xxxxxxxx; bjorn.helgaas@xxxxxx >Subject: [patch 09/26] ACPI: update asus_acpi driver registration > > >From: Bjorn Helgaas <bjorn.helgaas@xxxxxx> > >Remove the assumption that acpi_bus_register_driver() returns >the number of >devices claimed. Returning the count is unreliable because >devices may be >hot-plugged in the future (admittedly not applicable for this driver). > >Since the hardware for this driver is not hot-pluggable, >determine whether the >hardware is present by noticing calls to the .add() method. >It would be >better to probe the ACPI namespace for the ASUS HIDs, and load >the driver only >when we find one, but ACPI doesn't support that yet. > >I don't have an ASUS laptop to test on, but on my HP dl360, it >does report the >appropriate error when attempting to load the module: > > $ sudo insmod drivers/acpi/asus_acpi.ko > insmod: error inserting 'drivers/acpi/asus_acpi.ko': -1 No >such device > >Signed-off-by: Bjorn Helgaas <bjorn.helgaas@xxxxxx> >Cc: "Brown, Len" <len.brown@xxxxxxxxx> >Signed-off-by: Andrew Morton <akpm@xxxxxxxx> >--- > > drivers/acpi/asus_acpi.c | 18 +++++++++++++++++- > 1 files changed, 17 insertions(+), 1 deletion(-) > >diff -puN >drivers/acpi/asus_acpi.c~acpi-update-asus_acpi-driver-registrat ion drivers/acpi/asus_acpi.c >--- >devel/drivers/acpi/asus_acpi.c~acpi-update-asus_acpi-driver-reg istration 2006-03-28 14:03:03.000000000 -0800 >+++ devel-akpm/drivers/acpi/asus_acpi.c 2006-03-28 >14:03:03.000000000 -0800 >@@ -1119,6 +1119,8 @@ static int __init asus_hotk_check(void) > return result; > } > >+static int asus_hotk_found; >+ > static int __init asus_hotk_add(struct acpi_device *device) > { > acpi_status status = AE_OK; >@@ -1180,6 +1182,8 @@ static int __init asus_hotk_add(struct a > } > } > >+ asus_hotk_found = 1; >+ > end: > if (result) { > kfree(hotk); >@@ -1226,7 +1230,19 @@ static int __init asus_acpi_init(void) > asus_proc_dir->owner = THIS_MODULE; > > result = acpi_bus_register_driver(&asus_hotk_driver); >- if (result < 1) { >+ if (result < 0) { >+ remove_proc_entry(PROC_ASUS, acpi_root_dir); >+ return -ENODEV; >+ } >+ >+ /* >+ * This is a bit of a kludge. We only want this module loaded >+ * for ASUS systems, but there's currently no way to probe the >+ * ACPI namespace for ASUS HIDs. So we just return failure if >+ * we didn't find one, which will cause the module to be >+ * unloaded. >+ */ >+ if (!asus_hotk_found) { > acpi_bus_unregister_driver(&asus_hotk_driver); > remove_proc_entry(PROC_ASUS, acpi_root_dir); > return -ENODEV; >_ > - To unsubscribe from this list: send the line "unsubscribe linux-acpi" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
